mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:48:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libyuv] Fix build error on macOS with llvm 19 (#41174)

Browse Source
This commit is contained in:
Chase Knowlden 2024-09-30 13:36:03 -04:00 committed by GitHub
parent dd6fbdd22c
commit 2960d7d80e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/libyuv/cmake.diff
View File

@ -41,9 +41,9 @@ index 9a20941d..d161326c 100644
# install the conversion tool, .so, .a, and all the header files # install the conversion tool, .so, .a, and all the header files
-install ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin ) -install ( TARGETS yuvconvert DESTINATION bin )
-install ( TARGETS ${ly_lib_static} DESTINATION lib ) -install ( TARGETS ${ly_lib_static} DESTINATION lib )
-install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) -install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib )
+if (BUILD_TOOLS) +if (BUILD_TOOLS)
+ install(TARGETS yuvconvert yuvconstants) + install(TARGETS yuvconvert yuvconstants)
+endif() +endif()

2
ports/libyuv/portfile.cmake
View File

@ -1,7 +1,7 @@
vcpkg_from_git( vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
URL https://chromium.googlesource.com/libyuv/libyuv URL https://chromium.googlesource.com/libyuv/libyuv
REF c21dda06dd8d19b6e50168c28c324c1f32e94407 # 6 commits after switch to 1895, reason: CMake changes REF a37e6bc81b52d39cdcfd0f1428f5d6c2b2bc9861 # 1896 Fixes build error on macOS Homebrew LLVM 19
# Check https://chromium.googlesource.com/libyuv/libyuv/+/refs/heads/main/include/libyuv/version.h for a version! # Check https://chromium.googlesource.com/libyuv/libyuv/+/refs/heads/main/include/libyuv/version.h for a version!
PATCHES PATCHES
cmake.diff cmake.diff

2
ports/libyuv/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "libyuv", "name": "libyuv",
"version": "1895", "version": "1896",
"port-version": 1, "port-version": 1,
"description": "libyuv is an open source project that includes YUV scaling and conversion functionality", "description": "libyuv is an open source project that includes YUV scaling and conversion functionality",
"homepage": "https://chromium.googlesource.com/libyuv/libyuv", "homepage": "https://chromium.googlesource.com/libyuv/libyuv",

2
versions/baseline.json
View File

@ -5449,7 +5449,7 @@
"port-version": 5 "port-version": 5
}, },
"libyuv": { "libyuv": {
"baseline": "1895", "baseline": "1896",
"port-version": 1 "port-version": 1
}, },
"libzen": { "libzen": {

5
versions/l-/libyuv.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "cb6412fd44057b52849ebf8807a0c339cb525104",
"version": "1896",
"port-version": 1
},
{ {
"git-tree": "9a0250bfbce25cfd98ed744db8528d4214fe3d56", "git-tree": "9a0250bfbce25cfd98ed744db8528d4214fe3d56",
"version": "1895", "version": "1895",