diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 75cf322c60..d6e63ba5a9 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -9,9 +9,15 @@ vcpkg_from_git( aom-fix-nasm.diff # TODO: remove this patch after the next release ) -vcpkg_find_acquire_program(NASM) vcpkg_find_acquire_program(PERL) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|x64)$") + # Upstream AOM only uses NASM on x86-family targets. Non-x86 targets such as + # Apple Silicon configure with ENABLE_NASM=OFF and should not require nasm. + vcpkg_find_acquire_program(NASM) + set(aom_nasm_compiler "-DCMAKE_ASM_NASM_COMPILER=${NASM}") +endif() + set(aom_target_cpu "") if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm")) # UWP + aom's assembler files result in weirdness and build failures @@ -33,7 +39,7 @@ vcpkg_cmake_configure( -DENABLE_TESTS=OFF -DENABLE_TOOLS=OFF -DTHREADS_PREFER_PTHREAD_FLAG=ON - "-DCMAKE_ASM_NASM_COMPILER=${NASM}" + ${aom_nasm_compiler} "-DPERL_EXECUTABLE=${PERL}" ) diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 8db868cb3a..a1799c0580 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aom", "version-semver": "3.13.1", - "port-version": 1, + "port-version": 2, "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "license": "BSD-2-Clause", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 50945a65cf..864e5e11c6 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6af4ddae16c64f2cab705d49ed1055c2d99fd837", + "version-semver": "3.13.1", + "port-version": 2 + }, { "git-tree": "26fd05f1c9967caa611538c4e2f11edb8303288f", "version-semver": "3.13.1", diff --git a/versions/baseline.json b/versions/baseline.json index 3c36e53215..c72321a167 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -178,7 +178,7 @@ }, "aom": { "baseline": "3.13.1", - "port-version": 1 + "port-version": 2 }, "apache-datasketches": { "baseline": "5.2.0",