diff --git a/cmake/modules/FindDav1d.cmake b/cmake/modules/FindDav1d.cmake index a7c5632e605..896ac31010b 100644 --- a/cmake/modules/FindDav1d.cmake +++ b/cmake/modules/FindDav1d.cmake @@ -102,10 +102,19 @@ if(NOT TARGET LIBRARY::${CMAKE_FIND_PACKAGE_NAME}) cmake_language(EVAL CODE " buildmacro${CMAKE_FIND_PACKAGE_NAME}() ") + + # Meson uses pkgconfig, therefore we no longer need the windows cmake config. + # remove the cmake config, as otherwise our search order will constantly find the old + # cmake config lib rather than the new pkgconfig + if(TARGET dav1d::dav1d) + if(EXISTS "${DEPENDS_PATH}/lib/cmake/dav1d") + file(REMOVE_RECURSE "${DEPENDS_PATH}/lib/cmake/dav1d") + endif() + endif() endif() if(${${CMAKE_FIND_PACKAGE_NAME}_SEARCH_NAME}_FOUND) - # cmake target and not building internal + # dav1d::dav1d target is a legacy target from windows kodi-deps build of dav1d if(TARGET dav1d::dav1d AND NOT TARGET ${${${CMAKE_FIND_PACKAGE_NAME}_MODULE}_BUILD_NAME}) add_library(LIBRARY::${CMAKE_FIND_PACKAGE_NAME} ALIAS dav1d::dav1d) elseif(TARGET PkgConfig::${${CMAKE_FIND_PACKAGE_NAME}_SEARCH_NAME} AND NOT TARGET ${${${CMAKE_FIND_PACKAGE_NAME}_MODULE}_BUILD_NAME}) diff --git a/project/BuildDependencies/scripts/0_package.target-arm64.list b/project/BuildDependencies/scripts/0_package.target-arm64.list index 482ed951a3e..77f019fea1a 100644 --- a/project/BuildDependencies/scripts/0_package.target-arm64.list +++ b/project/BuildDependencies/scripts/0_package.target-arm64.list @@ -6,7 +6,6 @@ ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -dav1d-1.5.1-arm64-v142-20250209.7z detours-64ec13-arm64-v142-20250209.7z dnssd-878.260.1-arm64-v142-20250209.7z expat-2.7.3-arm64-v143-20251018.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win10-arm.list b/project/BuildDependencies/scripts/0_package.target-win10-arm.list index a419b19d969..e5dde3bbc0b 100644 --- a/project/BuildDependencies/scripts/0_package.target-win10-arm.list +++ b/project/BuildDependencies/scripts/0_package.target-win10-arm.list @@ -6,7 +6,6 @@ ; -> sqlite-3.7.12.1-arm\system\sqlite3.dll ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -dav1d-1.5.1-win10-arm-v142-20250209.7z expat-2.2.9-win10-arm-v141-20200105.7z freetype-2.10.1-win10-arm-v141-20200105.7z fstrcmp-0.7-win10-arm-v141-20200105.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win10-win32.list b/project/BuildDependencies/scripts/0_package.target-win10-win32.list index 933fe3ea2fa..a76e56c16f6 100644 --- a/project/BuildDependencies/scripts/0_package.target-win10-win32.list +++ b/project/BuildDependencies/scripts/0_package.target-win10-win32.list @@ -6,7 +6,6 @@ ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -dav1d-1.5.1-win10-win32-v142-20250209.7z expat-2.7.3-win10-win32-v143-20251018.7z freetype-2.10.1-win10-win32-v141-20200105.7z fstrcmp-0.7-win10-win32-v141-20200105.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win10-x64.list b/project/BuildDependencies/scripts/0_package.target-win10-x64.list index 7f1484bba60..58eb154be94 100644 --- a/project/BuildDependencies/scripts/0_package.target-win10-x64.list +++ b/project/BuildDependencies/scripts/0_package.target-win10-x64.list @@ -6,7 +6,6 @@ ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -dav1d-1.5.1-win10-x64-v142-20250209.7z expat-2.7.3-win10-x64-v143-20251018.7z freetype-2.10.1-win10-x64-v141-20200105.7z fstrcmp-0.7-win10-x64-v141-20200105.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win32.list b/project/BuildDependencies/scripts/0_package.target-win32.list index a4ba28ef687..924405f9922 100644 --- a/project/BuildDependencies/scripts/0_package.target-win32.list +++ b/project/BuildDependencies/scripts/0_package.target-win32.list @@ -6,7 +6,6 @@ ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -dav1d-1.5.1-win32-v142-20250209.7z detours-64ec13-win32-v141-20200105.7z dnssd-878.260.1-win32-v141-20200105.7z expat-2.7.3-win32-v143-20251018.7z diff --git a/project/BuildDependencies/scripts/0_package.target-x64.list b/project/BuildDependencies/scripts/0_package.target-x64.list index 1cb66e53230..9bb6bb67713 100644 --- a/project/BuildDependencies/scripts/0_package.target-x64.list +++ b/project/BuildDependencies/scripts/0_package.target-x64.list @@ -6,7 +6,6 @@ ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll ; -> ... ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -dav1d-1.5.1-x64-v142-20250209.7z detours-64ec13-x64-v141-20200105.7z dnssd-878.260.1-x64-v141-20200105.7z expat-2.7.3-x64-v143-20251018.7z