From eaa50eaad0fb1508f4fcfc773918a53635556770 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:40:30 -0700 Subject: [PATCH 1/7] [aom] Update to 3.5.0 --- ports/aom/portfile.cmake | 12 ++---------- ports/aom/vcpkg.json | 3 +-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 81152e05adc9c8..844a6a2fb94805 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -11,25 +11,17 @@ vcpkg_add_to_path(${PERL_PATH}) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" - REF 6bbe6ae701d65bdf36bb72053db9b71f9739a083 - FETCH_REF v3.2.0 + REF 9a83c6a5a55c176adbce740e47d3512edfc9ae71 # v3.5.0 PATCHES aom-rename-static.diff + aom-uninitialized-pointer.diff # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream aom-install.diff - aom-uninitialized-pointer.diff ) -set(aom_target_cpu "") -if(VCPKG_TARGET_IS_UWP) - # UWP + aom's assembler files result in weirdness and build failures - set(aom_target_cpu "-DAOM_TARGET_CPU=generic") -endif() - vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - ${aom_target_cpu} -DENABLE_DOCS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTDATA=OFF diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 8ecb61261b2bc9..1b822c1ddb70a1 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aom", - "version-semver": "3.2.0", - "port-version": 3, + "version-semver": "3.5.0", "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!(windows & arm & !uwp)", From 294d2c9ab9f0a93d87352e8fb19eb80e3f5d8308 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:40:57 -0700 Subject: [PATCH 2/7] [aom] vcpkg x-add-version --all --overwrite-version --- versions/a-/aom.json | 5 +++++ versions/baseline.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 39f282cdf9d06b..8ebc3476b4f59b 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dab42cb44c5a9abdf6069addeafaea095e29fcd9", + "version-semver": "3.5.0", + "port-version": 0 + }, { "git-tree": "f251779a2df24b29eac37690d2692fda395218dd", "version-semver": "3.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3e194c26f3f94c..abecbea680e183 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -117,8 +117,8 @@ "port-version": 1 }, "aom": { - "baseline": "3.2.0", - "port-version": 3 + "baseline": "3.5.0", + "port-version": 0 }, "approval-tests-cpp": { "baseline": "10.12.2", From 9a50c753f4a6f1a13aa613f1138fef348494cd3d Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:52:28 -0700 Subject: [PATCH 3/7] [aom] Added license --- ports/aom/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 1b822c1ddb70a1..048dc87ce8321f 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -4,6 +4,7 @@ "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!(windows & arm & !uwp)", + "license": "BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", From 31c1978dd6820cc66f83984fe54e2d670c503f1f Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:53:13 -0700 Subject: [PATCH 4/7] [aom] Added license --- ports/aom/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 048dc87ce8321f..4a318ba896fd3a 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -3,8 +3,8 @@ "version-semver": "3.5.0", "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", - "supports": "!(windows & arm & !uwp)", "license": "BSD-2-Clause", + "supports": "!(windows & arm & !uwp)", "dependencies": [ { "name": "vcpkg-cmake", From de05cc9b5df2d5ca5fe4d35e30cc5d8252371e25 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:53:24 -0700 Subject: [PATCH 5/7] [aom] vcpkg x-add-version --all --overwrite-version --- versions/a-/aom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 8ebc3476b4f59b..18c4de591cdb41 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dab42cb44c5a9abdf6069addeafaea095e29fcd9", + "git-tree": "58ae6110973f19c282605819b2d755392857ac65", "version-semver": "3.5.0", "port-version": 0 }, From 11931529717c56b266bbe147e68b2583b15823cb Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:58:37 -0700 Subject: [PATCH 6/7] [aom] Revert UWP target cpu --- ports/aom/portfile.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 844a6a2fb94805..380790ec24cd0d 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -19,9 +19,16 @@ vcpkg_from_git( aom-install.diff ) +set(aom_target_cpu "") +if(VCPKG_TARGET_IS_UWP) + # UWP + aom's assembler files result in weirdness and build failures + set(aom_target_cpu "-DAOM_TARGET_CPU=generic") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS + ${aom_target_cpu} -DENABLE_DOCS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTDATA=OFF From 03127e0e9abcd72d1a4415485ef30d4432fbf633 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 25 Oct 2022 13:58:49 -0700 Subject: [PATCH 7/7] [aom] vcpkg x-add-version --all --overwrite-version --- versions/a-/aom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 18c4de591cdb41..10e87a374b2045 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "58ae6110973f19c282605819b2d755392857ac65", + "git-tree": "c6e0216430b4aded29b420b2d9e4b14ef6271620", "version-semver": "3.5.0", "port-version": 0 },