CVS commit: pkgsrc/multimedia/ffmpeg3

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 27 02:52:38 UTC 2024

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg3/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/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.94 pkgsrc/multimedia/ffmpeg3/Makefile:1.95
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.94     Mon Jan 22 13:17:00 2024
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Sat Jan 27 02:52:37 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:52:37 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
 PKGREVISION=   16
@@ -22,13 +22,6 @@ CONF_FILES+= ${PREFIX}/share/examples/ff
 CONFIGURE_ARGS+=       --enable-rpath
 .endif
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --enable-cross-compile
-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/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.41 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.42
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.41      Tue Jun  6 12:41:59 2023
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Sat Jan 27 02:52:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2023/06/06 12:41:59 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.42 2024/01/27 02:52:37 riastradh Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -34,6 +34,21 @@ CONFIGURE_ARGS+=     --libdir=${PREFIX}/lib/
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg3
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg3
 
+.if ${USE_CROSS_COMPILE:tl} == yes
+CONFIGURE_ARGS+=       --enable-cross-compile
+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/ffmpeg3/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.40 pkgsrc/multimedia/ffmpeg3/distinfo:1.41
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.40     Thu Aug 17 08:56:10 2023
+++ pkgsrc/multimedia/ffmpeg3/distinfo  Sat Jan 27 02:52:37 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2023/08/17 08:56:10 jperkin Exp $
+$NetBSD: distinfo,v 1.41 2024/01/27 02:52:37 riastradh Exp $
 
 BLAKE2s (ffmpeg-3.4.11.tar.xz) = d23ee74f99cf5e2b8ee8358053b2978b967cf81f5d85b0c3d2a8de0a7ba128b1
 SHA512 (ffmpeg-3.4.11.tar.xz) = 61d62d5ad7bbde78d957ca40b5cf9fae5fe0125292b99d0caff9441fad3ecea165a4546a44b9049849f588024c881bba2c6bbd0255133db49188d4bf4693ff4e
@@ -8,5 +8,6 @@ SHA1 (patch-configure) = 1232f497896f36d
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavcodec_x86_mathops.h) = d70bbbfac56cf7d37ef8789ec4a7964ec82a2c7b
 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
+SHA1 (patch-libavutil_ppc_cpu.c) = be6ece342b061c3ef9b1836bf55ec4f2e0cdc81b
 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
 SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487

Added files:

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-libavutil_ppc_cpu.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg3/patches/patch-libavutil_ppc_cpu.c:1.1
--- /dev/null   Sat Jan 27 02:52:38 2024
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-libavutil_ppc_cpu.c Sat Jan 27 02:52:37 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavutil_ppc_cpu.c,v 1.1 2024/01/27 02:52:37 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};