Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aom] Update to 3.11.0 #41125

Merged
merged 21 commits into from
Dec 20, 2024
Merged

[aom] Update to 3.11.0 #41125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3655553
update to 3.10.0
jimwang118 Sep 23, 2024
bb6296b
update version
jimwang118 Sep 23, 2024
c5ae442
fix build error on uwp
jimwang118 Sep 23, 2024
555929c
update version
jimwang118 Sep 23, 2024
b9d294e
update version
jimwang118 Dec 16, 2024
1cd6c88
update version
jimwang118 Dec 16, 2024
e54b03f
format
jimwang118 Dec 16, 2024
2794c5f
update version
jimwang118 Dec 16, 2024
a96cf82
code clean
jimwang118 Dec 16, 2024
9580b1e
update version
jimwang118 Dec 16, 2024
2e84847
modif option
jimwang118 Dec 16, 2024
fbadb8b
update version
jimwang118 Dec 16, 2024
8317535
Merge branch 'master' into up-aom
jimwang118 Dec 20, 2024
7b47887
add not support uwp
jimwang118 Dec 20, 2024
160229f
updat eversion
jimwang118 Dec 20, 2024
1cf1306
format
jimwang118 Dec 20, 2024
a7d6ac9
updat eversion
jimwang118 Dec 20, 2024
676e68c
reset
jimwang118 Dec 20, 2024
ac67af3
update version
jimwang118 Dec 20, 2024
d0db374
fix ci error
jimwang118 Dec 20, 2024
b3cff05
fix supports
jimwang118 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions ports/aom/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -32,7 +32,7 @@ vcpkg_cmake_configure(
-DENABLE_TESTDATA=OFF
-DENABLE_TESTS=OFF
-DENABLE_TOOLS=OFF
-DTHREADS_PREFER_PTHREAD_FLAGS=ON
jimwang118 marked this conversation as resolved.
Show resolved Hide resolved
-DTHREADS_PREFER_PTHREAD_FLAG=ON
"-DCMAKE_ASM_NASM_COMPILER=${NASM}"
"-DPERL_EXECUTABLE=${PERL}"
)
Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion ports/aom/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"features": [
"aom"
],
"platform": "!(windows & arm & !uwp)"
"platform": "!(windows & arm) & !uwp"
},
{
"name": "ffmpeg",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/aom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b78024e1ea9566d0fcd0c1091558e0f1aac59fdd",
"version-semver": "3.11.0",
"port-version": 0
},
{
"git-tree": "29d864e5f5c61978785ca554e8efcd1d9642010b",
"version-semver": "3.9.1",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"port-version": 2
},
"aom": {
"baseline": "3.9.1",
"baseline": "3.11.0",
"port-version": 0
},
"apache-datasketches": {
Expand Down
Loading