* Fix build with nasm 3.01 * Improved VOD encoding and RTC encoding performance
Signed-off-by: Khem Raj <[email protected]> --- .../0001-cmake-fix-nasm-detection-w-3.0.patch | 40 +++++++++++++++++++ .../aom/{aom_3.12.1.bb => aom_3.13.1.bb} | 8 ++-- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/aom/aom/0001-cmake-fix-nasm-detection-w-3.0.patch rename meta-multimedia/recipes-multimedia/aom/{aom_3.12.1.bb => aom_3.13.1.bb} (88%) diff --git a/meta-multimedia/recipes-multimedia/aom/aom/0001-cmake-fix-nasm-detection-w-3.0.patch b/meta-multimedia/recipes-multimedia/aom/aom/0001-cmake-fix-nasm-detection-w-3.0.patch new file mode 100644 index 0000000000..105e4d9d70 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/aom/aom/0001-cmake-fix-nasm-detection-w-3.0.patch @@ -0,0 +1,40 @@ +From 83c37c8bc1f4cd7e604c34df7888c425a8cb6b26 Mon Sep 17 00:00:00 2001 +From: James Zern <[email protected]> +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). + +Upstream-Status: Backport [https://aomedia-review.googlesource.com/c/aom/+/203481] +Bug: aomedia:448994065 +Fixed: aomedia:448994065 +Change-Id: I704dcfe39ac6e68bc4d5b9e409fb59a0d277170e +Signed-off-by: Khem Raj <[email protected]> +--- + 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 9cc34de..2750a0b 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") diff --git a/meta-multimedia/recipes-multimedia/aom/aom_3.12.1.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb similarity index 88% rename from meta-multimedia/recipes-multimedia/aom/aom_3.12.1.bb rename to meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb index 72baf58cf0..141b02306d 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom_3.12.1.bb +++ b/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb @@ -5,11 +5,11 @@ LICENSE = "BSD-2-Clause & AOM-Patent-License-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ file://PATENTS;md5=a111d47497d3bb49e04eef71377eb8ba \ " -SRCREV = "10aece4157eb79315da205f39e19bf6ab3ee30d0" +SRCREV = "d772e334cc724105040382a977ebb10dfd393293" SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main;tag=v${PV} \ - file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch" - - + file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch \ + file://0001-cmake-fix-nasm-detection-w-3.0.patch \ + " inherit cmake pkgconfig DEPENDS = " nasm-native"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122578): https://lists.openembedded.org/g/openembedded-devel/message/122578 Mute This Topic: https://lists.openembedded.org/mt/116717608/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
