CVS commit: pkgsrc/multimedia/ffmpeg2

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 27 02:51:32 UTC 2024

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/multimedia/ffmpeg2/patches: patch-libavutil_ppc_cpu.c

Log Message:
multimedia/ffmpeg2: sync cross-build and powerpc changes from ffmpeg5


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.62 -r1.63 pkgsrc/multimedia/ffmpeg2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg2/patches/patch-libavutil_ppc_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/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.94 pkgsrc/multimedia/ffmpeg2/Makefile:1.95
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.94     Mon Jan 22 13:17:00 2024
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Sat Jan 27 02:51:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2024/01/22 13:17:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2024/01/27 02:51:31 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
 PKGREVISION=   14
@@ -22,14 +22,6 @@ CONF_FILES+= ${PREFIX}/share/examples/ff
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --enable-cross-compile
-CONFIGURE_ARGS+=       --arch=${MACHINE_ARCH}
-CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}
-CONFIGURE_ARGS+=       --host-ld=${NATIVE_CC:Q}
-CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS}
-.endif
-
 PRINT_PLIST_AWK+=      /html/ { $$0 = "$${PLIST.doc}" $$0 }
 PRINT_PLIST_AWK+=      /opencl/ { $$0 = "$${PLIST.opencl}" $$0 }
 

Index: pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.67 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.68
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.67      Thu Nov  9 16:31:18 2023
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Sat Jan 27 02:51:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.67 2023/11/09 16:31:18 nia Exp $
+# $NetBSD: Makefile.common,v 1.68 2024/01/27 02:51:31 riastradh Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -33,6 +33,22 @@ CONFIGURE_ARGS+=     --libdir=${PREFIX}/lib/
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg2
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2
 
+.if ${USE_CROSS_COMPILE:tl} == yes
+CONFIGURE_ARGS+=       --enable-cross-compile
+CONFIGURE_ARGS+=       --arch=${MACHINE_ARCH:Q}
+CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}
+CONFIGURE_ARGS+=       --host-ld=${NATIVE_CC:Q}
+CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS:Q}
+.  include "../../mk/endian.mk"
+.  if ${MACHINE_ENDIAN} == "big"
+CONFIGURE_ENV+=                bigendian=yes
+.  endif
+.  if !empty(MACHINE_ARCH:Mpowerpc*)
+BUILDLINK_TRANSFORM+=  rm:-maltivec
+BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
+.  endif
+.endif
+
 PLIST_VARS+=           opencl
 
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)

Index: pkgsrc/multimedia/ffmpeg2/distinfo
diff -u pkgsrc/multimedia/ffmpeg2/distinfo:1.62 pkgsrc/multimedia/ffmpeg2/distinfo:1.63
--- pkgsrc/multimedia/ffmpeg2/distinfo:1.62     Mon May 23 13:48:53 2022
+++ pkgsrc/multimedia/ffmpeg2/distinfo  Sat Jan 27 02:51:31 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2022/05/23 13:48:53 adam Exp $
+$NetBSD: distinfo,v 1.63 2024/01/27 02:51:31 riastradh Exp $
 
 BLAKE2s (ffmpeg-2.8.20.tar.xz) = b6a9511dcd7287693f399cf1205dfa5e86e8d41554e677773db2006d9b918ec2
 SHA512 (ffmpeg-2.8.20.tar.xz) = 3f00cda4bc49573eee78ee7d57758d61895bab4a0f230316f1fb4671e197e81124121d6023cdcb56c3db4055be48f585908ee624aa4bd0ebe601a2a1ea0120a0
@@ -8,5 +8,6 @@ SHA1 (patch-configure) = bdc91d620c077f8
 SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
 SHA1 (patch-libavcodec_x86_ac3dsp__init.c) = f8951b7a1b036addbc0e6a657418e08fcde9fb44
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
+SHA1 (patch-libavutil_ppc_cpu.c) = be6ece342b061c3ef9b1836bf55ec4f2e0cdc81b
 SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
 SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239

Added files:

Index: pkgsrc/multimedia/ffmpeg2/patches/patch-libavutil_ppc_cpu.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg2/patches/patch-libavutil_ppc_cpu.c:1.1
--- /dev/null   Sat Jan 27 02:51:32 2024
+++ pkgsrc/multimedia/ffmpeg2/patches/patch-libavutil_ppc_cpu.c Sat Jan 27 02:51:32 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavutil_ppc_cpu.c,v 1.1 2024/01/27 02:51:32 riastradh Exp $
+
+Handle machdep.altivec on NetBSD like on OpenBSD.
+
+--- libavutil/ppc/cpu.c.orig   2022-05-14 21:21:50.000000000 +0000
++++ libavutil/ppc/cpu.c
+@@ -27,7 +27,7 @@
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+-#elif defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <machine/cpu.h>
+@@ -56,8 +56,8 @@ int ff_get_cpu_flags_ppc(void)
+     if (result == VECTORTYPE_ALTIVEC)
+         return AV_CPU_FLAG_ALTIVEC;
+     return 0;
+-#elif defined(__APPLE__) || defined(__OpenBSD__)
+-#ifdef __OpenBSD__
++#elif defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+     int sels[2] = {CTL_MACHDEP, CPU_ALTIVEC};
+ #else
+     int sels[2] = {CTL_HW, HW_VECTORUNIT};