CVS commit: pkgsrc/multimedia/ffmpeg6

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 27 02:53:01 UTC 2024

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg6/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg6/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/ffmpeg6/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/ffmpeg6/Makefile
diff -u pkgsrc/multimedia/ffmpeg6/Makefile:1.9 pkgsrc/multimedia/ffmpeg6/Makefile:1.10
--- pkgsrc/multimedia/ffmpeg6/Makefile:1.9      Mon Jan 22 13:17:01 2024
+++ pkgsrc/multimedia/ffmpeg6/Makefile  Sat Jan 27 02:53:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/01/22 13:17:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2024/01/27 02:53:01 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg6/}
 PKGREVISION=   1
@@ -18,13 +18,6 @@ INSTALLATION_DIRS=   lib/ffmpeg6 share/doc
 CONFIGURE_ARGS+=       --enable-rpath
 .endif
 
-.if ${USE_CROSS_COMPILE:U: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}
-.endif
-
 PRINT_PLIST_AWK+=      /html/ { $$0 = "$${PLIST.doc}" $$0 }
 PRINT_PLIST_AWK+=      /css/ { $$0 = "$${PLIST.doc}" $$0 }
 

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.5 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.6
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.5       Sun Dec 31 20:49:27 2023
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Sat Jan 27 02:53:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2023/12/31 20:49:27 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2024/01/27 02:53:01 riastradh Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
@@ -36,6 +36,21 @@ LDFLAGS+=            ${COMPILER_RPATH_FLAG}${PREFI
 # https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
 LDFLAGS.Darwin+=       -Wl,-ld_classic
 
+.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
+
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
 CONFIGURE_ARGS+=       --enable-opencl
 .endif

Index: pkgsrc/multimedia/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.6 pkgsrc/multimedia/ffmpeg6/distinfo:1.7
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.6      Mon Jan  1 09:06:25 2024
+++ pkgsrc/multimedia/ffmpeg6/distinfo  Sat Jan 27 02:53:01 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2024/01/01 09:06:25 adam Exp $
+$NetBSD: distinfo,v 1.7 2024/01/27 02:53:01 riastradh Exp $
 
 BLAKE2s (ffmpeg-6.1.1.tar.xz) = e07806b5adbb459584f35c6b5fa7d3e8e5184fe6cca9e818c7b494f6e8287d8c
 SHA512 (ffmpeg-6.1.1.tar.xz) = fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
@@ -18,5 +18,6 @@ SHA1 (patch-libavdevice_sunau__enc.c) = 
 SHA1 (patch-libavformat_avformat.h) = 162daff5075c436bfff6e9a33238ba273a0afea6
 SHA1 (patch-libavformat_mux__utils.c) = fb7be5deb316e2fa79ba8cf8f2f4e347b13b91f5
 SHA1 (patch-libavutil_macros.h) = 7d9770f018a2207d2dcb1fe057564e30be51fd42
+SHA1 (patch-libavutil_ppc_cpu.c) = 0c77fecf2b92fa7b8f786987b216fe70a0d45904
 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
 SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487

Added files:

Index: pkgsrc/multimedia/ffmpeg6/patches/patch-libavutil_ppc_cpu.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg6/patches/patch-libavutil_ppc_cpu.c:1.1
--- /dev/null   Sat Jan 27 02:53:01 2024
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-libavutil_ppc_cpu.c Sat Jan 27 02:53:01 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavutil_ppc_cpu.c,v 1.1 2024/01/27 02:53:01 riastradh Exp $
+
+Handle machdep.altivec on NetBSD like on OpenBSD.
+
+--- libavutil/ppc/cpu.c.orig   2023-11-09 23:38:54.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/types.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};