CVS commit: pkgsrc/multimedia/x264

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

Module Name:    pkgsrc
Committed By:   martin
Date:           Sun Dec 18 09:07:24 UTC 2022

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

Log Message:
Make it build on NetBSD/macppc


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x264/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/x264/patches/patch-common_cpu.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.1 pkgsrc/multimedia/x264/distinfo:1.2
--- pkgsrc/multimedia/x264/distinfo:1.1 Mon Sep 26 17:00:21 2022
+++ pkgsrc/multimedia/x264/distinfo     Sun Dec 18 09:07:24 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2022/09/26 17:00:21 adam Exp $
+$NetBSD: distinfo,v 1.2 2022/12/18 09:07:24 martin Exp $
 
 BLAKE2s (x264-20220601.tar.bz2) = 2990b29a9425fc9ad246905ddad2a9c0e888919fb1c3fd28b96209af823a085a
 SHA512 (x264-20220601.tar.bz2) = 73b8be945a2a82ea7af5039f5baa816440292887c1cad2672556f699a9d80eb8fbc2d5e44826cb36fecbbe83e6e75095c9ccd352bd2cb128caff7d4d7ed84e81
 Size (x264-20220601.tar.bz2) = 777576 bytes
+SHA1 (patch-common_cpu.c) = 164f6962edb1eb8442247822eb80e508a2e72d77
 SHA1 (patch-configure) = c986b2ad87f940bd2cf1a96f471bd497e075b872
 SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78

Added files:

Index: pkgsrc/multimedia/x264/patches/patch-common_cpu.c
diff -u /dev/null pkgsrc/multimedia/x264/patches/patch-common_cpu.c:1.1
--- /dev/null   Sun Dec 18 09:07:25 2022
+++ pkgsrc/multimedia/x264/patches/patch-common_cpu.c   Sun Dec 18 09:07:24 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-common_cpu.c,v 1.1 2022/12/18 09:07:24 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 )
+ 
+ #elif HAVE_ALTIVEC
+ 
+-#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
++#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD || SYS_NETBSD
+ 
+ uint32_t x264_cpu_detect( void )
+ {
+@@ -320,6 +320,8 @@ uint32_t x264_cpu_detect( void )
+     size_t   length = sizeof( has_altivec );
+ #if SYS_MACOSX || SYS_OPENBSD
+     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
++#elif SYS_NETBSD
++    int      error = sysctlbyname( "machdep.altivec", &has_altivec, &length, NULL, 0 );
+ #else
+     int      error = sysctlbyname( "hw.altivec", &has_altivec, &length, NULL, 0 );
+ #endif