Update to 0.4.1

6 files changed, 23 insertions, 55 deletions

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 544466bc9f30..f644f9a04208 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,6 +22,7 @@ IGNORE=		Needs help fixing scheduling code under FreeBSD
 
 USE_BISON=	yes
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
@@ -30,18 +31,16 @@ CONFIGURE_ARGS= --disable-tests \
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_TARGET=
 INSTALLS_SHLIB=	yes
 
 MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
+	gst-feedback.1 gst-md5sum.1 \
 	gst-register.1 gst-xmllaunch.1
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 
 post-patch:
-# do not prefix binary names with anything
-	@${REINPLACE_CMD} -E -e \
-		's|(@program_transform_name@),[^,]+,|\1,s/$$$$//,|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # use proper dir
 	@${REINPLACE_CMD} -E -e \
 		's|^(pkgconfigdir).*$$|\1=${PREFIX}/libdata/pkgconfig|' \
@@ -65,4 +64,8 @@ post-configure:
 	@${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \
 		${WRKSRC}/gst/Makefile
 
+post-install:
+# register plugins
+	@${PREFIX}/bin/gst-register 2>/dev/null
+
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 0f73d067088e..ce93e698886e 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.4.0.tar.bz2) = 6dffb9d8f8e0c82989966f6fc7a7c94e
+MD5 (gstreamer-0.4.1.tar.bz2) = 3d0b97165b684e8939377ca74702ac0e
diff --git a/multimedia/gstreamer/files/patch-gst::gstthread.c b/multimedia/gstreamer/files/patch-gst::gstthread.c
deleted file mode 100644
index e6f33930cd3d..000000000000
--- a/multimedia/gstreamer/files/patch-gst::gstthread.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- gst/gstthread.c.orig	Wed Jul 10 15:22:00 2002
-+++ gst/gstthread.c	Wed Jul 10 15:22:52 2002
-@@ -147,7 +147,7 @@
-   thread->cond = g_cond_new ();
- 
-   thread->ppid = getpid ();
--  thread->thread_id = -1;
-+  thread->thread_id = (pthread_t) -1;
- }
- 
- static void
-@@ -276,8 +276,8 @@
-       if (pthread_attr_init (&thread->attr) != 0)
- 	g_warning ("pthread_attr_init returned an error !");
-       if (gst_scheduler_get_preferred_stack (GST_ELEMENT_SCHED (element), &thread->stack, &stacksize)) {
--        if (pthread_attr_setstack (&thread->attr, thread->stack, stacksize) != 0) {
--          g_warning ("pthread_attr_setstack failed");
-+        if (pthread_attr_setstacksize (&thread->attr, stacksize) != 0) {
-+          g_warning ("pthread_attr_setstacksize failed");
-           return GST_STATE_FAILURE;
-         }
- 	GST_DEBUG (GST_CAT_THREAD, "pthread attr set stack at %p of size %ld", 
diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in
index 19d00d8a9e23..fd554c27807f 100644
--- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in
+++ b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in
@@ -1,6 +1,6 @@
---- libs/ext/cothreads/tests/Makefile.in.orig	Wed Jul 10 15:44:45 2002
-+++ libs/ext/cothreads/tests/Makefile.in	Wed Jul 10 15:45:06 2002
-@@ -76,7 +76,7 @@
+--- libs/ext/cothreads/tests/Makefile.in.orig	Sat Sep 28 23:05:55 2002
++++ libs/ext/cothreads/tests/Makefile.in	Sat Sep 28 23:06:23 2002
+@@ -83,7 +83,7 @@
  GLIB_CFLAGS = @GLIB_CFLAGS@
  GLIB_LIBS = @GLIB_LIBS@
  GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::cothreads.c b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::cothreads.c
deleted file mode 100644
index a7ca2581f2b7..000000000000
--- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::cothreads.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libs/ext/cothreads/tests/cothreads.c.orig	Fri Jun 21 01:33:11 2002
-+++ libs/ext/cothreads/tests/cothreads.c	Mon Jul 15 18:11:38 2002
-@@ -79,10 +79,13 @@
-   printf ("0: creating the gthreads\n");
-   for (i=0; i<NGTHREADS; i++) {
-     pthreadnum[i] = i+1;
--    if (posix_memalign (&stack, MAIN_STACK_SIZE, MAIN_STACK_SIZE))
-+    stack = malloc (MAIN_STACK_SIZE * (1.0 + 1.0/16));
-+    if (!stack)
-       perror ("allocating pthread stack of size %d", MAIN_STACK_SIZE);
-+    stack = (void*)((int)stack &~ (int)(MAIN_STACK_SIZE / 16 - 1));
-+    stack += 1;
-     pthread_attr_init (&attr[i]);
--    if (!pthread_attr_setstack (&attr[i], stack, MAIN_STACK_SIZE))
-+    if (!pthread_attr_setstacksize (&attr[i], MAIN_STACK_SIZE))
-       perror ("setting stack size");
-     pthread_create (&thread[i], &attr[i], pthread, &pthreadnum[i]);
-   }
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index e1de17b4f5a6..09a207808a18 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -4,6 +4,7 @@ bin/gst-compprep
 bin/gst-feedback
 bin/gst-inspect
 bin/gst-launch
+bin/gst-md5sum
 bin/gst-register
 bin/gst-xmllaunch
 include/gstreamer/gst/bytestream/bytestream.h
@@ -16,10 +17,11 @@ include/gstreamer/gst/control/dplinearinterp.h
 include/gstreamer/gst/control/unitconvert.h
 include/gstreamer/gst/getbits/getbits.h
 include/gstreamer/gst/gst.h
+include/gstreamer/gst/gstatomic.h
 include/gstreamer/gst/gstautoplug.h
 include/gstreamer/gst/gstbin.h
 include/gstreamer/gst/gstbuffer.h
-include/gstreamer/gst/gstbufferpool.h
+include/gstreamer/gst/gstbufferpool-default.h
 include/gstreamer/gst/gstcaps.h
 include/gstreamer/gst/gstclock.h
 include/gstreamer/gst/gstconfig.h
@@ -33,6 +35,7 @@ include/gstreamer/gst/gstformat.h
 include/gstreamer/gst/gstinfo.h
 include/gstreamer/gst/gstlog.h
 include/gstreamer/gst/gstmarshal.h
+include/gstreamer/gst/gstmemchunk.h
 include/gstreamer/gst/gstobject.h
 include/gstreamer/gst/gstpad.h
 include/gstreamer/gst/gstparse.h
@@ -56,23 +59,25 @@ include/gstreamer/gst/gstxml.h
 include/gstreamer/gst/putbits/putbits.h
 lib/gst/libgstautoplugcache.so
 lib/gst/libgstautoplugger.so
-lib/gst/libgstbasicscheduler.so
+lib/gst/libgstbasicomegascheduler.so
+lib/gst/libgstbasicwingoscheduler.so
 lib/gst/libgstbytestream.so
-lib/gst/libgstcontrol.so
 lib/gst/libgstelements.so
-lib/gst/libgstfastbasicscheduler.so
-lib/gst/libgstfaststandardscheduler.so
+lib/gst/libgstfastomegascheduler.so
+lib/gst/libgstfastwingoscheduler.so
 lib/gst/libgstgetbits.so
+lib/gst/libgstoptomegascheduler.so
 lib/gst/libgstputbits.so
 lib/gst/libgstspider.so
-lib/gst/libgststandardscheduler.so
 lib/gst/libgststaticautoplug.so
 lib/gst/libgststaticautoplugrender.so
 lib/gst/libgsttypes.so
+lib/libgstcontrol.so
 lib/libgstreamer.a
 lib/libgstreamer.so
 lib/libgstreamer.so.0
 libdata/pkgconfig/gstreamer.pc
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @dirrm lib/gst
 @dirrm include/gstreamer/gst/putbits
 @dirrm include/gstreamer/gst/getbits