OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-15 06:30:05 +00:00
Code Issues Projects Releases Wiki Activity

cmake: download architecture-specific ffmpeg for android

Browse Source
This commit is contained in:
Liam 2023-03-16 14:41:27 -04:00 committed by bunnei
parent 616cf70a80
commit ee10cdad35
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/DownloadExternals.cmake
View File

@ -19,7 +19,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
elseif (ANDROID) elseif (ANDROID)
set(package_base_url "https://gitlab.com/tertius42/") set(package_base_url "https://gitlab.com/tertius42/")
set(package_repo "ext-android-bin/-/raw/main/") set(package_repo "ext-android-bin/-/raw/main/")
set(package_extension ".tar.xz") #ffmpeg/ffmpeg-android-20221229.tar.xz") set(package_extension ".tar.xz")
else() else()
message(FATAL_ERROR "No package available for this platform") message(FATAL_ERROR "No package available for this platform")
endif() endif()

8
externals/ffmpeg/CMakeLists.txt vendored
View File

@ -223,7 +223,13 @@ if (NOT WIN32 AND NOT ANDROID)
endif() endif()
elseif(ANDROID) elseif(ANDROID)
# Use yuzu FFmpeg binaries # Use yuzu FFmpeg binaries
set(FFmpeg_EXT_NAME "ffmpeg-android-v4.4.LTS") if (ARCHITECTURE_arm64)
set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-aarch64")
elseif (ARCHITECTURE_x86_64)
set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-x86_64")
else()
message(FATAL_ERROR "Unsupported architecture for Android FFmpeg")
endif()
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
set(FFmpeg_FOUND YES) set(FFmpeg_FOUND YES)