Merge remote-tracking branch 'upstream/cooker-0.7.0b' into cooker-0.7.0b-icenine451

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:
@@ -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

rd-submodules/retroarch

@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8