From 21b6c79c4ec2e2141515e9735a2a78e9d8933f0c Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Thu, 20 Apr 2023 07:00:15 +0000
Subject: [PATCH 1/2] FFMPEG: disabled module in favor of the extension

---
 net.retrodeck.retrodeck.yml | 30 +++++++++++++++---------------
 rd-submodules/retroarch     |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 7d0c7105..2532e1bb 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -226,21 +226,21 @@ modules:
   # https://gitlab.com/es-de/emulationstation-de
 
   #This is disabled because we added the extension (line 11), check if the videos are ok.
-  - name: ffmpeg
-    config-opts:
-      - --disable-static
-      - --disable-programs
-      - --disable-doc
-      - --enable-gpl
-      - --enable-shared
-      - --enable-libvorbis
-      - --enable-libopus
-      - --enable-libvpx
-      - --enable-postproc
-    sources:
-      - type: git
-        url: https://github.com/FFmpeg/FFmpeg.git
-        tag: n5.1.1
+  # - name: ffmpeg
+  #   config-opts:
+  #     - --disable-static
+  #     - --disable-programs
+  #     - --disable-doc
+  #     - --enable-gpl
+  #     - --enable-shared
+  #     - --enable-libvorbis
+  #     - --enable-libopus
+  #     - --enable-libvpx
+  #     - --enable-postproc
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/FFmpeg/FFmpeg.git
+  #       tag: n5.1.1
 
   - name: freeimage
     no-autogen: true
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 0b1cfb79..717b7809 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8

From dd6c35352fe5f75427aad500657bc989a97929ac Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Thu, 20 Apr 2023 12:41:27 +0000
Subject: [PATCH 2/2] RPCS3: forced using our built FFMPEG

---
 net.retrodeck.retrodeck.yml | 47 +++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 2532e1bb..58dab9bb 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -8,13 +8,13 @@ sdk-extensions:
   #- org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx - Removed, check if it's not breaking something else
 base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
 base-version: 5.15-22.08                    # Needed for Yuzu
-add-extensions:
-  org.freedesktop.Platform.ffmpeg-full:
-    directory: lib/ffmpeg
-    add-ld-path: .
-    version: '22.08'
-    autodownload: true
-    autodelete: false
+# add-extensions:
+#   org.freedesktop.Platform.ffmpeg-full:
+#     directory: lib/ffmpeg
+#     add-ld-path: .
+#     version: '22.08'
+#     autodownload: true
+#     autodelete: false
 command: retrodeck.sh
 
 finish-args:
@@ -226,21 +226,21 @@ modules:
   # https://gitlab.com/es-de/emulationstation-de
 
   #This is disabled because we added the extension (line 11), check if the videos are ok.
-  # - name: ffmpeg
-  #   config-opts:
-  #     - --disable-static
-  #     - --disable-programs
-  #     - --disable-doc
-  #     - --enable-gpl
-  #     - --enable-shared
-  #     - --enable-libvorbis
-  #     - --enable-libopus
-  #     - --enable-libvpx
-  #     - --enable-postproc
-  #   sources:
-  #     - type: git
-  #       url: https://github.com/FFmpeg/FFmpeg.git
-  #       tag: n5.1.1
+  - name: ffmpeg
+    config-opts:
+      - --disable-static
+      - --disable-programs
+      - --disable-doc
+      - --enable-gpl
+      - --enable-shared
+      - --enable-libvorbis
+      - --enable-libopus
+      - --enable-libvpx
+      - --enable-postproc
+    sources:
+      - type: git
+        url: https://github.com/FFmpeg/FFmpeg.git
+        tag: n5.1.1
 
   - name: freeimage
     no-autogen: true
@@ -826,7 +826,8 @@ modules:
       - -DUSE_NATIVE_INSTRUCTIONS=OFF
       - -DUSE_PRECOMPILED_HEADERS=OFF
       - -DUSE_SYSTEM_CURL=ON
-      - -DUSE_SYSTEM_FFMPEG=ON
+      # Disabled this to force RPCS3 to use our built FFMPEG
+      - -DUSE_SYSTEM_FFMPEG=OFF
       - -DUSE_SYSTEM_LIBPNG=ON
       - -DUSE_SYSTEM_ZLIB=ON
       - -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi