CVS commit: pkgsrc/multimedia/x264

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Sat Nov 29 19:16:03 UTC 2025

Modified Files:
        pkgsrc/multimedia/x264: distinfo
        pkgsrc/multimedia/x264/patches: patch-common_cpu.c
Added Files:
        pkgsrc/multimedia/x264/patches: patch-common_ppc_pixel.c

Log Message:
Make this buildable on powerpc with newer gcc


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

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/distinfo
diff -u pkgsrc/multimedia/x264/distinfo:1.3 pkgsrc/multimedia/x264/distinfo:1.4
--- pkgsrc/multimedia/x264/distinfo:1.3 Fri Feb 23 19:41:25 2024
+++ pkgsrc/multimedia/x264/distinfo     Sat Nov 29 19:16:03 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2024/02/23 19:41:25 adam Exp $
+$NetBSD: distinfo,v 1.4 2025/11/29 19:16:03 martin 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) = 164f6962edb1eb8442247822eb80e508a2e72d77
+SHA1 (patch-common_cpu.c) = 6149ac200adc572766aa6ebe26d895a8726e40ca
+SHA1 (patch-common_ppc_pixel.c) = 5abd403a4bb673fc8e2f44841704877ff4a2421a
 SHA1 (patch-configure) = c986b2ad87f940bd2cf1a96f471bd497e075b872
 SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78

Index: pkgsrc/multimedia/x264/patches/patch-common_cpu.c
diff -u pkgsrc/multimedia/x264/patches/patch-common_cpu.c:1.1 pkgsrc/multimedia/x264/patches/patch-common_cpu.c:1.2
--- pkgsrc/multimedia/x264/patches/patch-common_cpu.c:1.1       Sun Dec 18 09:07:24 2022
+++ pkgsrc/multimedia/x264/patches/patch-common_cpu.c   Sat Nov 29 19:16:03 2025
@@ -1,10 +1,19 @@
-$NetBSD: patch-common_cpu.c,v 1.1 2022/12/18 09:07:24 martin Exp $
+$NetBSD: patch-common_cpu.c,v 1.2 2025/11/29 19:16:03 martin Exp $
 
 Add support for NetBSD/macppc altivec discovery
 
---- common/cpu.c.orig  2022-12-18 09:53:44.331288779 +0100
-+++ common/cpu.c       2022-12-18 10:00:12.985921601 +0100
-@@ -305,7 +305,7 @@ uint32_t x264_cpu_detect( void )
+--- cpu.c.orig 2023-10-01 16:28:26.000000000 +0200
++++ cpu.c      2025-11-29 18:58:01.556075806 +0100
+@@ -40,7 +40,7 @@
+ #if SYS_BEOS
+ #include <kernel/OS.h>
+ #endif
+-#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
++#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD || SYS_NETBSD
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+@@ -305,7 +305,7 @@
  
  #elif HAVE_ALTIVEC
  
@@ -13,7 +22,7 @@ Add support for NetBSD/macppc altivec di
  
  uint32_t x264_cpu_detect( void )
  {
-@@ -320,6 +320,8 @@ uint32_t x264_cpu_detect( void )
+@@ -320,6 +320,8 @@
      size_t   length = sizeof( has_altivec );
  #if SYS_MACOSX || SYS_OPENBSD
      int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );

Added files:

Index: pkgsrc/multimedia/x264/patches/patch-common_ppc_pixel.c
diff -u /dev/null pkgsrc/multimedia/x264/patches/patch-common_ppc_pixel.c:1.1
--- /dev/null   Sat Nov 29 19:16:03 2025
+++ pkgsrc/multimedia/x264/patches/patch-common_ppc_pixel.c     Sat Nov 29 19:16:03 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-common_ppc_pixel.c,v 1.1 2025/11/29 19:16:03 martin Exp $
+
+Fix function prototype so this compiles with newer gcc
+
+--- common/ppc/pixel.c.orig    2023-10-01 16:28:26.000000000 +0200
++++ common/ppc/pixel.c 2025-11-29 20:11:29.161369047 +0100
+@@ -855,7 +855,7 @@
+         sum2v = (vec_s32_t) vec_sum4s( vec_absd( fencv, pix2v ), (vec_u32_t) sum2v );
+ 
+ #define PIXEL_SAD_X3_ALTIVEC( name, ly )            \
+-static int name( uint8_t *fenc, uint8_t *pix0,      \
++static void name( uint8_t *fenc, uint8_t *pix0,     \
+                  uint8_t *pix1, uint8_t *pix2,      \
+                  intptr_t i_stride, int scores[3] ) \
+ {                                                   \
+@@ -965,7 +965,7 @@
+ }
+ 
+ #define PIXEL_SAD_X4_ALTIVEC( name, ly )                                              \
+-static int name( uint8_t *fenc,                                                       \
++static void name( uint8_t *fenc,                                                      \
+                  uint8_t *pix0, uint8_t *pix1,                                        \
+                  uint8_t *pix2, uint8_t *pix3,                                        \
+                  intptr_t i_stride, int scores[4] )                                   \