From 9155e39e9130f66393d5f0235c1c4c27441f9582 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 28 Jan 2023 16:21:16 -0400
Subject: [PATCH] Flatpak build improvements (#784)

---
 .../linux/flatpak/dev.lizardbyte.sunshine.yml | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 1bd9926e..1ad23b3e 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -107,24 +107,7 @@ modules:
         commands:
           - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done
 
-  - name: libdrm
-    # libdrm-intel is needed for libmfx-dev
-    disabled: false
-    buildsystem: meson
-    only-arches:
-      - x86_64
-    sources:
-      - type: archive
-        url: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm_2.4.110.orig.tar.xz
-        sha256: eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737
-      - type: archive
-        url: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm_2.4.110-1ubuntu1.debian.tar.xz
-        sha256: 464b9553861f39beddfaee6b8924734b02a0febfae3968e4ca1360f2972bba8b
-      - type: shell
-        commands:
-          - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done
-
-  - name: libmfx-dev
+  - name: intel-mediasdk
     disabled: false
     buildsystem: cmake
     config-opts:
@@ -153,7 +136,39 @@ modules:
       - type: shell
         commands:
           - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done
+    modules:
+      - name: libdrm
+        disabled: false
+        buildsystem: meson
+        sources:
+          - type: archive
+            url: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm_2.4.110.orig.tar.xz
+            sha256: eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737
+          - type: archive
+            url: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm_2.4.110-1ubuntu1.debian.tar.xz
+            sha256: 464b9553861f39beddfaee6b8924734b02a0febfae3968e4ca1360f2972bba8b
+          - type: shell
+            commands:
+              - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done
 
+  - name: numactl
+    buildsystem: autotools
+    make-args:
+      - install
+    sources:
+      - type: archive
+        url: http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/numactl_2.0.14.orig.tar.gz
+        sha256: 1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035
+      - type: archive
+        url: http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/numactl_2.0.14-3ubuntu2.debian.tar.xz
+        sha256: 49089e5be5367f6367f8b0389d1d523944432607783b53f0605705792e1015ee
+      - type: shell
+        commands:
+          - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done
+    cleanup:
+      - "/bin"
+
+  # Caching is configured until here, not including CUDA
   - name: cuda
     disabled: false
     buildsystem: simple
@@ -161,7 +176,7 @@ modules:
       - x86_64
       - aarch64
     cleanup:
-      - '*'
+      - "*"
     build-commands:
       - chmod u+x ./cuda.run
       - ./cuda.run --silent --toolkit --toolkitpath=$FLATPAK_DEST/cuda --no-opengl-libs --no-man-page --no-drm
@@ -182,23 +197,6 @@ modules:
         sha256: e6e9a8d31163c9776b5e313fd7590877c5684e1ecddee741154f95704d4ed27c
         dest-filename: cuda.run
 
-  - name: numactl
-    buildsystem: autotools
-    make-args:
-      - install
-    sources:
-      - type: archive
-        url: http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/numactl_2.0.14.orig.tar.gz
-        sha256: 1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035
-      - type: archive
-        url: http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/numactl_2.0.14-3ubuntu2.debian.tar.xz
-        sha256: 49089e5be5367f6367f8b0389d1d523944432607783b53f0605705792e1015ee
-      - type: shell
-        commands:
-          - for n in $(cat patches/series); do if [[ $n != "#"* ]]; then patch -Np1 -i "patches/$n" -d .; fi; done
-    cleanup:
-      - "/bin"
-
   - name: sunshine
     disabled: false
     buildsystem: cmake
@@ -228,9 +226,9 @@ modules:
       - -DSUNSHINE_CONFIGURE_FLATPAK=ON
     sources:
       - type: git
-        url: '@GITHUB_CLONE_URL@'
-        branch: '@GITHUB_BRANCH@'
-        commit: '@GITHUB_COMMIT@'
+        url: "@GITHUB_CLONE_URL@"
+        branch: "@GITHUB_BRANCH@"
+        commit: "@GITHUB_COMMIT@"
     post-install:
       # use `sed` to update apps.json with prefixes required for flatpak
       # -r (regex)