Skip to content

Commit 8476a6d

Browse files
authored
[aom] Update to 3.11.0 (microsoft#41125)
1 parent d940c1b commit 8476a6d

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

ports/aom/portfile.cmake

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
vcpkg_from_git(
22
OUT_SOURCE_PATH SOURCE_PATH
33
URL "https://aomedia.googlesource.com/aom"
4-
REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # v3.9.1
4+
REF d6f30ae474dd6c358f26de0a0fc26a0d7340a84c
55
HEAD_REF main
66
PATCHES
77
aom-rename-static.diff
@@ -32,7 +32,7 @@ vcpkg_cmake_configure(
3232
-DENABLE_TESTDATA=OFF
3333
-DENABLE_TESTS=OFF
3434
-DENABLE_TOOLS=OFF
35-
-DTHREADS_PREFER_PTHREAD_FLAGS=ON
35+
-DTHREADS_PREFER_PTHREAD_FLAG=ON
3636
"-DCMAKE_ASM_NASM_COMPILER=${NASM}"
3737
"-DPERL_EXECUTABLE=${PERL}"
3838
)
@@ -42,13 +42,6 @@ vcpkg_cmake_config_fixup()
4242
vcpkg_copy_pdbs()
4343
vcpkg_fixup_pkgconfig()
4444

45-
if(VCPKG_TARGET_IS_WINDOWS AND NOT VPCKG_TARGET_IS_MINGW)
46-
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
47-
if(NOT VCPKG_BUILD_TYPE)
48-
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
49-
endif()
50-
endif()
51-
5245
file(REMOVE_RECURSE
5346
"${CURRENT_PACKAGES_DIR}/debug/include"
5447
"${CURRENT_PACKAGES_DIR}/debug/share"

ports/aom/vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "aom",
3-
"version-semver": "3.9.1",
3+
"version-semver": "3.11.0",
44
"description": "AV1 codec library",
55
"homepage": "https://aomedia.googlesource.com/aom",
66
"license": "BSD-2-Clause",
7+
"supports": "!uwp",
78
"dependencies": [
89
{
910
"name": "vcpkg-cmake",

scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"features": [
117117
"aom"
118118
],
119-
"platform": "!(windows & arm & !uwp)"
119+
"platform": "!(windows & arm) & !uwp"
120120
},
121121
{
122122
"name": "ffmpeg",

versions/a-/aom.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "b78024e1ea9566d0fcd0c1091558e0f1aac59fdd",
5+
"version-semver": "3.11.0",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "29d864e5f5c61978785ca554e8efcd1d9642010b",
510
"version-semver": "3.9.1",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"port-version": 2
158158
},
159159
"aom": {
160-
"baseline": "3.9.1",
160+
"baseline": "3.11.0",
161161
"port-version": 0
162162
},
163163
"apache-datasketches": {

0 commit comments

Comments
 (0)