From: Brad Smith <brad@comstyle.com>
Subject: UPDATE: x264 20250909
To: ports@openbsd.org
Date: Mon, 3 Nov 2025 23:43:49 -0500

Here is an update to x264 20250909.

Support and some initial code for DotProd and i8mm.

Tested on aarch64.


Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/x264/Makefile,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 Makefile
--- Makefile	14 Feb 2025 13:55:51 -0000	1.72
+++ Makefile	1 Nov 2025 02:21:09 -0000
@@ -1,12 +1,12 @@
 COMMENT=	free H.264/MPEG-4 AVC encoder
 
-DISTNAME=	x264-20241229
+DISTNAME=	x264-20250909
 GH_ACCOUNT=	brad0
 GH_PROJECT=	x264
-GH_COMMIT=	52f7694ddd35209cb95225e7acce91d8a30cb57d
+GH_COMMIT=	0480cb05fa188d37ae87e8f4fd8f1aea3711f7ee
 CATEGORIES=	multimedia
 
-SHARED_LIBS=	x264	25.0
+SHARED_LIBS=	x264	26.0
 
 HOMEPAGE=	https://www.videolan.org/developers/x264.html
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/x264/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo	14 Feb 2025 13:55:51 -0000	1.29
+++ distinfo	1 Nov 2025 02:21:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (x264-20241229-52f7694d.tar.gz) = Xx1SDPkxyD6xpnq9jBtStTIkpUyxsBGXiCpwY8T1wVA=
-SIZE (x264-20241229-52f7694d.tar.gz) = 1036250
+SHA256 (x264-20250909-0480cb05.tar.gz) = 0JZ6E0jIXf3jY7tSYQQDvomBcUkxAFYe+g3QXV/RrlA=
+SIZE (x264-20250909-0480cb05.tar.gz) = 1040667
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/multimedia/x264/patches/patch-Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 patch-Makefile
--- patches/patch-Makefile	24 Nov 2024 15:42:37 -0000	1.24
+++ patches/patch-Makefile	1 Nov 2025 02:21:09 -0000
@@ -1,7 +1,7 @@
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -297,7 +297,7 @@ example: example$(EXE)
+@@ -316,7 +316,7 @@ example: example$(EXE)
  endif
  
  x264$(EXE): $(OBJCLI) $(CLI_LIBX264)
@@ -10,7 +10,7 @@ Index: Makefile
  
  checkasm8$(EXE): $(OBJCHK) $(OBJCHK_8) $(LIBX264)
  	$(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS)
-@@ -444,7 +444,6 @@ ifneq ($(IMPLIBNAME),)
+@@ -456,7 +456,6 @@ ifneq ($(IMPLIBNAME),)
  	$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
  	$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
  else ifneq ($(SONAME),)
Index: patches/patch-common_aarch64_asm_S
===================================================================
RCS file: /cvs/ports/multimedia/x264/patches/patch-common_aarch64_asm_S,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-common_aarch64_asm_S
--- patches/patch-common_aarch64_asm_S	17 Jun 2023 22:17:46 -0000	1.1
+++ patches/patch-common_aarch64_asm_S	1 Nov 2025 02:21:09 -0000
@@ -1,7 +1,7 @@
 Index: common/aarch64/asm.S
 --- common/aarch64/asm.S.orig
 +++ common/aarch64/asm.S
-@@ -83,6 +83,7 @@ FUNC    .endfunc
+@@ -123,6 +123,7 @@ FUNC    .endfunc
  ELF     .type   EXTERN_ASM\name, %function
  FUNC    .func   EXTERN_ASM\name
  EXTERN_ASM\name:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/x264/patches/patch-configure,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 patch-configure
--- patches/patch-configure	14 Feb 2025 13:55:51 -0000	1.34
+++ patches/patch-configure	1 Nov 2025 02:21:09 -0000
@@ -7,7 +7,7 @@ Index: configure
  
  if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
  cat <<EOF
-@@ -1364,10 +1364,6 @@ if [ "$pic" = "yes" ] ; then
+@@ -1414,10 +1414,6 @@ if [ "$pic" = "yes" ] ; then
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
@@ -18,7 +18,7 @@ Index: configure
  if [ "$strip" = "yes" ]; then
      LDFLAGS="$LDFLAGS -s"
  fi
-@@ -1376,11 +1372,11 @@ if [ "$debug" = "yes" ]; then
+@@ -1426,11 +1422,11 @@ if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
      RCFLAGS="$RCFLAGS -DDEBUG"
  else
@@ -32,7 +32,7 @@ Index: configure
      fi
  fi
  [ "$lto" = "auto" ] && lto="no"
-@@ -1612,7 +1608,6 @@ if [ "$cli" = "yes" ]; then
+@@ -1663,7 +1659,6 @@ if [ "$cli" = "yes" ]; then
  fi
  
  if [ "$shared" = "yes" ]; then