CVS commit: pkgsrc/multimedia/x264

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Dec 22 05:56:46 UTC 2025

Modified Files:
        pkgsrc/multimedia/x264: Makefile PLIST distinfo
        pkgsrc/multimedia/x264/patches: patch-configure
Removed Files:
        pkgsrc/multimedia/x264/patches: patch-common_cpu.c
            patch-common_ppc_pixel.c

Log Message:
x264: updated to 20250608

Commit log https://code.videolan.org/videolan/x264/-/commits/stable


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/x264/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x264/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/x264/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/multimedia/x264/patches/patch-common_cpu.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/x264/patches/patch-common_ppc_pixel.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x264/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x264/Makefile
diff -u pkgsrc/multimedia/x264/Makefile:1.4 pkgsrc/multimedia/x264/Makefile:1.5
--- pkgsrc/multimedia/x264/Makefile:1.4 Tue May 14 17:39:14 2024
+++ pkgsrc/multimedia/x264/Makefile     Mon Dec 22 05:56:46 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2024/05/14 17:39:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2025/12/22 05:56:46 adam Exp $
 
 # Download https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2
 # Rename to x264-<last-commit-date>.tar.bz2 and upload to MASTER_SITE_LOCAL.
 
-DISTNAME=      x264-20231001
+DISTNAME=      x264-20250608
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/multimedia/x264/PLIST
diff -u pkgsrc/multimedia/x264/PLIST:1.1 pkgsrc/multimedia/x264/PLIST:1.2
--- pkgsrc/multimedia/x264/PLIST:1.1    Mon Sep 26 17:00:21 2022
+++ pkgsrc/multimedia/x264/PLIST        Mon Dec 22 05:56:46 2025
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2022/09/26 17:00:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/12/22 05:56:46 adam Exp $
 bin/x264
 include/x264.h
 include/x264_config.h
 lib/libx264.a
 lib/libx264.so
-lib/libx264.so.164
+lib/libx264.so.165
 lib/pkgconfig/x264.pc

Index: pkgsrc/multimedia/x264/distinfo
diff -u pkgsrc/multimedia/x264/distinfo:1.5 pkgsrc/multimedia/x264/distinfo:1.6
--- pkgsrc/multimedia/x264/distinfo:1.5 Sun Nov 30 06:25:40 2025
+++ pkgsrc/multimedia/x264/distinfo     Mon Dec 22 05:56:46 2025
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.5 2025/11/30 06:25:40 wiz Exp $
+$NetBSD: distinfo,v 1.6 2025/12/22 05:56:46 adam Exp $
 
-BLAKE2s (x264-20231001.tar.bz2) = a040f4e3cdc3d225dc9a93d98f80a9313db49c4a765b113eae4bfdb9abd5e855
-SHA512 (x264-20231001.tar.bz2) = 260f7dc802bd7555c2fa787cf8f1f8e9010e7c0537ed678da2a40cb924c5fd1c2a922381b0bf25edcfb41e9aa7c27dbcf674f23ea3a4a9dc1671799f14025f44
-Size (x264-20231001.tar.bz2) = 777929 bytes
-SHA1 (patch-common_cpu.c) = 87e0d79e558dbfb050b2efad08ab705cd9c4a5eb
-SHA1 (patch-common_ppc_pixel.c) = 5abd403a4bb673fc8e2f44841704877ff4a2421a
-SHA1 (patch-configure) = c986b2ad87f940bd2cf1a96f471bd497e075b872
+BLAKE2s (x264-20250608.tar.bz2) = f4c347b8a7d3d390f2267ef1e6bb2e67385472fd90fe1732d8b0df7977478eb0
+SHA512 (x264-20250608.tar.bz2) = 61dd4f1052ecd11e8a764f3f3a8e62f56575535b541a838ddc9200e97448a12d391019e680f50fcfa6c7f4337686c8e967403b1772f4f532fc33235b3a97c00e
+Size (x264-20250608.tar.bz2) = 846774 bytes
+SHA1 (patch-configure) = 28942570668a8adb1ea81eb25c9a283f3c0f120b
 SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78

