[cmake, externals] android x86_64 support (#3086)

Updates all of our bundled CI deps to support android x86_64, adds a
build flavor thereof (`chromeOS`), and also adds sirit mingw support.

The new FFmpeg package is built in a much better way that actually makes
it identically built to the other CI packages, meaning we now have real
8.0.0 support, no need for libvpx/cpu_features/all that other crap.
PLUS, we can now statically link it! Hooray! It's also built with
MediaCodec support so in the future we can work on that.

Rewrote the android build script too, plus added a copyFlavorTypeOutput
target that assembles and copies the APK. The code behind it sucks
because I'm not great with Gradle but hey, it works.

Testers: please test everything related to video decoding. VP9 and h264, games that normally suck with their prerendered stuff, make sure I didn't nuke it to oblivion, etc.

Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3086
Reviewed-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Reviewed-by: Lizzie <lizzie@eden-emu.dev>

3 files changed, 6 insertions, 20 deletions

diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index ee5ccb451e..7f5af5dfce 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -9,7 +9,7 @@
     },
     "sirit": {
         "repo": "eden-emulator/sirit",
-        "git_version": "1.0.2",
+        "git_version": "1.0.3",
         "tag": "v%VERSION%",
         "artifact": "sirit-source-%VERSION%.tar.zst",
         "hash_suffix": "sha512sum",
@@ -23,11 +23,7 @@
         "package": "sirit",
         "name": "sirit",
         "repo": "eden-emulator/sirit",
-        "version": "1.0.2",
-        "disabled_platforms": [
-            "mingw-amd64",
-            "mingw-arm64"
-        ]
+        "version": "1.0.3"
     },
     "httplib": {
         "repo": "yhirose/cpp-httplib",
@@ -167,7 +163,7 @@
         "package": "SDL2",
         "name": "SDL2",
         "repo": "crueter-ci/SDL2",
-        "version": "2.32.10-38e0094637",
+        "version": "2.32.10-a65111bd2d",
         "min_version": "2.26.4"
     },
     "catch2": {
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 58461d8934..d71613db8c 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -114,16 +114,6 @@ if (UNIX AND NOT ANDROID)
 endif()
 
 if (YUZU_USE_BUNDLED_FFMPEG)
-    # MSVC conflicts with ksuser otherwise
-    # MinGW has the funny quirk of requiring avutil after avcodec
-    # Android needs some deps to be compiled with PIC (TODO)
-    # TODO(crueter) fix
-    if (ANDROID)
-        set(BUILD_SHARED_LIBS ON)
-    else()
-        set(BUILD_SHARED_LIBS OFF)
-    endif()
-
     AddJsonPackage(ffmpeg-ci)
 
     set(FFmpeg_INCLUDE_DIR
diff --git a/externals/ffmpeg/cpmfile.json b/externals/ffmpeg/cpmfile.json
index 0baeeb4713..0d0a612eda 100644
--- a/externals/ffmpeg/cpmfile.json
+++ b/externals/ffmpeg/cpmfile.json
@@ -1,8 +1,8 @@
 {
     "ffmpeg": {
         "repo": "FFmpeg/FFmpeg",
-        "sha": "c2184b65d2",
-        "hash": "007b1ccdd4d3ea3324835258d9a255103253bd66edb442b12d9c60dca85149cad52136a3b3120e5094115b6a3d9e80eeacbf9c07e5ffafc9ac459614d5fa3b22",
+        "sha": "ddf443f1e9",
+        "hash": "ded1c313843f23805102565bd3ca92602fb9c2951e059ca5e1a486ab3ef7d589acccf3cde05c5ff0cfc5199c3a261dccb4d2a93254e585824850696fb41a292e",
         "bundled": true
     },
     "ffmpeg-ci": {
@@ -10,7 +10,7 @@
         "package": "FFmpeg",
         "name": "ffmpeg",
         "repo": "crueter-ci/FFmpeg",
-        "version": "8.0-be99d2c0b2",
+        "version": "8.0-ddf443f1e9",
         "min_version": "4.1"
     }
 }