Re: UPDATE: aom 3.8.1

+cc kettenis for the IBT patch

On 2024/02/28 16:15, Stuart Henderson wrote:
> On 2024/02/23 17:19, Brad Smith wrote:
> > Here is an update to aom 3.8.1.
> >
> > https://aomedia.googlesource.com/aom/+/refs/heads/main/CHANGELOG
>
> Here's a tweaked version adding yasm-compatible endbr64 magic to
> x86inc.asm. Similar to what I added to audio/deadbeef but the
> definitions in aom_config.asm use a different label (and setting to
> 0 or 1 rather than checking for presence/absence).
>
> Still builds on i386.
>
> With this I can encode from one of the xiph.org test YUV4MPEG files
> at https://media.xiph.org/video/derf/ on 11th gen intel without crashing,
> which I couldn't do before.
>
> $ aomenc -o test.webm -w 352 -h 288 --limit=100 --cpu-used=4 akiyo_cif.y4m
>

Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/aom/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 29 May 2023 17:52:01 -0000 1.20
+++ Makefile 28 Feb 2024 16:06:36 -0000
@@ -2,10 +2,10 @@ COMMENT= Alliance for Open Media AV1 vid

GH_ACCOUNT= jbeich
GH_PROJECT= aom
-GH_TAGNAME= v3.6.1
+GH_TAGNAME= v3.8.1
CATEGORIES= multimedia

-SHARED_LIBS= aom 4.0
+SHARED_LIBS= aom 4.1

HOMEPAGE= https://aomedia.org/

Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/aom/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 29 May 2023 17:52:01 -0000 1.17
+++ distinfo 28 Feb 2024 16:06:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (aom-3.6.1.tar.gz) = Z5xBtBpQucWo+qG6kZ4MI5quf+hXUl4iP/IMVpl/EZ8=
-SIZE (aom-3.6.1.tar.gz) = 5269397
+SHA256 (aom-3.8.1.tar.gz) = Yp0PvVhlQWfSjz78LN/w5wjWgoCqWzD4F0Tn4YGo2FE=
+SIZE (aom-3.8.1.tar.gz) = 5461300
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/multimedia/aom/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 9 Apr 2023 06:17:17 -0000 1.5
+++ patches/patch-CMakeLists_txt 28 Feb 2024 16:06:36 -0000
@@ -1,12 +1,13 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -824,7 +824,7 @@ if(ENABLE_EXAMPLES AND "${CMAKE_GENERATOR}" MATCHES "M
- endif()
-
- if(BUILD_SHARED_LIBS)
-- if(NOT WIN32 AND NOT APPLE)
-+ if(NOT WIN32 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -828,7 +828,8 @@ if(BUILD_SHARED_LIBS)
+ # https://clang.llvm.org/docs/AddressSanitizer.html#usage.
+ if(NOT WIN32
+ AND NOT APPLE
+- AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE))
++ AND NOT (CMAKE_C_COMPILER_ID MATCHES "Clang" AND SANITIZE)
++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# The -z defs linker option reports unresolved symbol references from object
# files when building a shared library.
if("${CMAKE_VERSION}" VERSION_LESS "3.13")
Index: patches/patch-aom_ports_aarch32_cpudetect_c
===================================================================
RCS file: patches/patch-aom_ports_aarch32_cpudetect_c
diff -N patches/patch-aom_ports_aarch32_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-aom_ports_aarch32_cpudetect_c 28 Feb 2024 16:06:36 -0000
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch32_cpudetect.c
+--- aom_ports/aarch32_cpudetect.c.orig
++++ aom_ports/aarch32_cpudetect.c
+@@ -12,7 +12,7 @@
+
+ #include "arm_cpudetect.h"
+
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
+
+ static int arm_get_cpu_caps(void) {
+ // This function should actually be a no-op. There is no way to adjust any of
+@@ -25,7 +25,7 @@ static int arm_get_cpu_caps(void) {
+ return flags;
+ }
+
+-#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT
++#elif defined(_MSC_VER) // end !CONFIG_RUNTIME_CPU_DETECT || __OpenBSD__
+
+ static int arm_get_cpu_caps(void) {
+ int flags = 0;
Index: patches/patch-aom_ports_aarch64_cpudetect_c
===================================================================
RCS file: patches/patch-aom_ports_aarch64_cpudetect_c
diff -N patches/patch-aom_ports_aarch64_cpudetect_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-aom_ports_aarch64_cpudetect_c 28 Feb 2024 16:06:36 -0000
@@ -0,0 +1,23 @@
+Allow ARM CPU runtime detection code to build on OpenBSD.
+
+Index: aom_ports/aarch64_cpudetect.c
+--- aom_ports/aarch64_cpudetect.c.orig
++++ aom_ports/aarch64_cpudetect.c
+@@ -15,7 +15,7 @@
+ #include <sys/sysctl.h>
+