Update libyuv.cmd: a4f653b38 (1908) Remove ext/libyuv.patch.
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e380e1..de2ef7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ * Update googletest.cmd/LocalGTest.cmake: v1.16.0 * Update libsharpyuv: v1.5.0 * Update libxml2.cmd/LocalLibXml2.cmake: v2.14.0 -* Update libyuv.cmd: dc47c71b3 (1907) +* Update libyuv.cmd: a4f653b38 (1908) * Update zlibpng.cmd: libpng 1.6.47 * Fix wrong Exif orientation set in JPEG or PNG output by avifdec when the input AVIF file has an ImageRotation property with angle set to 1 or 3, has no
diff --git a/cmake/Modules/LocalLibyuv.cmake b/cmake/Modules/LocalLibyuv.cmake index 9c31005..28a1c0d 100644 --- a/cmake/Modules/LocalLibyuv.cmake +++ b/cmake/Modules/LocalLibyuv.cmake
@@ -1,4 +1,4 @@ -set(AVIF_LIBYUV_TAG "dc47c71b3ec6900ca336e712b2217ffe0c9e5a27") +set(AVIF_LIBYUV_TAG "a4f653b38993a0f3aee9821b893266afd96c8977") set(AVIF_LIBYUV_BUILD_DIR "${AVIF_SOURCE_DIR}/ext/libyuv/build") # If ${ANDROID_ABI} is set, look for the library under that subdirectory. @@ -40,8 +40,6 @@ GIT_REPOSITORY "https://chromium.googlesource.com/libyuv/libyuv" BINARY_DIR "${LIBYUV_BINARY_DIR}" GIT_TAG "${AVIF_LIBYUV_TAG}" - # TODO: https://libyuv.issues.chromium.org/issues/399856238 - Remove when fixed upstream - PATCH_COMMAND git apply --ignore-whitespace "${AVIF_SOURCE_DIR}/ext/libyuv.patch" UPDATE_COMMAND "" )
diff --git a/ext/libyuv.cmd b/ext/libyuv.cmd index 1c5559a..4dc8a26 100755 --- a/ext/libyuv.cmd +++ b/ext/libyuv.cmd
@@ -17,11 +17,7 @@ : # When changing the commit below to a newer version of libyuv, it is best to make sure it is being used by chromium, : # because the test suite of chromium provides additional test coverage of libyuv. : # It can be looked up at https://source.chromium.org/chromium/chromium/src/+/main:DEPS?q=libyuv. -git checkout dc47c71b3 - -: # TODO: https://libyuv.issues.chromium.org/issues/399856238 - Remove when fixed upstream -git apply --ignore-whitespace ../libyuv.patch - +git checkout a4f653b38 cd .. cmake -G Ninja -S libyuv -B libyuv/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON
diff --git a/ext/libyuv.patch b/ext/libyuv.patch deleted file mode 100644 index f89ac06..0000000 --- a/ext/libyuv.patch +++ /dev/null
@@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5df76856..eae0b729 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,13 +112,13 @@ if(NOT MSVC) - ${ly_src_dir}/rotate_neon64.cc - ${ly_src_dir}/row_neon64.cc - ${ly_src_dir}/scale_neon64.cc) -- target_compile_options(${ly_lib_name}_neon64 PRIVATE -march=armv8-a+dotprod+i8mm) -+ target_compile_options(${ly_lib_name}_neon64 PRIVATE -march=armv8.2-a+dotprod+i8mm) - list(APPEND ly_lib_parts $<TARGET_OBJECTS:${ly_lib_name}_neon64>) - - # Enable AArch64 SVE kernels. - add_library(${ly_lib_name}_sve OBJECT - ${ly_src_dir}/row_sve.cc) -- target_compile_options(${ly_lib_name}_sve PRIVATE -march=armv9-a+sve2) -+ target_compile_options(${ly_lib_name}_sve PRIVATE -march=armv8.5-a+sve2) - list(APPEND ly_lib_parts $<TARGET_OBJECTS:${ly_lib_name}_sve>) - - set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})