diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh index cdaf512406..502d39cfa4 100755 --- a/.ci/linux/build.sh +++ b/.ci/linux/build.sh @@ -47,7 +47,6 @@ cmake .. -G Ninja \ -DCMAKE_C_FLAGS="$ARCH_FLAGS" \ -DYUZU_USE_BUNDLED_VCPKG=OFF \ -DYUZU_USE_BUNDLED_QT=OFF \ - -DYUZU_USE_BUNDLED_FFMPEG=OFF \ -DYUZU_USE_BUNDLED_SDL2=OFF \ -DYUZU_USE_EXTERNAL_SDL2=ON \ -DYUZU_TESTS=OFF \ diff --git a/CMakeLists.txt b/CMakeLists.txt index d9958fcb94..830997fe4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) -option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") +option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "ON") option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON) @@ -402,6 +402,13 @@ if (ENABLE_SDL2) endif() endif() +# List of all FFmpeg components required +set(FFmpeg_COMPONENTS + avcodec + avfilter + avutil + swscale) + add_subdirectory(externals) if (ENABLE_QT) @@ -465,13 +472,6 @@ function(set_yuzu_qt_components) set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE) endfunction(set_yuzu_qt_components) -# List of all FFmpeg components required -set(FFmpeg_COMPONENTS - avcodec - avfilter - avutil - swscale) - if (UNIX AND NOT APPLE AND NOT ANDROID) find_package(PkgConfig REQUIRED) pkg_check_modules(LIBVA libva) diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 6f2fb1112e..88ee0f46d2 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -32,6 +32,7 @@ if (NOT WIN32 AND NOT ANDROID) endif() unset(FFmpeg_LIBRARIES CACHE) + foreach(COMPONENT ${FFmpeg_COMPONENTS}) set(FFmpeg_${COMPONENT}_PREFIX "${FFmpeg_BUILD_DIR}/lib${COMPONENT}") set(FFmpeg_${COMPONENT}_LIB_NAME "lib${COMPONENT}.a") diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg index 62e1c44263..9c1294eadd 160000 --- a/externals/ffmpeg/ffmpeg +++ b/externals/ffmpeg/ffmpeg @@ -1 +1 @@ -Subproject commit 62e1c442633e8a09a1407a789cd2b50611850788 +Subproject commit 9c1294eaddb88cb0e044c675ccae059a85fc9c6c