CVS commit: pkgsrc/multimedia

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Mar 24 20:38:25 UTC 2019

Modified Files:
        pkgsrc/multimedia/gmplayer: Makefile
        pkgsrc/multimedia/mencoder: Makefile
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 pkgsrc/multimedia/gmplayer/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/multimedia/mplayer/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/multimedia/mplayer-share/options.mk

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.141 pkgsrc/multimedia/gmplayer/Makefile:1.142
--- pkgsrc/multimedia/gmplayer/Makefile:1.141   Sat Jan 12 15:26:42 2019
+++ pkgsrc/multimedia/gmplayer/Makefile Sun Mar 24 20:38:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2019/01/12 15:26:42 tsutsui Exp $
+# $NetBSD: Makefile,v 1.142 2019/03/24 20:38:25 rhialto 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=   10
+PKGREVISION=   11
 
 SKIN_SITES=    http://www1.mplayerhq.hu/MPlayer/skins/         \
                http://www2.mplayerhq.hu/MPlayer/skins/         \

Index: pkgsrc/multimedia/mencoder/Makefile
diff -u pkgsrc/multimedia/mencoder/Makefile:1.69 pkgsrc/multimedia/mencoder/Makefile:1.70
--- pkgsrc/multimedia/mencoder/Makefile:1.69    Sat Jan 12 15:26:42 2019
+++ pkgsrc/multimedia/mencoder/Makefile Sun Mar 24 20:38:25 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2019/01/12 15:26:42 tsutsui Exp $
+# $NetBSD: Makefile,v 1.70 2019/03/24 20:38:25 rhialto Exp $
 
 PKGNAME=       mencoder-${MPLAYER_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       Simple movie encoder for MPlayer-playable movies
 

Index: pkgsrc/multimedia/mplayer/Makefile
diff -u pkgsrc/multimedia/mplayer/Makefile:1.102 pkgsrc/multimedia/mplayer/Makefile:1.103
--- pkgsrc/multimedia/mplayer/Makefile:1.102    Sat Jan 12 15:26:42 2019
+++ pkgsrc/multimedia/mplayer/Makefile  Sun Mar 24 20:38:25 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2019/01/12 15:26:42 tsutsui Exp $
+# $NetBSD: Makefile,v 1.103 2019/03/24 20:38:25 rhialto Exp $
 
 PKGNAME=       mplayer-${MPLAYER_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       Fast, cross-platform movie player
 

Index: pkgsrc/multimedia/mplayer-share/options.mk
diff -u pkgsrc/multimedia/mplayer-share/options.mk:1.60 pkgsrc/multimedia/mplayer-share/options.mk:1.61
--- pkgsrc/multimedia/mplayer-share/options.mk:1.60     Wed Apr  4 12:26:24 2018
+++ pkgsrc/multimedia/mplayer-share/options.mk  Sun Mar 24 20:38:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.60 2018/04/04 12:26:24 triaxx Exp $
+# $NetBSD: options.mk,v 1.61 2019/03/24 20:38:25 rhialto Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -24,7 +24,7 @@ PKG_OPTIONS_VAR=      PKG_OPTIONS.${PKGNAME:C
 # Options supported by both mplayer* or mencoder*.
 
 PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv png theora vorbis x264 debug
-PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
+PKG_SUPPORTED_OPTIONS+= dvdread dvdnav libmpg123 opus
 .if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=        oss
 .endif
@@ -83,7 +83,7 @@ PKG_SUPPORTED_OPTIONS+= xvid
 
 .for o in cdparanoia dv esound gif jpeg \
            dvdread dvdnav \
-           lame mad mplayer-menu \
+           lame libmpg123 mad mplayer-menu \
            mplayer-default-cflags mplayer-runtime-cpudetection \
            nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau lirc
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${o})
@@ -204,6 +204,13 @@ CONFIGURE_ARGS+=   --enable-jpeg
 CONFIGURE_ARGS+=       --disable-jpeg
 .endif
 
+.if !empty(PKG_OPTIONS:Mlibmpg123)
+# no --enable-mpg123: configure forgets to add -lmpg123.
+.  include "../../audio/mpg123/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-mpg123
+.endif
+
 .if !empty(PKG_OPTIONS:Mlame)
 CONFIGURE_ARGS+=       --enable-mp3lame
 .  include "../../audio/lame/buildlink3.mk"
@@ -211,6 +218,13 @@ CONFIGURE_ARGS+=   --enable-mp3lame
 CONFIGURE_ARGS+=       --disable-mp3lame
 .endif
 
+.if !empty(PKG_OPTIONS:Mopus)
+CONFIGURE_ARGS+=       --enable-libopus
+.  include "../../audio/libopus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-opus
+.endif
+
 .if !empty(PKG_OPTIONS:Mmad)
 CONFIGURE_ARGS+=       --enable-mad
 .  include "../../audio/libmad/buildlink3.mk"