diff options
| author | drochner <drochner@pkgsrc.org> | 2006-12-07 14:09:02 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-12-07 14:09:02 +0000 |
| commit | a828eb4049831875969080de9277f5ebe1d8ab06 (patch) | |
| tree | 7672297114de4ce0dc4ae14e19c41eb322ae6d05 /multimedia | |
| parent | 00bc20f4e8dd289717680765ba60a04d041f7671 (diff) | |
| download | pkgsrc-a828eb4049831875969080de9277f5ebe1d8ab06.tar.gz | |
Move fontconfig/buildlink3.mk to a common makefile fragment, so that
mencoder gets it too. Without that, fontconfig vertions from pkg and
X11R6 get mixed which is bad. Bump mencoder's PKGREVISION.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mencoder/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/Makefile.depends | 3 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 16caef49cf4..ec8d9ff2985 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2006/10/31 22:33:29 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2006/12/07 14:09:02 drochner Exp $ PKGNAME= mencoder-${MPLAYER_PKG_VERSION} +PKGREVISION= 1 + COMMENT= Simple movie encoder for MPlayer-playable movies .include "../../multimedia/mplayer-share/Makefile.common" diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends index 815d8a5d186..1c124181298 100644 --- a/multimedia/mplayer-share/Makefile.depends +++ b/multimedia/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.16 2006/11/06 14:06:17 joerg Exp $ +# $NetBSD: Makefile.depends,v 1.17 2006/12/07 14:09:03 drochner Exp $ # DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share @@ -9,5 +9,6 @@ GCC_REQD+= 2.95.3 . include "../../devel/binutils/buildlink3.mk" .endif .include "../../converters/libiconv/buildlink3.mk" +.include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 49c00afbbb6..79be491e9c9 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/11/30 15:00:45 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2006/12/07 14:09:03 drochner Exp $ PKGNAME= mplayer-${MPLAYER_PKG_VERSION} PKGREVISION= 1 @@ -19,8 +19,6 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/X11R6/include INSTALLATION_DIRS+= bin -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" |