Skip to content

Commit cefc179

Browse files
authored
Merge pull request xbmc#27550 from fuzzard/fix_cmake_dav1d-ffmpeg
[cmake] FindFFMPEG
2 parents 620e401 + 59e933e commit cefc179

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

cmake/modules/FindFFMPEG.cmake

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,15 @@ macro(buildFFMPEG)
3030
include(cmake/scripts/common/ModuleHelpers.cmake)
3131

3232
# Check for dependencies - Must be done before SETUP_BUILD_VARS
33-
get_libversion_data("dav1d" "target")
34-
find_package(Dav1d ${LIB_DAV1D_VER} MODULE ${SEARCH_QUIET})
33+
if(KODI_DEPENDSBUILD OR (WIN32 OR WINDOWS_STORE))
34+
get_libversion_data("dav1d" "target")
35+
set(DAV1D_REQUIRED REQUIRED)
36+
else()
37+
# FFMPEG 7+ currently only has a version requirement of Dav1d 1.0.0
38+
set(LIB_DAV1D_VER 1.0.0)
39+
endif()
40+
41+
find_package(Dav1d ${LIB_DAV1D_VER} ${DAV1D_REQUIRED} ${SEARCH_QUIET})
3542
if(NOT TARGET LIBRARY::Dav1d)
3643
message(STATUS "dav1d not found, internal ffmpeg build will be missing AV1 support!")
3744
else()
@@ -314,7 +321,7 @@ else()
314321

315322
# ToDo: We cant use IMPORTED_TARGET yet.
316323
# Linux CI fails with gmp related link issues when using the imported target
317-
pkg_check_modules(FFMPEG_${libname_UPPER} ${libname}${libversion} REQUIRED ${SEARCH_QUIET})
324+
pkg_check_modules(FFMPEG_${libname_UPPER} ${libname}${libversion} ${SEARCH_QUIET})
318325

319326
# As windows does a simple find_library call, the output is a filename to the library
320327
# for the pkgconfig search, we can get the full file path from _LINK_LIBRARIES first element

0 commit comments

Comments
 (0)