Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/libyuv/cmake.diff
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ index 9a20941d..d161326c 100644


# 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_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
-install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib )
+if (BUILD_TOOLS)
+ install(TARGETS yuvconvert yuvconstants)
+endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/libyuv/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
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!
PATCHES
cmake.diff
Expand Down
2 changes: 1 addition & 1 deletion ports/libyuv/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libyuv",
"version": "1895",
"version": "1896",
"port-version": 1,
"description": "libyuv is an open source project that includes YUV scaling and conversion functionality",
"homepage": "https://chromium.googlesource.com/libyuv/libyuv",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5441,7 +5441,7 @@
"port-version": 5
},
"libyuv": {
"baseline": "1895",
"baseline": "1896",
"port-version": 1
},
"libzen": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libyuv.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cb6412fd44057b52849ebf8807a0c339cb525104",
"version": "1896",
"port-version": 1
},
{
"git-tree": "9a0250bfbce25cfd98ed744db8528d4214fe3d56",
"version": "1895",
Expand Down