[aom] Enable arm, arm64 target support for Windows Desktop. (microsof…

…t#28739)
SupSuper · Jan 7, 2023 · 3512f26 · 3512f26
1 parent 94e85d1
commit 3512f26
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake
@@ -20,8 +20,9 @@ vcpkg_from_git(
 )
 
 set(aom_target_cpu "")
-if(VCPKG_TARGET_IS_UWP)
+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
+    # Also, disable assembly on ARM and ARM64 Windows to fix compilation issues.
     set(aom_target_cpu "-DAOM_TARGET_CPU=generic")
 endif()
 

diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "aom",
   "version-semver": "3.5.0",
+  "port-version": 1,
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "license": "BSD-2-Clause",
-  "supports": "!(windows & arm & !uwp)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/versions/a-/aom.json b/versions/a-/aom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "daaa6d5ccf417cb9e4997d35b9574f18eaa98cd3",
+      "version-semver": "3.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c6e0216430b4aded29b420b2d9e4b14ef6271620",
       "version-semver": "3.5.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -122,7 +122,7 @@
     },
     "aom": {
       "baseline": "3.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "approval-tests-cpp": {
       "baseline": "10.12.2",