diff options
| author | abs <abs@pkgsrc.org> | 2007-09-06 18:11:57 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2007-09-06 18:11:57 +0000 |
| commit | fb13828b46c35a8877f0387b05286c29d90915a5 (patch) | |
| tree | 1aa9a220c55c7d8c9a1cfb3c075d70c3cbde1932 /multimedia | |
| parent | 1c5240033649d37669a8b6f5a8b99c71b8fe0c6f (diff) | |
| download | pkgsrc-fb13828b46c35a8877f0387b05286c29d90915a5.tar.gz | |
Update mplayer to 1.0rc9nb8 and gmplayer to 1.0rc9nb3
sync mplayer and gmplayer buildlink includes. Add the following:
- to gmplayer to match mplayer: libXinerama libXv
- to gmplayer only: libdvdnav
- to both: libXvMC libXxf86dga libXxf86vm
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gmplayer/Makefile | 15 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 17 |
2 files changed, 21 insertions, 11 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index f0c0436f3a2..5a3ab148e0f 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2007/06/07 13:19:54 tron Exp $ +# $NetBSD: Makefile,v 1.61 2007/09/06 18:11:57 abs Exp $ # # NOTE: if you are updating both mplayer and gmplayer, you must ensure @@ -9,7 +9,7 @@ # PKGNAME= gmplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 BROKEN_IN= pkgsrc-2006Q4 @@ -79,9 +79,16 @@ do-install: ${RM} -rf ${PREFIX}/share/mplayer/Skin/Blue/.svn ${RM} -rf ${PREFIX}/share/mplayer/Skin/Blue/icons/.svn -.include "../../multimedia/mplayer-share/Makefile.depends" - +.include "../../multimedia/libdvdnav/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" +.include "../../x11/libXvMC/buildlink3.mk" +.include "../../x11/libXxf86dga/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" + +.include "../../multimedia/mplayer-share/Makefile.depends" + .include "../../mk/bsd.pkg.mk" .include "../../multimedia/mplayer-share/Makefile.cflags" diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 56094f14a74..92ec1a12ac8 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2007/06/08 10:07:17 tron Exp $ +# $NetBSD: Makefile,v 1.44 2007/09/06 18:11:57 abs Exp $ PKGNAME= mplayer-${MPLAYER_PKG_VERSION} -PKGREVISION= 7 +PKGREVISION= 8 COMMENT= Software-only MPEG-1/2/4 video decoder @@ -19,15 +19,18 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/X11R6/include INSTALLATION_DIRS+= bin -.include "../../x11/libXinerama/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/libXv/buildlink3.mk" - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin +.include "../../x11/libXt/buildlink3.mk" + +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" +.include "../../x11/libXvMC/buildlink3.mk" +.include "../../x11/libXxf86dga/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" + .include "../../multimedia/mplayer-share/Makefile.depends" .include "../../mk/bsd.pkg.mk" - .include "../../multimedia/mplayer-share/Makefile.cflags" |