diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/cpmfile.json | 7 | ||||
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 72adb8fece..e1dfa838cc 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -28,12 +28,11 @@ "httplib": { "repo": "yhirose/cpp-httplib", "tag": "v%VERSION%", - "hash": "5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded", - "git_version": "0.37.0", + "hash": "159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9", + "git_version": "0.46.0", "find_args": "MODULE GLOBAL", "patches": [ - "0001-mingw.patch", - "0002-fix-zstd.patch" + "0001-mingw.patch" ], "options": [ "HTTPLIB_REQUIRE_OPENSSL ON", diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 2d85876ad2..7908e0a619 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -59,7 +59,7 @@ endif() if (PLATFORM_PS4 OR PLATFORM_MANAGARM) # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi) -elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING) +elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID) find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) pkg_check_modules(CUDA cuda) @@ -169,7 +169,7 @@ if (PLATFORM_PS4) ) elseif (PLATFORM_MANAGARM) # Required for proper stuff - list(APPEND FFmpeg_CROSS_COMPILE_FLAGS + list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --disable-pthreads --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}" ) |