From 2960d7d80e8d09c84ae8abf15c12196c2ca7d39a Mon Sep 17 00:00:00 2001
From: Chase Knowlden <haroldknowlden@gmail.com>
Date: Mon, 30 Sep 2024 13:36:03 -0400
Subject: [PATCH] [libyuv] Fix build error on macOS with llvm 19 (#41174)

---
 ports/libyuv/cmake.diff     | 4 ++--
 ports/libyuv/portfile.cmake | 2 +-
 ports/libyuv/vcpkg.json     | 2 +-
 versions/baseline.json      | 2 +-
 versions/l-/libyuv.json     | 5 +++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/libyuv/cmake.diff b/ports/libyuv/cmake.diff
index 6da1b027a5..843afb9aa5 100644
--- a/ports/libyuv/cmake.diff
+++ b/ports/libyuv/cmake.diff
@@ -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()
diff --git a/ports/libyuv/portfile.cmake b/ports/libyuv/portfile.cmake
index fa3f2dc446..80450bccef 100644
--- a/ports/libyuv/portfile.cmake
+++ b/ports/libyuv/portfile.cmake
@@ -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
diff --git a/ports/libyuv/vcpkg.json b/ports/libyuv/vcpkg.json
index 6408bcd787..4b8c9cef5c 100644
--- a/ports/libyuv/vcpkg.json
+++ b/ports/libyuv/vcpkg.json
@@ -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",
diff --git a/versions/baseline.json b/versions/baseline.json
index 88e0e6e287..ad1ac265e2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5449,7 +5449,7 @@
       "port-version": 5
     },
     "libyuv": {
-      "baseline": "1895",
+      "baseline": "1896",
       "port-version": 1
     },
     "libzen": {
diff --git a/versions/l-/libyuv.json b/versions/l-/libyuv.json
index a4fd841b0e..5dd190655d 100644
--- a/versions/l-/libyuv.json
+++ b/versions/l-/libyuv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb6412fd44057b52849ebf8807a0c339cb525104",
+      "version": "1896",
+      "port-version": 1
+    },
     {
       "git-tree": "9a0250bfbce25cfd98ed744db8528d4214fe3d56",
       "version": "1895",