From f9593536d60d2de93a55084ace11501552ae5bb1 Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Fri, 18 Oct 2024 01:57:42 +0100
Subject: [PATCH] feat: enable Fedora 41 builds (#638)

Co-authored-by: Benjamin Sherman <benjamin@holyarmy.org>
---
 .github/workflows/build-41.yml | 15 +++++++++++++++
 install.sh                     | 10 ++++++++--
 packages.json                  | 31 ++++++++++++++++++++-----------
 3 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/build-41.yml

diff --git a/.github/workflows/build-41.yml b/.github/workflows/build-41.yml
new file mode 100644
index 00000000..c0e4ffac
--- /dev/null
+++ b/.github/workflows/build-41.yml
@@ -0,0 +1,15 @@
+name: ublue main 41
+on:
+  pull_request:
+  merge_group:
+  schedule:
+    - cron: '5 4 * * *'  # 4am-ish UTC everyday (timed against official fedora container pushes)
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: build
+    uses: ./.github/workflows/reusable-build.yml
+    secrets: inherit
+    with:
+      fedora_version: 41
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 02dcbf95..6f511ed7 100755
--- a/install.sh
+++ b/install.sh
@@ -40,10 +40,8 @@ sed -i '0,/enabled=1/{s/enabled=1/enabled=1\npriority=90/}' /etc/yum.repos.d/neg
 rpm-ostree override replace \
   --experimental \
   --from repo='fedora-multimedia' \
-    libheif \
     libva \
     libva-intel-media-driver \
-    libvdpau \
     mesa-dri-drivers \
     mesa-filesystem \
     mesa-libEGL \
@@ -54,6 +52,14 @@ rpm-ostree override replace \
     mesa-va-drivers \
     mesa-vulkan-drivers
 
+if [[ "$FEDORA_MAJOR_VERSION" -ne "41" ]]; then
+    rpm-ostree override replace \
+        --experimental \
+        --from repo='fedora-multimedia' \
+        libheif \
+        libvdpau
+fi
+
 # run common packages script
 /ctx/packages.sh
 
diff --git a/packages.json b/packages.json
index da670699..abe66092 100644
--- a/packages.json
+++ b/packages.json
@@ -20,7 +20,6 @@
                 "grub2-tools-extra",
                 "heif-pixbuf-loader",
                 "htop",
-                "intel-vaapi-driver",
                 "just",
                 "kernel-tools",
                 "libcamera",
@@ -40,7 +39,6 @@
                 "pam-u2f",
                 "pam_yubico",
                 "pamu2fcfg",
-                "pipewire-libs-extra",
                 "pipewire-plugin-libcamera",
                 "powerstat",
                 "smartmontools",
@@ -92,7 +90,8 @@
                 "libavutil-free",
                 "libpostproc-free",
                 "libswresample-free",
-                "libswscale-free"
+                "libswscale-free",
+                "default-fonts-cjk-sans"
             ],
             "kinoite": [
                 "ffmpegthumbnailer",
@@ -107,30 +106,40 @@
     "39": {
         "include": {
             "all": [
-                "bootc"
+                "bootc",
+                "intel-vaapi-driver",
+                "pipewire-libs-extra"
             ],
             "kinoite": [
                 "xwaylandvideobridge"
             ]
         },
         "exclude": {
-            "all": [
-                "default-fonts-cjk-sans"
-            ]
+            "all": []
         }
     },
     "40": {
         "include": {
-            "all": [],
+            "all": [
+                "intel-vaapi-driver",
+                "pipewire-libs-extra"
+            ],
             "kinoite": [
                 "kf6-kimageformats",
                 "qt6-qtimageformats"
             ]
         },
         "exclude": {
-            "all": [
-                "default-fonts-cjk-sans"
-            ]
+            "all": []
+        }
+    },
+    "41": {
+        "include": {
+            "all": [],
+            "kinoite": []
+        },
+        "exclude": {
+            "all": []
         }
     }
 }