Sun Mar 24 20:38:25 2019 UTC ()
Add support for libmpg123 (default on) and libopus (default off).

libmpg123 is the internally preferred mp3 decoder, according to codecs.conf.
The ffmpeg fallback complains a lot about many audio streams, causing
stuttering sound. Using mpg123 should avoid that.


(rhialto)
diff -r1.141 -r1.142 pkgsrc/multimedia/gmplayer/Makefile
diff -r1.69 -r1.70 pkgsrc/multimedia/mencoder/Makefile
diff -r1.102 -r1.103 pkgsrc/multimedia/mplayer/Makefile
diff -r1.60 -r1.61 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.141 -r1.142 pkgsrc/multimedia/gmplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/Makefile 2019/01/12 15:26:42 1.141
+++ pkgsrc/multimedia/gmplayer/Makefile 2019/03/24 20:38:25 1.142
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.141 2019/01/12 15:26:42 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.142 2019/03/24 20:38:25 rhialto 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= 10 11PKGREVISION= 11
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 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \ 16 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \
17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \ 17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \
18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/ 18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/
19 19
20.include "../../multimedia/mplayer-share/Makefile.common" 20.include "../../multimedia/mplayer-share/Makefile.common"
21SKIN_EXTRACT_SUFX= .tar.bz2 21SKIN_EXTRACT_SUFX= .tar.bz2
22 22
23COMMENT= Fast, cross-platform movie player with GTK2+ interface 23COMMENT= Fast, cross-platform movie player with GTK2+ interface
24 24
cvs diff -r1.69 -r1.70 pkgsrc/multimedia/mencoder/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mencoder/Makefile 2019/01/12 15:26:42 1.69
+++ pkgsrc/multimedia/mencoder/Makefile 2019/03/24 20:38:25 1.70
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.69 2019/01/12 15:26:42 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.70 2019/03/24 20:38:25 rhialto Exp $
2 2
3PKGNAME= mencoder-${MPLAYER_VERSION} 3PKGNAME= mencoder-${MPLAYER_VERSION}
4PKGREVISION= 2 4PKGREVISION= 3
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.102 -r1.103 pkgsrc/multimedia/mplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer/Makefile 2019/01/12 15:26:42 1.102
+++ pkgsrc/multimedia/mplayer/Makefile 2019/03/24 20:38:25 1.103
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.102 2019/01/12 15:26:42 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.103 2019/03/24 20:38:25 rhialto 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.60 -r1.61 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2018/04/04 12:26:24 1.60
+++ pkgsrc/multimedia/mplayer-share/options.mk 2019/03/24 20:38:25 1.61
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: options.mk,v 1.60 2018/04/04 12:26:24 triaxx Exp $ 1# $NetBSD: options.mk,v 1.61 2019/03/24 20:38:25 rhialto 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# -------------------------------------------------------------------------
15# Define PKG_SUPPORTED_OPTIONS based on the current package and system. 15# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
16# ------------------------------------------------------------------------- 16# -------------------------------------------------------------------------
17 17
18# Note: It is a good practice that all PKG_SUPPORTED_OPTIONS are 18# Note: It is a good practice that all PKG_SUPPORTED_OPTIONS are
19# enabled or disabled with --enable-option or --disable-option. 19# enabled or disabled with --enable-option or --disable-option.
20# It is better to add missing libs via EXTRA_LIBS, when it is possible, 20# It is better to add missing libs via EXTRA_LIBS, when it is possible,
21# instead of patching the configure script in order to make the update of 21# instead of patching the configure script in order to make the update of
22# the packages easier. 22# the packages easier.
23 23
24# Options supported by both mplayer* or mencoder*. 24# Options supported by both mplayer* or mencoder*.
25 25
26PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug 26PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug
27PKG_SUPPORTED_OPTIONS+= dvdread dvdnav 27PKG_SUPPORTED_OPTIONS+= dvdread dvdnav libmpg123 opus
28.if ${OSS_TYPE} != "none" 28.if ${OSS_TYPE} != "none"
29PKG_SUPPORTED_OPTIONS+= oss 29PKG_SUPPORTED_OPTIONS+= oss
30.endif 30.endif
31 31
32PKG_SUPPORTED_OPTIONS+= faad 32PKG_SUPPORTED_OPTIONS+= faad
33PKG_SUGGESTED_OPTIONS+= faad 33PKG_SUGGESTED_OPTIONS+= faad
34 34
35# Set options based on the specific package being built. 35# Set options based on the specific package being built.
36.if !empty(PKGNAME:M*mplayer*) 36.if !empty(PKGNAME:M*mplayer*)
37PKG_SUPPORTED_OPTIONS+= aalib caca esound ggi mplayer-menu nas pulseaudio sdl 37PKG_SUPPORTED_OPTIONS+= aalib caca esound ggi mplayer-menu nas pulseaudio sdl
38 38
39.if ${VDPAU_AVAILABLE} == "yes" 39.if ${VDPAU_AVAILABLE} == "yes"
40PKG_SUPPORTED_OPTIONS+= vdpau 40PKG_SUPPORTED_OPTIONS+= vdpau
@@ -73,27 +73,27 @@ PKG_SUPPORTED_OPTIONS+= mplayer-default- @@ -73,27 +73,27 @@ PKG_SUPPORTED_OPTIONS+= mplayer-default-
73PKG_SUPPORTED_OPTIONS+= mplayer-ssse3 73PKG_SUPPORTED_OPTIONS+= mplayer-ssse3
74.endif 74.endif
75.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ 75.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
76 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" 76 ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
77PKG_SUPPORTED_OPTIONS+= xvid 77PKG_SUPPORTED_OPTIONS+= xvid
78.endif 78.endif
79 79
80# ------------------------------------------------------------------------- 80# -------------------------------------------------------------------------
81# Define PKG_SUGGESTED_OPTIONS. 81# Define PKG_SUGGESTED_OPTIONS.
82# ------------------------------------------------------------------------- 82# -------------------------------------------------------------------------
83 83
84.for o in cdparanoia dv esound gif jpeg \ 84.for o in cdparanoia dv esound gif jpeg \
85 dvdread dvdnav \ 85 dvdread dvdnav \
86 lame mad mplayer-menu \ 86 lame libmpg123 mad mplayer-menu \
87 mplayer-default-cflags mplayer-runtime-cpudetection \ 87 mplayer-default-cflags mplayer-runtime-cpudetection \
88 nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau lirc 88 nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau lirc
89. if !empty(PKG_SUPPORTED_OPTIONS:M${o}) 89. if !empty(PKG_SUPPORTED_OPTIONS:M${o})
90PKG_SUGGESTED_OPTIONS+= ${o} 90PKG_SUGGESTED_OPTIONS+= ${o}
91. endif 91. endif
92.endfor 92.endfor
93PKG_SUGGESTED_OPTIONS.Linux+= vidix 93PKG_SUGGESTED_OPTIONS.Linux+= vidix
94 94
95# ------------------------------------------------------------------------- 95# -------------------------------------------------------------------------
96# Handle extra libraries (part 1) 96# Handle extra libraries (part 1)
97# ------------------------------------------------------------------------- 97# -------------------------------------------------------------------------
98EXTRA_LIBS= 98EXTRA_LIBS=
99 99
@@ -194,33 +194,47 @@ CONFIGURE_ARGS+= --disable-ggi @@ -194,33 +194,47 @@ CONFIGURE_ARGS+= --disable-ggi
194CONFIGURE_ARGS+= --enable-gif 194CONFIGURE_ARGS+= --enable-gif
195. include "../../graphics/giflib/buildlink3.mk" 195. include "../../graphics/giflib/buildlink3.mk"
196.else 196.else
197CONFIGURE_ARGS+= --disable-gif 197CONFIGURE_ARGS+= --disable-gif
198.endif 198.endif
199 199
200.if !empty(PKG_OPTIONS:Mjpeg) 200.if !empty(PKG_OPTIONS:Mjpeg)
201CONFIGURE_ARGS+= --enable-jpeg 201CONFIGURE_ARGS+= --enable-jpeg
202. include "../../mk/jpeg.buildlink3.mk" 202. include "../../mk/jpeg.buildlink3.mk"
203.else 203.else
204CONFIGURE_ARGS+= --disable-jpeg 204CONFIGURE_ARGS+= --disable-jpeg
205.endif 205.endif
206 206
 207.if !empty(PKG_OPTIONS:Mlibmpg123)
 208# no --enable-mpg123: configure forgets to add -lmpg123.
 209. include "../../audio/mpg123/buildlink3.mk"
 210.else
 211CONFIGURE_ARGS+= --disable-mpg123
 212.endif
 213
