deps.ffmpeg: Backport AOM upstream fix for nasm detection

Author: PatTheMav

deps.ffmpeg/40-aom.ps1

@@ -4,6 +4,12 @@ param(
     [string] $Uri = 'https://aomedia.googlesource.com/aom.git',
     [string] $Hash = 'd772e334cc724105040382a977ebb10dfd393293',
     [array] $Targets = @('x64', 'arm64'),
+    [array] $Patches = @(
+        @{
+            PatchFile = "${PSScriptRoot}/patches/aom/0002-windows-fix-cmake-nasm-detection.patch"
+            HashSum = "9455ba4f016ac8ec8e9604b38af8c89238bed1a4b74c04bd4d250b95c96531fe"
+        }
+    ),
     [array] $FixupPatches = @(
         @{
             PatchFile = "${PSScriptRoot}/patches/aom/0001-windows-pkg-config-fix.patch"
@@ -28,6 +34,16 @@ function Clean {
     }
 }
 
+function Patch {
+    Log-Information "Patch (${Target})"
+    Set-Location $Path
+
+    $Patches | ForEach-Object {
+        $Params = $_
+        Safe-Patch @Params
+    }
+}
+
 function Configure {
     Log-Information "Configure (${Target})"
     Set-Location $Path

deps.ffmpeg/40-aom.zsh

@@ -6,8 +6,10 @@ local version='3.13.1'
 local url='https://aomedia.googlesource.com/aom.git'
 local hash='d772e334cc724105040382a977ebb10dfd393293'
 local -a patches=(
-  "windows ${0:a:h}/patches/libaom/0001-force-threading-shim-usage.patch \
+  "windows ${0:a:h}/patches/aom/0001-force-threading-shim-usage.patch \
   6fa9ca74001c5fa3a6521a2b4944be2a8b4350d31c0234aede9a7052a8f1890b"
+  "macos ${0:a:h}/patches/aom/0002-fix-cmake-nasm-detection.patch \
+  47d926731a31990b432f188e7e16628bd2ca334f5b71fe55241d7b845884a35d"
 )
 
 ## Dependency Overrides

…om/0001-force-threading-shim-usage.patch …om/0001-force-threading-shim-usage.patchdeps.ffmpeg/patches/libaom/0001-force-threading-shim-usage.patch renamed to deps.ffmpeg/patches/aom/0001-force-threading-shim-usage.patch deps.ffmpeg/patches/libaom/0001-force-threading-shim-usage.patch renamed to deps.ffmpeg/patches/aom/0001-force-threading-shim-usage.patch

@@ -0,0 +1,22 @@
+diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
+index 9cc34de..2750a0b 100644
+--- a/build/cmake/aom_optimization.cmake
++++ b/build/cmake/aom_optimization.cmake
+@@ -212,7 +212,7 @@
+ # Currently checks only for presence of required object formats and support for
+ # the -Ox argument (multipass optimization).
+ function(test_nasm)
+-  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
++  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO
+                   OUTPUT_VARIABLE nasm_helptext)
+
+   if(NOT "${nasm_helptext}" MATCHES "-Ox")
+@@ -220,6 +220,8 @@
+       FATAL_ERROR "Unsupported nasm: multipass optimization not supported.")
+   endif()
+
++  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
++                  OUTPUT_VARIABLE nasm_helptext)
+   if("${AOM_TARGET_CPU}" STREQUAL "x86")
+     if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
+       if(NOT "${nasm_helptext}" MATCHES "macho32")

deps.ffmpeg/patches/aom/0002-fix-cmake-nasm-detection.patch

@@ -0,0 +1,22 @@
+diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
+index 9cc34de..2750a0b 100644
+--- a/build/cmake/aom_optimization.cmake
++++ b/build/cmake/aom_optimization.cmake
+@@ -212,7 +212,7 @@
+ # Currently checks only for presence of required object formats and support for
+ # the -Ox argument (multipass optimization).
+ function(test_nasm)
+-  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
++  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO
+                   OUTPUT_VARIABLE nasm_helptext)
+ 
+   if(NOT "${nasm_helptext}" MATCHES "-Ox")
+@@ -220,6 +220,8 @@
+       FATAL_ERROR "Unsupported nasm: multipass optimization not supported.")
+   endif()
+ 
++  execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
++                  OUTPUT_VARIABLE nasm_helptext)
+   if("${AOM_TARGET_CPU}" STREQUAL "x86")
+     if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
+       if(NOT "${nasm_helptext}" MATCHES "macho32")