From 8476a6d43a012200ed7f49e10e03cd1d7dcf94f4 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Fri, 20 Dec 2024 20:35:11 +0000
Subject: [PATCH] [aom] Update to 3.11.0 (#41125)

---
 ports/aom/portfile.cmake                      | 11 ++---------
 ports/aom/vcpkg.json                          |  3 ++-
 scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json |  2 +-
 versions/a-/aom.json                          |  5 +++++
 versions/baseline.json                        |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake
index b70e2ac986..4da2a35ced 100644
--- a/ports/aom/portfile.cmake
+++ b/ports/aom/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL "https://aomedia.googlesource.com/aom"
-    REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # v3.9.1
+    REF d6f30ae474dd6c358f26de0a0fc26a0d7340a84c
     HEAD_REF main
     PATCHES
         aom-rename-static.diff
@@ -32,7 +32,7 @@ vcpkg_cmake_configure(
         -DENABLE_TESTDATA=OFF
         -DENABLE_TESTS=OFF
         -DENABLE_TOOLS=OFF
-        -DTHREADS_PREFER_PTHREAD_FLAGS=ON
+        -DTHREADS_PREFER_PTHREAD_FLAG=ON
         "-DCMAKE_ASM_NASM_COMPILER=${NASM}"
         "-DPERL_EXECUTABLE=${PERL}"
 )
@@ -42,13 +42,6 @@ vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VPCKG_TARGET_IS_MINGW)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
-    if(NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
-    endif()
-endif()
-
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json
index 4d29e3feef..7f94a120e2 100644
--- a/ports/aom/vcpkg.json
+++ b/ports/aom/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "aom",
-  "version-semver": "3.9.1",
+  "version-semver": "3.11.0",
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "license": "BSD-2-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
index c85b1f9842..f49976bcd8 100644
--- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
@@ -116,7 +116,7 @@
       "features": [
         "aom"
       ],
-      "platform": "!(windows & arm & !uwp)"
+      "platform": "!(windows & arm) & !uwp"
     },
     {
       "name": "ffmpeg",
diff --git a/versions/a-/aom.json b/versions/a-/aom.json
index dc324ffece..00760ff54c 100644
--- a/versions/a-/aom.json
+++ b/versions/a-/aom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b78024e1ea9566d0fcd0c1091558e0f1aac59fdd",
+      "version-semver": "3.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "29d864e5f5c61978785ca554e8efcd1d9642010b",
       "version-semver": "3.9.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 31a163c00c..4cd2a31cf9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -157,7 +157,7 @@
       "port-version": 2
     },
     "aom": {
-      "baseline": "3.9.1",
+      "baseline": "3.11.0",
       "port-version": 0
     },
     "apache-datasketches": {