public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/aom] epel10: fix nasm detection with nasm 3
@ 2026-09-22 22:05 Dominik 'Rathann' Mierzejewski
  0 siblings, 0 replies; only message in thread
From: Dominik 'Rathann' Mierzejewski @ 2026-09-22 22:05 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/aom
            Branch : epel10
            Commit : 890eca479be7c26845da0767ead13053283e1899
            Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
            Date   : 2026-09-22T22:37:12+01:00
            Stats  : +43/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/aom/c/890eca479be7c26845da0767ead13053283e1899?branch=epel10

            Log:
            fix nasm detection with nasm 3

Backports upstream fix.

(cherry picked from commit 37f6454cc92cd96f904b2864b62ce9f7bcf425ef)

---
diff --git a/0001-cmake-fix-nasm-detection-w-3.0.patch b/0001-cmake-fix-nasm-detection-w-3.0.patch
new file mode 100644
index 0000000..eef863c
--- /dev/null
+++ b/0001-cmake-fix-nasm-detection-w-3.0.patch
@@ -0,0 +1,41 @@
+From 6d2b7f71b98bfa28e372b1f2d85f137280bdb3de Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Tue, 7 Oct 2025 14:08:44 -0700
+Subject: [PATCH] cmake: fix nasm detection w/3.0
+
+nasm 3.0 separated Oflags (-Ox) output to `-hO` which is used to
+validate the nasm binary. This change is compatible with older versions
+(tested with NASM version 2.16.03 & 2.13.02).
+
+Bug: aomedia:448994065
+Fixed: aomedia:448994065
+Change-Id: I704dcfe39ac6e68bc4d5b9e409fb59a0d277170e
+---
+ build/cmake/aom_optimization.cmake | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
+index 9cc34de362..2750a0be41 100644
+--- a/build/cmake/aom_optimization.cmake
++++ b/build/cmake/aom_optimization.cmake
+@@ -212,7 +212,7 @@ endfunction()
+ # 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 @@ function(test_nasm)
+       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")
+-- 
+2.51.0
+

diff --git a/aom.spec b/aom.spec
index 1fe6de3..3fbcb06 100644
--- a/aom.spec
+++ b/aom.spec
@@ -20,6 +20,8 @@ Summary:    Royalty-free next-generation video format
 License:    BSD-3-Clause
 URL:        http://aomedia.org/
 Source:     https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# https://aomedia.issues.chromium.org/issues/448994065
+Patch:      0001-cmake-fix-nasm-detection-w-3.0.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gcc

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-22 22:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 22:05 [rpms/aom] epel10: fix nasm detection with nasm 3 Dominik 'Rathann' Mierzejewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox