[pkgsrc/trunk]: pkgsrc/multimedia Make Matroska support optional, enabled by ...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/380ed501abda
branches:  trunk
changeset: 472418:380ed501abda
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Apr 10 12:23:55 2004 +0000

description:
Make Matroska support optional, enabled by default.  Per request by veego@

mencoder:
- ride the cdparanoia-related PKGREVISION++
- remove superfluous --disable-nas, already pulled in from Makefile.common

diffstat:

 multimedia/mencoder/Makefile              |  3 +--
 multimedia/mplayer-share/Makefile.common  |  5 +++--
 multimedia/mplayer-share/Makefile.depends |  3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 135da2a45fe2 -r 380ed501abda multimedia/mencoder/Makefile
--- a/multimedia/mencoder/Makefile      Sat Apr 10 12:16:12 2004 +0000
+++ b/multimedia/mencoder/Makefile      Sat Apr 10 12:23:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/10 12:16:12 salo Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/10 12:23:55 salo Exp $
 #
 
 PKGNAME=       mencoder-${MPLAYER_PKG_VERSION}
@@ -8,7 +8,6 @@
 .include "../../multimedia/mplayer-share/Makefile.common"
 
 USE_BUILDLINK3=                YES
-CONFIGURE_ARGS+=       --disable-nas
 CONFIGURE_ARGS+=       --confdir=${PREFIX}/share/mplayer
 
 ALL_TARGET=    mencoder
diff -r 135da2a45fe2 -r 380ed501abda multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Sat Apr 10 12:16:12 2004 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Sat Apr 10 12:23:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/04/10 12:16:12 salo Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/04/10 12:23:55 salo Exp $
 #
 
 MPLAYER_DIST_VERSION=  1.0pre3
@@ -70,6 +70,7 @@
 # MPLAYER_DISABLE_DRIVERS is explained.
 MPLAYER_DRIVERS=       arts            audio/arts \
                        esd             audio/esound \
+                       matroska        multimedia/libmatroska \
                        nas             audio/nas \
                        sdl             devel/SDL
 
@@ -79,7 +80,7 @@
 .endif
 
 .if defined(PKGNAME) && !empty(PKGNAME:M*encoder*)
-MPLAYER_DISABLE_DRIVERS=arts esd nas sdl
+MPLAYER_DISABLE_DRIVERS=arts esd matroska nas sdl
 .else
 BUILD_DEFS+=           MPLAYER_DISABLE_DRIVERS
 .endif
diff -r 135da2a45fe2 -r 380ed501abda multimedia/mplayer-share/Makefile.depends
--- a/multimedia/mplayer-share/Makefile.depends Sat Apr 10 12:16:12 2004 +0000
+++ b/multimedia/mplayer-share/Makefile.depends Sat Apr 10 12:23:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.6 2004/04/07 12:57:58 salo Exp $
+# $NetBSD: Makefile.depends,v 1.7 2004/04/10 12:23:55 salo Exp $
 #
 
 DEPENDS+=      mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
@@ -36,7 +36,6 @@
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 
 .if defined(USE_OSS)