[oe][meta-multimedia][PATCH 13/20] aom: upgrade 3.13.1 -> 3.13.3
[email protected] Sun, 2 Aug 2026 01:11:31 +1200
| Newsgroups | org.openembedded.lists.openembedded-devel |
|---|---|
| Message-ID | <[email protected]> |
From: Ankur Tyagi <[email protected]> Dropped patch that is merged in the upstream version. https://aomedia.googlesource.com/aom/+/refs/tags/v3.13.3/CHANGELOG Signed-off-by: Ankur Tyagi <[email protected]> --- .../0001-cmake-fix-nasm-detection-w-3.0.patch | 40 ------------------- .../aom/{aom_3.13.1.bb => aom_3.13.3.bb} | 5 +-- 2 files changed, 2 insertions(+), 43 deletions(-) delete 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.13.1.bb => aom_3.13.3.bb} (90%) 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 deleted file mode 100644 index 105e4d9d70..0000000000 --- a/meta-multimedia/recipes-multimedia/aom/aom/0001-cmake-fix-nasm-detection-w-3.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -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.13.1.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.13.3.bb similarity index 90% rename from meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb rename to meta-multimedia/recipes-multimedia/aom/aom_3.13.3.bb index e4875d2ced..77193cc18c 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom_3.13.1.bb +++ b/meta-multimedia/recipes-multimedia/aom/aom_3.13.3.bb @@ -5,11 +5,10 @@ LICENSE = "BSD-2-Clause AND LicenseRef-AOM-Patent-License-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ file://PATENTS;md5=a111d47497d3bb49e04eef71377eb8ba \ " -SRCREV = "d772e334cc724105040382a977ebb10dfd393293" +SRCREV = "92d4c37fbdd08944a0e721bbaeb13318f10aebb0" 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-cmake-fix-nasm-detection-w-3.0.patch \ - " + " inherit cmake pkgconfig DEPENDS = " nasm-native"