CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:32:57 UTC 2024

Modified Files:
        pkgsrc/multimedia/gmplayer: Makefile distinfo
        pkgsrc/multimedia/mencoder: Makefile
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: Makefile distinfo
Added Files:
        pkgsrc/multimedia/mplayer-share/patches:
            patch-ffmpeg_libavutil_ppc_cpu.c

Log Message:
multimedia/mplayer: Handle machdep.altivec on NetBSD/powerpc too.

Bump revision because this built without the change on
NetBSD/powerpc, but didn't respect machdep.altivec at runtime.

Essentially the same patch as applied to ffmpeg2 through ffmpeg7, of
which mplayer has its own copy.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/multimedia/gmplayer/distinfo
cvs rdiff -u -r1.80 -r1.81 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.93 -r1.94 pkgsrc/multimedia/mplayer-share/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_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/gmplayer/Makefile
diff -u pkgsrc/multimedia/gmplayer/Makefile:1.166 pkgsrc/multimedia/gmplayer/Makefile:1.167
--- pkgsrc/multimedia/gmplayer/Makefile:1.166   Sun Apr  7 07:34:42 2024
+++ pkgsrc/multimedia/gmplayer/Makefile Fri Apr 12 19:32:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2024/04/07 07:34:42 wiz Exp $
+# $NetBSD: Makefile,v 1.167 2024/04/12 19:32:56 riastradh Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -8,7 +8,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_VERSION}
-PKGREVISION=   8
+PKGREVISION=   9
 
 SKIN_SITES=    http://www1.mplayerhq.hu/MPlayer/skins/         \
                http://www2.mplayerhq.hu/MPlayer/skins/         \

Index: pkgsrc/multimedia/gmplayer/distinfo
diff -u pkgsrc/multimedia/gmplayer/distinfo:1.114 pkgsrc/multimedia/gmplayer/distinfo:1.115
--- pkgsrc/multimedia/gmplayer/distinfo:1.114   Sat Jan 27 02:11:03 2024
+++ pkgsrc/multimedia/gmplayer/distinfo Fri Apr 12 19:32:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.114 2024/01/27 02:11:03 riastradh Exp $
+$NetBSD: distinfo,v 1.115 2024/04/12 19:32:56 riastradh Exp $
 
 BLAKE2s (mplayer/Abyss-1.7.tar.bz2) = 8f2e3b2454234f396d8eec5916617133627621aa1690e68a876beb4716bdb2da
 SHA512 (mplayer/Abyss-1.7.tar.bz2) = e60aae7a6a264023ebb49421696bc78ec46b463ce6d7f869cc5561e183a6d5abd3846b71a45656c8ad2a6f35bafd76d15235216dcba3b4936ff7b364b7a66407
@@ -229,6 +229,7 @@ SHA1 (patch-ae) = 286f5ac075ea4123a1a627
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05
 SHA1 (patch-configure) = 4954fe76122f9412433b1cccb64bcc052d1c026f
+SHA1 (patch-ffmpeg_libavutil_ppc_cpu.c) = c2076abc3214b243ad56e3f85960beac6111e557
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5

Index: pkgsrc/multimedia/mencoder/Makefile
diff -u pkgsrc/multimedia/mencoder/Makefile:1.80 pkgsrc/multimedia/mencoder/Makefile:1.81
--- pkgsrc/multimedia/mencoder/Makefile:1.80    Sat Feb 17 22:49:22 2024
+++ pkgsrc/multimedia/mencoder/Makefile Fri Apr 12 19:32:56 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2024/02/17 22:49:22 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2024/04/12 19:32:56 riastradh Exp $
 
 PKGNAME=       mencoder-${MPLAYER_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.114 pkgsrc/multimedia/mplayer/Makefile:1.115
--- pkgsrc/multimedia/mplayer/Makefile:1.114    Sat Feb 17 22:49:22 2024
+++ pkgsrc/multimedia/mplayer/Makefile  Fri Apr 12 19:32:57 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2024/02/17 22:49:22 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2024/04/12 19:32:57 riastradh Exp $
 
 PKGNAME=       mplayer-${MPLAYER_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 
 COMMENT=       Fast, cross-platform movie player
 

Index: pkgsrc/multimedia/mplayer-share/Makefile
diff -u pkgsrc/multimedia/mplayer-share/Makefile:1.93 pkgsrc/multimedia/mplayer-share/Makefile:1.94
--- pkgsrc/multimedia/mplayer-share/Makefile:1.93       Tue Jan 30 14:22:25 2024
+++ pkgsrc/multimedia/mplayer-share/Makefile    Fri Apr 12 19:32:56 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2024/01/30 14:22:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2024/04/12 19:32:56 riastradh Exp $
 
-PKGREVISION= 12
+PKGREVISION= 13
 .include "Makefile.common"
 
 PKGNAME=       mplayer-share-${MPLAYER_VERSION}

Index: pkgsrc/multimedia/mplayer-share/distinfo
diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.106 pkgsrc/multimedia/mplayer-share/distinfo:1.107
--- pkgsrc/multimedia/mplayer-share/distinfo:1.106      Sat Jan 27 02:11:04 2024
+++ pkgsrc/multimedia/mplayer-share/distinfo    Fri Apr 12 19:32:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.106 2024/01/27 02:11:04 riastradh Exp $
+$NetBSD: distinfo,v 1.107 2024/04/12 19:32:56 riastradh Exp $
 
 BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5
 SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
@@ -7,6 +7,7 @@ SHA1 (patch-ae) = 286f5ac075ea4123a1a627
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05
 SHA1 (patch-configure) = 4954fe76122f9412433b1cccb64bcc052d1c026f
+SHA1 (patch-ffmpeg_libavutil_ppc_cpu.c) = c2076abc3214b243ad56e3f85960beac6111e557
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5

Added files:

Index: pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_ppc_cpu.c
diff -u /dev/null pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_ppc_cpu.c:1.1
--- /dev/null   Fri Apr 12 19:32:57 2024
+++ pkgsrc/multimedia/mplayer-share/patches/patch-ffmpeg_libavutil_ppc_cpu.c    Fri Apr 12 19:32:57 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-ffmpeg_libavutil_ppc_cpu.c,v 1.1 2024/04/12 19:32:57 riastradh Exp $
+
+Handle machdep.altivec on NetBSD like on OpenBSD.
+
+--- ffmpeg/libavutil/ppc/cpu.c.orig    2022-02-27 15:52:31.000000000 +0000
++++ ffmpeg/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};