- LOCALBASE it

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6605 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 201 insertions, 15 deletions

diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 5789ccb98..a07dbadcb 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -7,7 +7,7 @@
 # Date:		4 Oct 2004
 #
 # $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.18 2006/05/16 01:43:00 ahze Exp $
-#    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.34 2006/07/10 22:39:42 ahze Exp $
+#    $MCom: ports/Mk/bsd.gstreamer.mk,v 1.35 2006/07/12 10:25:15 ahze Exp $
 
 .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
 
@@ -49,8 +49,8 @@ Gstreamer_Pre_Include=		bsd.gstreamer.mk
 
 GSTREAMER_PORT=		${PORTSDIR}/multimedia/gstreamer-plugins
 GSTREAMER80_PORT=	${GSTREAMER_PORT}80
-_GST_LIB_BASE=		${X11BASE}/lib/gstreamer-${GST_VERSION}
-_GST80_LIB_BASE=	${X11BASE}/lib/gstreamer-${GST80_VERSION}
+_GST_LIB_BASE=		${LOCALBASE}/lib/gstreamer-${GST_VERSION}
+_GST80_LIB_BASE=	${LOCALBASE}/lib/gstreamer-${GST80_VERSION}
 GST_VERSION=		0.10
 GST_MINOR_VERSION=	.0
 GST80_VERSION=		0.8
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
new file mode 100644
index 000000000..aae062780
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	gstreamer ffmpeg
+# Date created:		Thu Feb 26 20:10:39 CET 2004
+# Whom:			Koop Mast <kwm@rainbow-runner.nl>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTNAME=	gstreamer
+PORTVERSION=	0.10.1
+CATEGORIES=	multimedia
+MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-ffmpeg/
+PKGNAMESUFFIX=	-ffmpeg
+DISTNAME=	gst-ffmpeg-${PORTVERSION}
+
+MAINTAINER=	multimedia@FreeBSD.org
+COMMENT=	GStreamer plug-in for manipulating MPEG video streams
+
+USE_XLIB=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget
+USE_GSTREAMER=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		CFLAGS="${CFLAGS} -fno-force-addr" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+PLIST_SUB=	\
+		VERSION="${GST_VERSION}"
+WITHOUT_CPU_CFLAGS=	yes
+
+PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
+GST_VERSION=${PORTVERSION:C/..$//}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|make|${GMAKE}|' \
+		${WRKSRC}/gst-libs/ext/Makefile.in
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-ffmpeg/distinfo b/multimedia/gstreamer-ffmpeg/distinfo
new file mode 100644
index 000000000..0dd279d01
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/distinfo
@@ -0,0 +1,3 @@
+MD5 (gst-ffmpeg-0.10.1.tar.bz2) = e21aef9a84d67dea9a68c1379781f763
+SHA256 (gst-ffmpeg-0.10.1.tar.bz2) = a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607
+SIZE (gst-ffmpeg-0.10.1.tar.bz2) = 2246682
diff --git a/multimedia/gstreamer-ffmpeg/files/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c b/multimedia/gstreamer-ffmpeg/files/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c
new file mode 100644
index 000000000..1c1fc628e
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/files/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c
@@ -0,0 +1,12 @@
+--- gst-libs/ext/ffmpeg/libavformat/nut.c.orig	Wed Apr 14 20:38:02 2004
++++ gst-libs/ext/ffmpeg/libavformat/nut.c	Sun Jul 11 18:14:19 2004
+@@ -59,6 +59,9 @@
+ #define FLAG_FULL_PTS        4
+ #define FLAG_KEY_FRAME      32
+ 
++// UINT64_MAX isn't defined on FreeBSD 4.x borrow it from 5.x
++#define UINT64_MAX      0xffffffffffffffffULL
++
+ typedef struct {
+     uint8_t flags;
+     uint8_t stream_id_plus1;
diff --git a/multimedia/gstreamer-ffmpeg/files/patch-configure b/multimedia/gstreamer-ffmpeg/files/patch-configure
new file mode 100644
index 000000000..9bfbd28d1
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Thu Feb 26 19:28:07 2004
++++ configure	Thu Feb 26 21:10:52 2004
+@@ -19472,7 +19473,7 @@
+ echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6
+ 
+   save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -Werror"
++  CFLAGS="$CFLAGS"
+ 
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -19513,7 +19514,7 @@
+   CFLAGS="$save_CFLAGS"
+ 
+   if test "X$flag_ok" = Xyes ; then
+-    GST_ERROR="$GST_ERROR -Werror"
++    GST_ERROR="$GST_ERROR"
+     true
+   else
+     GST_ERROR="$GST_ERROR"
diff --git a/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_Makefile.in b/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_Makefile.in
new file mode 100644
index 000000000..ec9dfaf85
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/files/patch-ext_ffmpeg_Makefile.in
@@ -0,0 +1,11 @@
+--- ext/ffmpeg/Makefile.in.orig	Wed Mar  9 19:50:50 2005
++++ ext/ffmpeg/Makefile.in	Wed Mar  9 19:51:23 2005
+@@ -164,7 +164,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/multimedia/gstreamer-ffmpeg/pkg-descr b/multimedia/gstreamer-ffmpeg/pkg-descr
new file mode 100644
index 000000000..b8a091e35
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/pkg-descr
@@ -0,0 +1,5 @@
+The Gstreamer ffmpeg package provides mpeg support for Gstreamer.
+It includes codecs for most popular formats, and optimized
+colourspace conversion.
+
+WWW: http://gstreamer.freedesktop.org/
diff --git a/multimedia/gstreamer-ffmpeg/pkg-plist b/multimedia/gstreamer-ffmpeg/pkg-plist
new file mode 100644
index 000000000..2f12c2978
--- /dev/null
+++ b/multimedia/gstreamer-ffmpeg/pkg-plist
@@ -0,0 +1,2 @@
+lib/gstreamer-%%VERSION%%/libgstffmpeg.la
+lib/gstreamer-%%VERSION%%/libgstffmpeg.so
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
new file mode 100644
index 000000000..d88bc5a11
--- /dev/null
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for:	gstreamer-plugins-core
+# Date created:		2004-11-15
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.14 2006/01/21 21:22:18 ahze Exp $
+
+PORTNAME=	gstreamer-plugins-core
+PORTVERSION=	0.10
+PORTREVISION=	6
+CATEGORIES=	multimedia audio
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	multimedia@FreeBSD.org
+COMMENT=	Core set of typical audio and video gstreamer-plugins
+
+NO_BUILD=	yes
+GST_DIR=	lib/gstreamer-${PORTVERSION}
+PLIST_FILES=	${GST_DIR}/.gstreamer-plugins-core.keep
+
+WANT_GSTREAMER=	yes
+
+.include <bsd.port.pre.mk>
+
+# Audio plugins
+USE_GSTREAMER+=	mad ogg vorbis
+
+# Graphics plugins
+USE_GSTREAMER+=	libpng
+
+# Misc plugins
+USE_GSTREAMER+=	pango
+
+# Multimedia plugins
+USE_GSTREAMER+=	ffmpeg good theora xvid
+
+.if !defined(WITHOUT_DVD)
+# Audio plugins
+USE_GSTREAMER+=	a52dec dvd dts
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " Disable DVD plugins by defining WITHOUT_DVD"
+	@${ECHO_MSG} ""
+
+do-install:
+	if [ ! -d ${PREFIX}/${GST_DIR} ]; then \
+		${MKDIR} ${PREFIX}/${GST_DIR} ; \
+	fi
+	${TOUCH} -f ${PREFIX}/${GST_DIR}/.gstreamer-plugins-core.keep
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins-core/pkg-descr b/multimedia/gstreamer-plugins-core/pkg-descr
new file mode 100644
index 000000000..90895a218
--- /dev/null
+++ b/multimedia/gstreamer-plugins-core/pkg-descr
@@ -0,0 +1,3 @@
+Meta-port to core "typical" gstreamer-plugins
+
+WWW:	http://gstreamer.net
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
new file mode 100644
index 000000000..c1825f1c5
--- /dev/null
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	gstreamer-plugins-gnonlin
+# Date created:		2006-04-25
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.2 2006/04/25 20:54:56 ahze Exp $
+
+PORTNAME=	gstreamer-plugins-gnonlin
+PORTVERSION=	0.10.4
+CATEGORIES=	multimedia
+MASTER_SITES=	http://gstreamer.freedesktop.org/src/gnonlin/
+DISTNAME=	gnonlin-${PORTVERSION}
+
+MAINTAINER=	multimedia@FreeBSD.org
+COMMENT=	Gstreamer lib for writing non-linear audio and video
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GSTREAMER=	yes
+
+PLIST_FILES=	lib/gstreamer-0.10/libgnl.a lib/gstreamer-0.10/libgnl.la \
+		lib/gstreamer-0.10/libgnl.so
+
+.include <bsd.port.mk>
diff --git a/multimedia/gstreamer-plugins-gnonlin/distinfo b/multimedia/gstreamer-plugins-gnonlin/distinfo
new file mode 100644
index 000000000..ff8ae97b9
--- /dev/null
+++ b/multimedia/gstreamer-plugins-gnonlin/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnonlin-0.10.4.tar.bz2) = 8649d8e5fe56e8b02f1c35bc0db7716d
+SHA256 (gnonlin-0.10.4.tar.bz2) = a388ab428fd52963cc0ea6204ed71a7382d293c039360135f21be12702255ce6
+SIZE (gnonlin-0.10.4.tar.bz2) = 346763
diff --git a/multimedia/gstreamer-plugins-gnonlin/pkg-descr b/multimedia/gstreamer-plugins-gnonlin/pkg-descr
new file mode 100644
index 000000000..d1db76f15
--- /dev/null
+++ b/multimedia/gstreamer-plugins-gnonlin/pkg-descr
@@ -0,0 +1,3 @@
+Gstreamer library for writing non-linear audio and video
+
+WWW: http://gstreamer.net
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 47cf8fa55..793757924 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD: ports/multimedia/gstreamer-plugins/Makefile,v 1.102 2006/06/09 20:24:02 ahze Exp $
-#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.93 2006/07/14 20:00:17 ahze Exp $
+#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.94 2006/07/15 04:06:27 ahze Exp $
 #
 
 PORTNAME=	gstreamer
@@ -46,7 +46,6 @@ SHLIB_VERSION=	1
 USE_GETTEXT=	yes
 VERSION=	${GST_VERSION}
 WANT_GSTREAMER=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME+=	gnomehack gnometarget pkgconfig ltverhack
@@ -129,10 +128,10 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 post-patch:
 	@${FIND} ${WRKSRC}/ext -name Makefile.in | \
 	${XARGS} -n 10 ${REINPLACE_CMD} -e \
-	's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
-	s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
-	s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
-	s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
+	's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+	s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+	s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+	s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
 	@${FIND} ${WRKSRC} -type f | \
 	${XARGS} -n 10 ${REINPLACE_CMD} -e \
 	's|malloc\.h|stdlib.h|; \
@@ -140,10 +139,10 @@ post-patch:
 	 s|%%VERSION%%|${VERSION}|'
 	 @${FIND} ${WRKSRC}/ext -name Makefile.in | \
 	 ${XARGS} -n 10 ${REINPLACE_CMD} -e \
-	 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
-	  s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
-	  s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
-	  s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
+	 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+	  s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+	  s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+	  s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
 	@${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
 		s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
 		${WRKSRC}/configure
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 5a2977e47..310b2bea2 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/gstreamer/Makefile,v 1.47 2006/07/14 19:13:39 ahze Exp $
+#    $MCom: ports/multimedia/gstreamer/Makefile,v 1.48 2006/07/14 20:00:16 ahze Exp $
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.9
@@ -17,7 +17,7 @@ COMMENT=	Development framework for creating media applications
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes