From b171feebd4f8b7943b56356f9ec1d4dbe44ab82f Mon Sep 17 00:00:00 2001
From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:44:34 -0700
Subject: [PATCH] [libavif] Update to 1.1.1 (#41569)

Co-authored-by: LilyWangLL <4945507022qq.com>
---
 ports/libavif/disable-source-utf8.patch | 24 +++++-----
 ports/libavif/find-dependency.patch     | 63 -------------------------
 ports/libavif/portfile.cmake            |  4 +-
 ports/libavif/vcpkg.json                |  3 +-
 versions/baseline.json                  |  4 +-
 versions/l-/libavif.json                |  5 ++
 6 files changed, 22 insertions(+), 81 deletions(-)
 delete mode 100644 ports/libavif/find-dependency.patch

diff --git a/ports/libavif/disable-source-utf8.patch b/ports/libavif/disable-source-utf8.patch
index 486a473c72..3cb92be7a9 100644
--- a/ports/libavif/disable-source-utf8.patch
+++ b/ports/libavif/disable-source-utf8.patch
@@ -1,15 +1,15 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d9431c..29d7d60 100644
+index baf5964..a28e6c3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -161,8 +161,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
-         # A C4556 warning will be generated on violation.
-         # Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case.
-         # Warnings can be suppressed but there will still be random characters printed to the console.
--        /source-charset:utf-8
--        /execution-charset:us-ascii
-+        #/source-charset:utf-8
-+        #/execution-charset:us-ascii
-     )
- else()
-     message(FATAL_ERROR "libavif: Unknown compiler, bailing out")
+@@ -296,8 +296,8 @@ if(MSVC)
+                    # A C4556 warning will be generated on violation.
+                    # Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case.
+                    # Warnings can be suppressed but there will still be random characters printed to the console.
+-                   /source-charset:utf-8
+-                   /execution-charset:us-ascii
++                   #/source-charset:utf-8
++                   #/execution-charset:us-ascii
+                    >
+         )
+     endif()
diff --git a/ports/libavif/find-dependency.patch b/ports/libavif/find-dependency.patch
deleted file mode 100644
index 4a4e93c078..0000000000
--- a/ports/libavif/find-dependency.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aca5d6f..48a26c3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -156,7 +156,10 @@ if(AVIF_LOCAL_LIBYUV)
-     set(libyuv_FOUND TRUE)
-     message(STATUS "libavif: local libyuv found; libyuv-based fast paths enabled.")
- else(AVIF_LOCAL_LIBYUV)
--    find_package(libyuv QUIET) # not required
-+    find_package(libyuv_config NAMES libyuv CONFIG REQUIRED)
-+    set(LIBYUV_INCLUDE_DIR "${libyuv_INCLUDE_DIRS}")
-+    set(LIBYUV_LIBRARY "yuv")
-+    find_package(libyuv MODULE REQUIRED)
-     if(libyuv_FOUND)
-         # libyuv 1755 exposed all of the I*Matrix() functions, which libavif relies on.
-         # libyuv 1774 exposed ScalePlane_12 function, which libavif can use for some additional optimizations.
-@@ -660,7 +663,7 @@ endif()
- if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-     install(
-         TARGETS avif
--        EXPORT ${PROJECT_NAME}-config
-+        EXPORT ${PROJECT_NAME}-targets
-         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-@@ -668,7 +671,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
- 
-     # Enable CMake configs in VCPKG mode
-     if(BUILD_SHARED_LIBS OR VCPKG_TARGET_TRIPLET)
--        install(EXPORT ${PROJECT_NAME}-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-+        install(EXPORT ${PROJECT_NAME}-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
- 
-         include(CMakePackageConfigHelpers)
-         write_basic_package_version_file(
-@@ -677,6 +680,28 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
-                 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-         )
-+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "@PACKAGE_INIT@\n")
-+        if(NOT BUILD_SHARED_LIBS)
-+            file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "
-+                include(CMakeFindDependencyMacro)
-+                find_dependency(libyuv CONFIG)
-+                set(THREADS_PREFER_PTHREAD_FLAG ON)
-+                find_dependency(Threads)
-+                ")
-+        endif()
-+        file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-targets.cmake)")
-+
-+        # Install CMake configuration export file.
-+        configure_package_config_file(
-+            ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in
-+            ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
-+            INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+            NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO
-+        )
-+        install(
-+            FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
-+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+        )
-     endif()
- 
-     # Handle both relative and absolute paths (e.g. NixOS) for a relocatable package
diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake
index 3129b86ab0..1cfdc16ba2 100644
--- a/ports/libavif/portfile.cmake
+++ b/ports/libavif/portfile.cmake
@@ -2,11 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AOMediaCodec/libavif
     REF "v${VERSION}"
-    SHA512 37f0de757180c6414778e688006940395960b316c25192d6beb97a07942aff4bd3b712dec2eff52cd26f5d72c352731442175dfeb90e2e1381133539760142b0
+    SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21
     HEAD_REF master
     PATCHES
         disable-source-utf8.patch
-        find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -19,6 +18,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DAVIF_BUILD_APPS=OFF
+        -DAVIF_BUILD_TESTS=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON
         ${FEATURE_OPTIONS}
 )
diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json
index 6dda17fd54..78312d7ac2 100644
--- a/ports/libavif/vcpkg.json
+++ b/ports/libavif/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libavif",
-  "version-semver": "1.0.4",
-  "port-version": 2,
+  "version-semver": "1.1.1",
   "description": "Library for encoding and decoding AVIF files",
   "homepage": "https://github.com/AOMediaCodec/libavif",
   "license": "BSD-2-Clause AND Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index b6c1b9db49..faf37fb148 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4297,8 +4297,8 @@
       "port-version": 0
     },
     "libavif": {
-      "baseline": "1.0.4",
-      "port-version": 2
+      "baseline": "1.1.1",
+      "port-version": 0
     },
     "libb2": {
       "baseline": "0.98.1",
diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json
index 2b4c1a1231..975aa578ab 100644
--- a/versions/l-/libavif.json
+++ b/versions/l-/libavif.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ad9d36286110339f45b585a1bbb330273c04edad",
+      "version-semver": "1.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "30218a66d9e44d06cd55a1e7d29e501ceeba42da",
       "version-semver": "1.0.4",