diff options
| author | salo <salo@pkgsrc.org> | 2004-04-10 12:23:55 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2004-04-10 12:23:55 +0000 |
| commit | e4dfbea9c0da614ad129b4a568266ad9f83c576b (patch) | |
| tree | 8f2860a90a19b03330f570cf7435483afd0848b6 /multimedia | |
| parent | 89b5657325fb5e7d423d66c2ec693350fbca1985 (diff) | |
| download | pkgsrc-e4dfbea9c0da614ad129b4a568266ad9f83c576b.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')
| -rw-r--r-- | multimedia/mencoder/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mplayer-share/Makefile.common | 5 | ||||
| -rw-r--r-- | multimedia/mplayer-share/Makefile.depends | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 114212ffd92..a88c2ffa05c 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -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 @@ COMMENT= Simple movie encoder for MPlayer-playable movies .include "../../multimedia/mplayer-share/Makefile.common" USE_BUILDLINK3= YES -CONFIGURE_ARGS+= --disable-nas CONFIGURE_ARGS+= --confdir=${PREFIX}/share/mplayer ALL_TARGET= mencoder 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) |