Tue Jun 22 12:35:45 2021 UTC ()
mplayer: remove pulse from default options now NetBSD 7 is unsupported
and it requires mozjs (and rust) which doesn't work on plaforms such as
arm


(nia)
diff -r1.153 -r1.154 pkgsrc/multimedia/gmplayer/Makefile
diff -r1.73 -r1.74 pkgsrc/multimedia/mencoder/Makefile
diff -r1.107 -r1.108 pkgsrc/multimedia/mplayer/Makefile
diff -r1.75 -r1.76 pkgsrc/multimedia/mplayer-share/Makefile
diff -r1.67 -r1.68 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.153 -r1.154 pkgsrc/multimedia/gmplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/Makefile 2020/08/17 20:19:38 1.153
+++ pkgsrc/multimedia/gmplayer/Makefile 2021/06/22 12:35:44 1.154
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.153 2020/08/17 20:19:38 leot Exp $ 1# $NetBSD: Makefile,v 1.154 2021/06/22 12:35:44 nia Exp $
2# 2#
3# NOTE: if you are updating both mplayer and gmplayer, you must ensure 3# NOTE: if you are updating both mplayer and gmplayer, you must ensure
4# that *both* distinfo files contain the correct, up-to-date files and 4# that *both* distinfo files contain the correct, up-to-date files and
5# checksums. 5# checksums.
6# 6#
7# NOTE: patches are shared between mplayer and gmplayer! 7# NOTE: patches are shared between mplayer and gmplayer!
8# 8#
9 9
10PKGNAME= gmplayer-${MPLAYER_VERSION} 10PKGNAME= gmplayer-${MPLAYER_VERSION}
11PKGREVISION= 6 11PKGREVISION= 7
12 12
13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ 13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
14 http://www2.mplayerhq.hu/MPlayer/skins/ \ 14 http://www2.mplayerhq.hu/MPlayer/skins/ \
15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ 15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/
16 16
17.include "../../multimedia/mplayer-share/Makefile.common" 17.include "../../multimedia/mplayer-share/Makefile.common"
18SKIN_EXTRACT_SUFX= .tar.bz2 18SKIN_EXTRACT_SUFX= .tar.bz2
19 19
20COMMENT= Fast, cross-platform movie player with GTK2+ interface 20COMMENT= Fast, cross-platform movie player with GTK2+ interface
21 21
22SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX} \ 22SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX} \
23 AlienMind-1.2${SKIN_EXTRACT_SUFX} \ 23 AlienMind-1.2${SKIN_EXTRACT_SUFX} \
24 Ater-1.2${SKIN_EXTRACT_SUFX} \ 24 Ater-1.2${SKIN_EXTRACT_SUFX} \
cvs diff -r1.73 -r1.74 pkgsrc/multimedia/mencoder/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mencoder/Makefile 2019/06/22 22:46:45 1.73
+++ pkgsrc/multimedia/mencoder/Makefile 2021/06/22 12:35:45 1.74
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.73 2019/06/22 22:46:45 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.74 2021/06/22 12:35:45 nia Exp $
2 2
3PKGNAME= mencoder-${MPLAYER_VERSION} 3PKGNAME= mencoder-${MPLAYER_VERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5 5
6COMMENT= Simple movie encoder for MPlayer-playable movies 6COMMENT= Simple movie encoder for MPlayer-playable movies
7 7
8USE_TOOLS+= pkg-config 8USE_TOOLS+= pkg-config
9 9
10.include "../../multimedia/mplayer-share/Makefile.common" 10.include "../../multimedia/mplayer-share/Makefile.common"
11 11
12# Fix build under Mac OS X, please see here for details: 12# Fix build under Mac OS X, please see here for details:
13# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html 13# http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html
14LDFLAGS.Darwin+= -framework Carbon 14LDFLAGS.Darwin+= -framework Carbon
15 15
16CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 16CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
17 17
cvs diff -r1.107 -r1.108 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2021/04/10 13:06:50 1.107
+++ pkgsrc/multimedia/mplayer/Makefile 2021/06/22 12:35:45 1.108
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.107 2021/04/10 13:06:50 ryoon Exp $ 1# $NetBSD: Makefile,v 1.108 2021/06/22 12:35:45 nia Exp $
2 2
3PKGNAME= mplayer-${MPLAYER_VERSION} 3PKGNAME= mplayer-${MPLAYER_VERSION}
4PKGREVISION= 2 4PKGREVISION= 3
5 5
6COMMENT= Fast, cross-platform movie player 6COMMENT= Fast, cross-platform movie player
7 7
8.include "../../multimedia/mplayer-share/Makefile.common" 8.include "../../multimedia/mplayer-share/Makefile.common"
9 9
10USE_TOOLS+= pkg-config 10USE_TOOLS+= pkg-config
11 11
12CONFIGURE_ARGS+= --disable-mencoder 12CONFIGURE_ARGS+= --disable-mencoder
13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer 13CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer
14CONFIGURE_ARGS+= --enable-xvmc 14CONFIGURE_ARGS+= --enable-xvmc
15CONFIGURE_ARGS+= --with-xvmclib=XvMCW 15CONFIGURE_ARGS+= --with-xvmclib=XvMCW
16 16
17# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not 17# Solaris/x86 has Xv, but the header files live in /usr/X11R6, not
cvs diff -r1.75 -r1.76 pkgsrc/multimedia/mplayer-share/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/Makefile 2021/02/07 06:30:34 1.75
+++ pkgsrc/multimedia/mplayer-share/Makefile 2021/06/22 12:35:45 1.76
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.75 2021/02/07 06:30:34 ryoon Exp $ 1# $NetBSD: Makefile,v 1.76 2021/06/22 12:35:45 nia Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= mplayer-share-${MPLAYER_VERSION} 5PKGNAME= mplayer-share-${MPLAYER_VERSION}
6PKGREVISION= 10 6PKGREVISION= 11
7COMMENT= Documentation used by mplayer and gmplayer 7COMMENT= Documentation used by mplayer and gmplayer
8 8
9DEPENDS+= mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts 9DEPENDS+= mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
10 10
11USE_TOOLS+= pax 11USE_TOOLS+= pax
12 12
13NO_BUILD= YES 13NO_BUILD= YES
14NO_CONFIGURE= YES 14NO_CONFIGURE= YES
15 15
16INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/mplayer/DOCS 16INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/mplayer/DOCS
17 17
18do-install: 18do-install:
19 ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 19 ${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
cvs diff -r1.67 -r1.68 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2020/01/20 21:34:01 1.67
+++ pkgsrc/multimedia/mplayer-share/options.mk 2021/06/22 12:35:45 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.67 2020/01/20 21:34:01 nia Exp $ 1# $NetBSD: options.mk,v 1.68 2021/06/22 12:35:45 nia Exp $
2 2
3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) 3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
4 4
5# Note: This expression is the same as ${PKGBASE}, but the latter is 5# Note: This expression is the same as ${PKGBASE}, but the latter is
6# not defined yet, so we cannot use it here. 6# not defined yet, so we cannot use it here.
7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
8 8
9.include "../../mk/oss.buildlink3.mk" 9.include "../../mk/oss.buildlink3.mk"
10 10
11.include "../../multimedia/libvdpau/available.mk" 11.include "../../multimedia/libvdpau/available.mk"
12.include "../../comms/lirc/available.mk" 12.include "../../comms/lirc/available.mk"
13 13
14# ------------------------------------------------------------------------- 14# -------------------------------------------------------------------------
@@ -73,27 +73,27 @@ PKG_SUPPORTED_OPTIONS+= mplayer-ssse3 @@ -73,27 +73,27 @@ PKG_SUPPORTED_OPTIONS+= mplayer-ssse3
73. endif 73. endif
74. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ 74. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
75 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" 75 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
76PKG_SUPPORTED_OPTIONS+= xvid 76PKG_SUPPORTED_OPTIONS+= xvid
77. endif 77. endif
78 78
79# ------------------------------------------------------------------------- 79# -------------------------------------------------------------------------
80# Define PKG_SUGGESTED_OPTIONS. 80# Define PKG_SUGGESTED_OPTIONS.
81# ------------------------------------------------------------------------- 81# -------------------------------------------------------------------------
82 82
83. for o in dvdread dvdnav gif jpeg \ 83. for o in dvdread dvdnav gif jpeg \
84 mplayer-menu \ 84 mplayer-menu \
85 mplayer-default-cflags mplayer-runtime-cpudetection \ 85 mplayer-default-cflags mplayer-runtime-cpudetection \
86 oss png pulseaudio sdl vdpau lirc 86 oss png sdl vdpau lirc
87. if !empty(PKG_SUPPORTED_OPTIONS:M${o}) 87. if !empty(PKG_SUPPORTED_OPTIONS:M${o})
88PKG_SUGGESTED_OPTIONS+= ${o} 88PKG_SUGGESTED_OPTIONS+= ${o}
89. endif 89. endif
90. endfor 90. endfor
91. if !empty(PKGNAME:M*mplayer*) 91. if !empty(PKGNAME:M*mplayer*)
92PKG_SUGGESTED_OPTIONS.Linux+= alsa 92PKG_SUGGESTED_OPTIONS.Linux+= alsa
93. endif 93. endif
94PKG_SUGGESTED_OPTIONS.Linux+= vidix 94PKG_SUGGESTED_OPTIONS.Linux+= vidix
95 95
96# ------------------------------------------------------------------------- 96# -------------------------------------------------------------------------
97# Handle extra libraries (part 1) 97# Handle extra libraries (part 1)
98# ------------------------------------------------------------------------- 98# -------------------------------------------------------------------------
99EXTRA_LIBS= 99EXTRA_LIBS=