From 2bf09ce4257a21198af275d745950f30b87cb5f7 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Mon, 16 Jan 2023 08:02:03 -0400
Subject: [PATCH 1/3] Make libdrm a submodule and cache numactl

---
 .../linux/flatpak/dev.lizardbyte.sunshine.yml | 97 +++++++++----------
 1 file changed, 47 insertions(+), 50 deletions(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 1bd9926ec69..1d236df79e1 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -8,16 +8,16 @@ sdk-extensions:
 command: sunshine
 separate-locales: false
 finish-args:
-  - --device=all  # access all devices
-  - --env=PULSE_PROP_media.category=Manager  # allow sunshine to manage audio sinks
-  - --filesystem=home  # need to save files in user's home directory
-  - --share=ipc  # required for X11 shared memory extension
-  - --share=network  # access network
-  - --socket=pulseaudio  # play sounds using pulseaudio
-  - --socket=wayland  # show windows using Wayland
-  - --socket=x11  # show windows using X11
-  - --system-talk-name=org.freedesktop.Avahi  # talk to avahi on the system bus
-  - --talk-name=org.freedesktop.Flatpak  # talk to flatpak on the session bus
+  - --device=all # access all devices
+  - --env=PULSE_PROP_media.category=Manager # allow sunshine to manage audio sinks
+  - --filesystem=home # need to save files in user's home directory
+  - --share=ipc # required for X11 shared memory extension
+  - --share=network # access network
+  - --socket=pulseaudio # play sounds using pulseaudio
+  - --socket=wayland # show windows using Wayland
+  - --socket=x11 # show windows using X11
+  - --system-talk-name=org.freedesktop.Avahi # talk to avahi on the system bus
+  - --talk-name=org.freedesktop.Flatpak # talk to flatpak on the session bus
 
 cleanup:
   - /include
@@ -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,6 +136,37 @@ 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"
 
   - name: cuda
     disabled: false
@@ -161,7 +175,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
@@ -178,27 +192,10 @@ modules:
       - type: file
         only-arches:
           - aarch64
-        url: https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux_sbsa.run  # yamllint disable-line rule:line-length
+        url: https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux_sbsa.run # yamllint disable-line rule:line-length
         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 +225,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)

From b41ebb207a5b143698d4d8b94b6268abef472d6e Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 26 Jan 2023 07:38:14 -0400
Subject: [PATCH 2/3] Update dev.lizardbyte.sunshine.yml

---
 .../linux/flatpak/dev.lizardbyte.sunshine.yml | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 1d236df79e1..9da6592ba90 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -8,16 +8,16 @@ sdk-extensions:
 command: sunshine
 separate-locales: false
 finish-args:
-  - --device=all # access all devices
-  - --env=PULSE_PROP_media.category=Manager # allow sunshine to manage audio sinks
-  - --filesystem=home # need to save files in user's home directory
-  - --share=ipc # required for X11 shared memory extension
-  - --share=network # access network
-  - --socket=pulseaudio # play sounds using pulseaudio
-  - --socket=wayland # show windows using Wayland
-  - --socket=x11 # show windows using X11
-  - --system-talk-name=org.freedesktop.Avahi # talk to avahi on the system bus
-  - --talk-name=org.freedesktop.Flatpak # talk to flatpak on the session bus
+  - --device=all  # access all devices
+  - --env=PULSE_PROP_media.category=Manager  # allow sunshine to manage audio sinks
+  - --filesystem=home  # need to save files in user's home directory
+  - --share=ipc  # required for X11 shared memory extension
+  - --share=network  # access network
+  - --socket=pulseaudio  # play sounds using pulseaudio
+  - --socket=wayland  # show windows using Wayland
+  - --socket=x11  # show windows using X11
+  - --system-talk-name=org.freedesktop.Avahi  # talk to avahi on the system bus
+  - --talk-name=org.freedesktop.Flatpak  # talk to flatpak on the session bus
 
 cleanup:
   - /include
@@ -168,6 +168,7 @@ modules:
     cleanup:
       - "/bin"
 
+  # Caching is configured until here, not including CUDA 
   - name: cuda
     disabled: false
     buildsystem: simple
@@ -192,7 +193,7 @@ modules:
       - type: file
         only-arches:
           - aarch64
-        url: https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux_sbsa.run # yamllint disable-line rule:line-length
+        url: https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux_sbsa.run  # yamllint disable-line rule:line-length
         sha256: e6e9a8d31163c9776b5e313fd7590877c5684e1ecddee741154f95704d4ed27c
         dest-filename: cuda.run
 

From a0c2245be47bff1053e2c299704fe16d6530be90 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 26 Jan 2023 21:21:12 -0400
Subject: [PATCH 3/3] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 9da6592ba90..1ad23b3e8e7 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -168,7 +168,7 @@ modules:
     cleanup:
       - "/bin"
 
-  # Caching is configured until here, not including CUDA 
+  # Caching is configured until here, not including CUDA
   - name: cuda
     disabled: false
     buildsystem: simple