Update to 0.4.1

5 files changed, 20 insertions, 119 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index b11bb2c3d377..677aa0e9a566 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTVERSION=	0.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,6 +27,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-alsa \
+		--disable-cdrom \
 		--disable-mjpegtools \
 		--disable-qcam \
 		--disable-v4l
@@ -37,6 +37,7 @@ CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_TARGET=
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LOCALBASE="${LOCALBASE}"
 
@@ -54,8 +55,7 @@ post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
 # do not prefix binary names with anything
 	@${REINPLACE_CMD} -E -e \
-		's|^#define.*LRINT.*$$||; \
-		s|(@program_transform_name@),[^,]+,|\1,s/$$$$//,|' \
+		's|^#define.*LRINT.*$$||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # use proper dir
 	@${REINPLACE_CMD} -E -e \
@@ -66,9 +66,12 @@ post-patch:
 		's|-@VERSION@||' \
 		${WRKSRC}/gstreamer-libs.pc.in
 # remove version number from include dir name
+# respect CFLAGS
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
-		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|'
+		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \
+		s,-O(2|3),,; \
+		s|-mcpu=i486||'
 # gconf is not working in this release
 	@${REINPLACE_CMD} -E -e \
 		's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \
@@ -89,6 +92,10 @@ post-patch:
 		's|malloc.h|stdlib.h|; \
 		s|stdint.h|inttypes.h|'
 
+post-install:
+# register plugins
+	@${LOCALBASE}/bin/gst-register 2>/dev/null
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+= \
@@ -138,9 +145,8 @@ WITH_AVIFILE=yes
 .endif
 
 # esound
-.if exists(${LOCALBASE}/lib/libesd.a)
-USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
+.if (${HAVE_GNOME:Mesound}!="")
+WITH_ESOUND=yes
 .endif
 
 # flac
@@ -265,13 +271,12 @@ PLIST_SUB+=	AVIFILE=""
 .endif
 
 # esound
-.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
+.ifndef(WITH_ESOUND)
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-esdtest
 PLIST_SUB+=	ESOUND="@comment "
 .else
 USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
 CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
 			--with-esd-exec-prefix=${LOCALBASE}
 PLIST_SUB+=	ESOUND=""
@@ -468,7 +473,7 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
 .endif