Index: pkgsrc/multimedia/x264/patches/patch-configure
diff -u pkgsrc/multimedia/x264/patches/patch-configure:1.1 pkgsrc/multimedia/x264/patches/patch-configure:1.2
--- pkgsrc/multimedia/x264/patches/patch-configure:1.1  Mon Sep 26 17:00:21 2022
+++ pkgsrc/multimedia/x264/patches/patch-configure      Mon Dec 22 05:56:46 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2022/09/26 17:00:21 adam Exp $
+$NetBSD: patch-configure,v 1.2 2025/12/22 05:56:46 adam Exp $
 
 Add support for DragonFly.
 Use 'amd64' as a synonym for 'x86_64'.
@@ -7,9 +7,9 @@ Do not force compiler optimisations.
 If we fail an assembly test, continue as if --disable-asm
 was passed.
 
---- configure.orig     2022-09-13 09:25:28.000000000 +0000
+--- configure.orig     2025-06-08 16:24:23.000000000 +0000
 +++ configure
-@@ -664,6 +664,10 @@ case $host_os in
+@@ -686,6 +686,10 @@ case $host_os in
          SYS="FREEBSD"
          libm="-lm"
          ;;
@@ -20,7 +20,7 @@ was passed.
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -764,7 +768,7 @@ case $host_cpu in
+@@ -786,7 +790,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
@@ -29,7 +29,7 @@ was passed.
          ARCH="X86_64"
          AS="${AS-nasm}"
          AS_EXT=".asm"
-@@ -793,14 +797,15 @@ case $host_cpu in
+@@ -815,14 +819,15 @@ case $host_cpu in
          fi
          ;;
      powerpc*)
@@ -46,7 +46,7 @@ was passed.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -839,6 +844,18 @@ case $host_cpu in
+@@ -867,6 +872,18 @@ case $host_cpu in
              AS="${AS-${CC}}"
          fi
          ;;
@@ -65,7 +65,7 @@ was passed.
      arm*)
          ARCH="ARM"
          if [ "$SYS" = MACOSX ] ; then
-@@ -985,8 +1002,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+@@ -1013,8 +1030,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
          ASFLAGS="$ASFLAGS -c"
      else
          echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
@@ -76,8 +76,8 @@ was passed.
      fi
  fi
  
-@@ -1000,8 +1017,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
-         ASFLAGS="$ASFLAGS -c"
+@@ -1027,8 +1044,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ;
+         define HAVE_NEON
      else
          echo "no NEON support, try adding -mfpu=neon to CFLAGS"
 -        echo "If you really want to run on such a CPU, configure with --disable-asm."
@@ -85,9 +85,9 @@ was passed.
 +      echo "Disabling asm"
 +      asm="no"
      fi
- fi
- 
-@@ -1019,8 +1036,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
+     # Check for higher .arch levels. We only need armv8.2-a in order to
+     # enable the extensions we want below - we primarily want to control
+@@ -1071,8 +1088,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
          define HAVE_MSA
      else
          echo "You specified a pre-MSA CPU in your CFLAGS."
@@ -98,7 +98,7 @@ was passed.
      fi
  fi
  
-@@ -1037,7 +1054,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+@@ -1096,7 +1113,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
  CPU_ENDIAN="little-endian"
  if [ $compiler = GNU ]; then
      echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
@@ -107,7 +107,7 @@ was passed.
      if (${STRINGS} -a conftest.o | grep -q BIGE) && (${STRINGS} -a conftest.o | grep -q FPendian) ; then
          define WORDS_BIGENDIAN
          CPU_ENDIAN="big-endian"
-@@ -1060,7 +1077,7 @@ fi
+@@ -1119,7 +1136,7 @@ fi
  
  # autodetect options that weren't forced nor disabled
  
@@ -116,7 +116,7 @@ was passed.
  if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then
      if [ "$gpl" = "no" ] ; then
          echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl"
-@@ -1319,7 +1336,7 @@ if [ "$pic" = "yes" ] ; then
+@@ -1394,7 +1411,7 @@ if [ "$pic" = "yes" ] ; then
      [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC"
      [[ "$ASFLAGS" != *"-DPIC"* ]] && ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
@@ -125,7 +125,7 @@ was passed.
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
-@@ -1335,7 +1352,6 @@ if [ "$debug" = "yes" ]; then
+@@ -1410,7 +1427,6 @@ if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
      RCFLAGS="$RCFLAGS -DDEBUG"
  else