chore: refactor proprietary package installation

wayblueorg · Oct 30, 2024 · 70e5c47 · 70e5c47
1 parent 5eeef63
commit 70e5c47
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 14 deletions.
diff --git a/files/scripts/installproprietarypackages.sh b/files/scripts/installproprietarypackages.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo
+sed -i '0,/enabled=1/{s/enabled=1/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
+
+rpm-ostree override replace \
+  --experimental \
+  --from repo='fedora-multimedia' \
+    libheif \
+    libva \
+    libva-intel-media-driver \
+    mesa-dri-drivers \
+    mesa-filesystem \
+    mesa-libEGL \
+    mesa-libGL \
+    mesa-libgbm \
+    mesa-libglapi \
+    mesa-libxatracker \
+    mesa-va-drivers \
+    mesa-vulkan-drivers \
+    gstreamer1-plugin-libav \
+    gstreamer1-plugin-vaapi 
diff --git a/recipes/common/common-modules.yml b/recipes/common/common-modules.yml
@@ -117,26 +117,26 @@ modules:
         - breeze-icon-theme 
         - papirus-icon-theme
 
-        # proprietary stuff
-        - libheif-freeworld
-        - libheif-tools
-        - intel-media-driver
-        - mesa-va-drivers-freeworld
-        - gstreamer1-plugin-libav  
-        - gstreamer1-plugins-bad-free-extras  
-        - gstreamer1-plugins-bad-freeworld  
-        - gstreamer1-plugins-ugly  
-        - gstreamer1-vaapi  
+    - type: script
+      scripts:
+        - installproprietarypackages.sh
+
+    - type: rpm-ostree
+      install:
+        - heif-pixbuf-loader
         - ffmpeg
         - ffmpeg-libs
         - ffmpegthumbnailer
-        - pipewire-codec-aptx 
-        - fdk-aac
-
+        - pipewire-libs-extra
+        - libfdk-aac
+        - gstreamer1-plugins-bad
+        - gstreamer1-plugins-ugly 
       remove:
+        - gstreamer1-plugins-bad-free
+        - gstreamer1-plugins-bad-free-libs
+        - gstreamer1-plugins-ugly-free
         - fdk-aac-free
         - ffmpeg-free
-        - mesa-va-drivers
         - libavcodec-free  
         - libavdevice-free
         - libavfilter-free
@@ -146,6 +146,10 @@ modules:
         - libswresample-free  
         - libswscale-free  
 
+    - type: script
+      scripts:
+        - removeunusedrepos.sh
+
     - type: files
       files:
         - source: system/usr