summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-11-30 15:00:45 +0000
committerjoerg <joerg@pkgsrc.org>2006-11-30 15:00:45 +0000
commitf489170f57c51b20f65112e9b88b00ab6917291a (patch)
treea99f1be7d0802836dc74815480d971ac56bcd2d5 /multimedia
parent7d7a41bafda75e79a2670e1aabdfef0ed3144fd5 (diff)
downloadpkgsrc-f489170f57c51b20f65112e9b88b00ab6917291a.tar.gz
Move extra X11 includes to Makefile.common and bump revision of mplayer.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gmplayer/Makefile5
-rw-r--r--multimedia/mplayer-share/Makefile.common3
-rw-r--r--multimedia/mplayer/Makefile3
3 files changed, 6 insertions, 5 deletions
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index ca4c919d806..7b0b7be60b3 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/11/29 15:52:33 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2006/11/30 15:00:45 joerg Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -57,8 +57,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}-20060123
USE_TOOLS+= gtar pkg-config
CONFIGURE_ARGS+= --enable-gui --disable-mencoder \
- --confdir=${PREFIX}/share/mplayer \
- --with-extraincdir=${X11BASE}/include
+ --confdir=${PREFIX}/share/mplayer
INSTALLATION_DIRS= bin
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 45db4382393..90366cb62ed 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2006/11/06 14:06:17 joerg Exp $
+# $NetBSD: Makefile.common,v 1.35 2006/11/30 15:00:45 joerg Exp $
MPLAYER_DIST_VERSION= 1.0rc1
@@ -44,6 +44,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \
--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
--with-extralibdir="${LOCALBASE}/lib" \
--with-x11libdir="${X11BASE}/lib" \
+ --with-extraincdir=${X11BASE}/include \
--disable-mpdvdkit \
--disable-smb
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 8567a437304..49c00afbbb6 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2006/11/06 14:06:17 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/30 15:00:45 joerg Exp $
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION= 1
COMMENT= Software-only MPEG-1/2/4 video decoder