summaryrefslogtreecommitdiff
path: root/multimedia/mplayer-share
diff options
context:
space:
mode:
authorsalo <salo>2004-04-10 12:23:55 +0000
committersalo <salo>2004-04-10 12:23:55 +0000
commit841b9e7cc5df0b176ad1ec195fa20f1cb5d9ebf8 (patch)
tree8f2860a90a19b03330f570cf7435483afd0848b6 /multimedia/mplayer-share
parentb132e0f0bc7d5bcc88dbbb2c74dc89d762551103 (diff)
downloadpkgsrc-841b9e7cc5df0b176ad1ec195fa20f1cb5d9ebf8.tar.gz
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 (limited to 'multimedia/mplayer-share')
-rw-r--r--multimedia/mplayer-share/Makefile.common5
-rw-r--r--multimedia/mplayer-share/Makefile.depends3
2 files changed, 4 insertions, 4 deletions
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 81c05232773..b499067811a 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -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 @@ CONFIGURE_ARGS+= --disable-mlib
# 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 @@ MPLAYER_DISABLE_DRIVERS= arts
.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 --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends
index 583b6c7f321..d3df21b7673 100644
--- a/multimedia/mplayer-share/Makefile.depends
+++ b/multimedia/mplayer-share/Makefile.depends
@@ -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 @@ USE_X11= YES
.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)