207.if !empty(PKG_OPTIONS:Mlame) 214.if !empty(PKG_OPTIONS:Mlame)
208CONFIGURE_ARGS+= --enable-mp3lame 215CONFIGURE_ARGS+= --enable-mp3lame
209. include "../../audio/lame/buildlink3.mk" 216. include "../../audio/lame/buildlink3.mk"
210.else 217.else
211CONFIGURE_ARGS+= --disable-mp3lame 218CONFIGURE_ARGS+= --disable-mp3lame
212.endif 219.endif
213 220
 221.if !empty(PKG_OPTIONS:Mopus)
 222CONFIGURE_ARGS+= --enable-libopus
 223. include "../../audio/libopus/buildlink3.mk"
 224.else
 225CONFIGURE_ARGS+= --disable-opus
 226.endif
 227
214.if !empty(PKG_OPTIONS:Mmad) 228.if !empty(PKG_OPTIONS:Mmad)
215CONFIGURE_ARGS+= --enable-mad 229CONFIGURE_ARGS+= --enable-mad
216. include "../../audio/libmad/buildlink3.mk" 230. include "../../audio/libmad/buildlink3.mk"
217.else 231.else
218CONFIGURE_ARGS+= --disable-mad 232CONFIGURE_ARGS+= --disable-mad
219.endif 233.endif
220 234
221.if !empty(PKG_OPTIONS:Mmlib) 235.if !empty(PKG_OPTIONS:Mmlib)
222CONFIGURE_ARGS+= --enable-mlib 236CONFIGURE_ARGS+= --enable-mlib
223.else 237.else
224CONFIGURE_ARGS+= --disable-mlib 238CONFIGURE_ARGS+= --disable-mlib
225.endif 239.endif
226 240