mirror
/
xbmc
mirror of https://github.com/xbmc/xbmc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[win] Builddependencies remove prebuilt dav1d

This commit is contained in:
fuzzard 2025-11-04 13:47:54 +10:00
parent 67efed9f3f
commit 4c2d286167
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/modules/FindDav1d.cmake
View File

@ -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})

1
project/BuildDependencies/scripts/0_package.target-arm64.list
View File

@ -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

1
project/BuildDependencies/scripts/0_package.target-win10-arm.list
View File

@ -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

1
project/BuildDependencies/scripts/0_package.target-win10-win32.list
View File

@ -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

1
project/BuildDependencies/scripts/0_package.target-win10-x64.list
View File

@ -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

1
project/BuildDependencies/scripts/0_package.target-win32.list
View File

@ -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

1
project/BuildDependencies/scripts/0_package.target-x64.list
View File

@ -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