From 851b1008a881010b90002f4af9d0a4ac36710fea Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 30 Dec 2022 00:29:53 -0800 Subject: cmake: Integrate bundled FFmpeg for Android. --- CMakeModules/DownloadExternals.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'CMakeModules') diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 8fe5ba48d..814069f0b 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -7,6 +7,7 @@ # prefix_var: name of a variable which will be set with the path to the extracted contents function(download_bundled_external remote_path lib_name prefix_var) +set(package_base_url "https://github.com/yuzu-emu/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32) @@ -15,10 +16,14 @@ if (WIN32) elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_repo "ext-linux-bin/raw/main/") set(package_extension ".tar.xz") +elseif (ANDROID) + set(package_base_url "https://gitlab.com/tertius42/") + set(package_repo "ext-android-bin/-/raw/main/") + set(package_extension ".tar.xz") #ffmpeg/ffmpeg-android-20221229.tar.xz") else() message(FATAL_ERROR "No package available for this platform") endif() -set(package_url "https://github.com/yuzu-emu/${package_repo}") +set(package_url "${package_base_url}${package_repo}") set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") if (NOT EXISTS "${prefix}") -- cgit v1.2.3 From ee10cdad35e46245aac799d31314d4e960e6b791 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 16 Mar 2023 14:41:27 -0400 Subject: cmake: download architecture-specific ffmpeg for android --- CMakeModules/DownloadExternals.cmake | 2 +- externals/ffmpeg/CMakeLists.txt | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'CMakeModules') diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 814069f0b..2e5964cbe 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -19,7 +19,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif (ANDROID) set(package_base_url "https://gitlab.com/tertius42/") 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() message(FATAL_ERROR "No package available for this platform") endif() diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 093616629..0a926e399 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -223,7 +223,13 @@ if (NOT WIN32 AND NOT ANDROID) endif() elseif(ANDROID) # 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}") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") set(FFmpeg_FOUND YES) -- cgit v1.2.3 From b2570d25469af2fc5c969f6ce57d098dfe1bae71 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 31 May 2023 15:06:21 -0700 Subject: android: Use ext-android-bin for external binaries. --- CMakeModules/DownloadExternals.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'CMakeModules') diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 2e5964cbe..972f5ca74 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -17,8 +17,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_repo "ext-linux-bin/raw/main/") set(package_extension ".tar.xz") elseif (ANDROID) - 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") else() message(FATAL_ERROR "No package available for this platform") -- cgit v1.2.3