-.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
+.ifndef(WITH_ESOUND)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
 .endif
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 1f3233ae1353..fd0fc2e3d6e9 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.4.0.tar.bz2) = 06c7252240e0779d58ec962b539b6ae6
+MD5 (gst-plugins-0.4.1.tar.bz2) = 9b190733771be21bf8bf18971a652955
diff --git a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacdec.c b/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacdec.c
deleted file mode 100644
index 37a11fd7d5e3..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacdec.c
+++ /dev/null
@@ -1,83 +0,0 @@
---- ext/flac/gstflacdec.c.orig	Thu Jul 11 21:35:29 2002
-+++ ext/flac/gstflacdec.c	Thu Jul 11 21:44:42 2002
-@@ -74,10 +74,10 @@
- 							 void *client_data);
- static FLAC__StreamDecoderWriteStatus 	
- 			gst_flacdec_write 		(const FLAC__SeekableStreamDecoder *decoder, 
--							 const FLAC__Frame *frame, const FLAC__int32 *buffer[], 
-+							 const FLAC__Frame *frame, const FLAC__int32 * const buffer[],
- 							 void *client_data);
- static void 		gst_flacdec_metadata_callback 	(const FLAC__SeekableStreamDecoder *decoder, 
--							 const FLAC__StreamMetaData *metadata, 
-+							 const FLAC__StreamMetadata *metadata,
- 							 void *client_data);
- static void 		gst_flacdec_error_callback 	(const FLAC__SeekableStreamDecoder *decoder, 
- 							 FLAC__StreamDecoderErrorStatus status, 
-@@ -152,7 +152,7 @@
- 
- static void 
- gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder *decoder,
--			       const FLAC__StreamMetaData *metadata, void *client_data)
-+			       const FLAC__StreamMetadata *metadata, void *client_data)
- {
-   FlacDec *flacdec;
- 
-@@ -171,13 +171,13 @@
-   flacdec = GST_FLACDEC (client_data);
- 
-   switch (status) {
--    case FLAC__STREAM_DECODER_ERROR_LOST_SYNC:
-+    case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC:
-       error = "lost sync";
-       break;
--    case FLAC__STREAM_DECODER_ERROR_BAD_HEADER:
-+    case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER:
-       error = "bad header";
-       break;
--    case FLAC__STREAM_DECODER_ERROR_FRAME_CRC_MISMATCH:
-+    case FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH:
-       error = "CRC mismatch";
-       break;
-     default:
-@@ -271,6 +271,7 @@
-           GST_DEBUG (0, "eos");
-           flacdec->eos = TRUE; 
-           if (avail == 0) {
-+	    gst_event_free (event);
-             return 0;
-           }
-           break;
-@@ -301,7 +302,7 @@
- 
- static FLAC__StreamDecoderWriteStatus
- gst_flacdec_write (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, 
--		   const FLAC__int32 *buffer[], void *client_data)
-+		   const FLAC__int32 * const buffer[], void *client_data)
- {
-   FlacDec *flacdec;
-   GstBuffer *outbuf;
-@@ -383,14 +384,14 @@
-   }
-   else {
-     g_warning ("flacdec: invalid depth %d found\n", depth);
--    return FLAC__STREAM_DECODER_WRITE_ABORT;
-+    return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-   }
- 
-   flacdec->total_samples += samples;
- 
-   gst_pad_push (flacdec->srcpad, outbuf);
- 
--  return FLAC__STREAM_DECODER_WRITE_CONTINUE;
-+  return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
- 
- static void 
-@@ -554,6 +555,7 @@
-       res = FALSE;
-       break;
-   }
-+  gst_event_free (event);
-   return res;
- }
- 
diff --git a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacenc.c b/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacenc.c
deleted file mode 100644
index f661efeb1f0a..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacenc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/flac/gstflacenc.c.orig	Thu Jul 11 21:17:58 2002
-+++ ext/flac/gstflacenc.c	Thu Jul 11 21:33:45 2002
-@@ -56,7 +56,7 @@
- static FLAC__StreamEncoderWriteStatus 
- 		gst_flacenc_write_callback 	(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, 
- 			    			 unsigned samples, unsigned current_frame, void *client_data);
--static void 	gst_flacenc_metadata_callback 	(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetaData *metadata, 
-+static void	gst_flacenc_metadata_callback	(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata,
- 						 void *client_data);
- 
- static GstElementClass *parent_class = NULL;
-@@ -170,7 +170,7 @@
- }
- 
- static void 
--gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetaData *metadata, void *client_data)
-+gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
- {
-   GstEvent *event;
-   FlacEnc *flacenc;
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index e26cd73dfa9b..6f8087569b59 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -12,14 +12,12 @@ lib/gst/libgstadder.so
 lib/gst/libgstalaw.so
 %%ARTS%%lib/gst/libgstartsdsink.so
 lib/gst/libgstaudio.so
-%%LIBAUDIOFILE%%lib/gst/libgstaudiofile.so
 lib/gst/libgstaudioscale.so
 lib/gst/libgstauparse.so
 %%AVIFILE%%lib/gst/libgstavidemux.so
 %%AVIFILE%%lib/gst/libgstavimux.so
 lib/gst/libgstcdxaparse.so
 lib/gst/libgstchart.so
-lib/gst/libgstcolorspace.so
 lib/gst/libgstcutter.so
 lib/gst/libgstdeinterlace.so
 %%LIBDVDREAD%%lib/gst/libgstdvdreadsrc.so
@@ -42,7 +40,6 @@ lib/gst/libgstlevel.so
 %%LIBMAD%%lib/gst/libgstmad.so
 lib/gst/libgstmedian.so
 %%LIBMIKMOD%%lib/gst/libgstmikmod.so
-lib/gst/libgstmodplug.so
 lib/gst/libgstmono2stereo.so
 lib/gst/libgstmonoscope.so
 lib/gst/libgstmp1videoparse.so
@@ -79,14 +76,16 @@ lib/gst/libgststereo2mono.so
 lib/gst/libgststereosplit.so
 lib/gst/libgstsynaesthesia.so
 lib/gst/libgstudp.so
+lib/gst/libgstvideocrop.so
 lib/gst/libgstvideoscale.so
+lib/gst/libgstvideotestsrc.so
 lib/gst/libgstvolenv.so
 lib/gst/libgstvolume.so
 %%VORBIS%%lib/gst/libgstvorbis.so
 lib/gst/libgstvumeter.so
 lib/gst/libgstwavparse.so
-%%AVIFILE%%lib/gst/libgstwincodec.so
 lib/gst/libgsty4menc.so
+lib/gst/libmixmatrix.so
 libdata/pkgconfig/gstreamer-libs.pc
 @dirrm include/gst-plugins/gst/riff
 @dirrm include/gst-plugins/gst/resample