From 3ab232bd9aff3b805c2e3b0ee73f9d48be14799a Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrew@ladybird.org>
Date: Mon, 11 Nov 2024 01:24:37 -0700
Subject: [PATCH] [libvpx] Only enable NASM for x86 and x64 (#42037)

---
 ports/libvpx/portfile.cmake | 8 +++++---
 ports/libvpx/vcpkg.json     | 2 +-
 versions/baseline.json      | 2 +-
 versions/l-/libvpx.json     | 5 +++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index 5730cf5880..522b157667 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -24,9 +24,11 @@ endif()
 
 find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)
 
-vcpkg_find_acquire_program(NASM)
-get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-vcpkg_add_to_path(${NASM_EXE_PATH})
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    vcpkg_find_acquire_program(NASM)
+    get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+    vcpkg_add_to_path(${NASM_EXE_PATH})
+endif()
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
 
diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
index 94ceb8fd3b..9f22dbe5e0 100644
--- a/ports/libvpx/vcpkg.json
+++ b/ports/libvpx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libvpx",
   "version": "1.13.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3b94f83f32..1e234b1132 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5318,7 +5318,7 @@
     },
     "libvpx": {
       "baseline": "1.13.1",
-      "port-version": 3
+      "port-version": 4
     },
     "libwandio": {
       "baseline": "4.2.1",
diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json
index 6b3a4ad55e..488eb44d77 100644
--- a/versions/l-/libvpx.json
+++ b/versions/l-/libvpx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "51aa3269c3e4839a7c789ba5e7f25e653ef65b27",
+      "version": "1.13.1",
+      "port-version": 4
+    },
     {
       "git-tree": "113a0b3aef3819546a0d8fe587aa37146a7e8f30",
       "version": "1.13.1",