[aom] Update to 3.11.0 (#41125)

This commit is contained in:
jim wang 2024-12-20 20:35:11 +00:00 committed by GitHub
parent d940c1b196
commit 8476a6d43a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 12 deletions

View File

@ -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"

View File

@ -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",

View File

@ -116,7 +116,7 @@
"features": [
"aom"
],
"platform": "!(windows & arm & !uwp)"
"platform": "!(windows & arm) & !uwp"
},
{
"name": "ffmpeg",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b78024e1ea9566d0fcd0c1091558e0f1aac59fdd",
"version-semver": "3.11.0",
"port-version": 0
},
{
"git-tree": "29d864e5f5c61978785ca554e8efcd1d9642010b",
"version-semver": "3.9.1",

View File

@ -157,7 +157,7 @@
"port-version": 2
},
"aom": {
"baseline": "3.9.1",
"baseline": "3.11.0",
"port-version": 0
},
"apache-datasketches": {