7 files changed, 87 insertions, 179 deletions

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index a0f1da4097c6..82317dd78aa5 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -3,15 +3,14 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/multimedia/gstreamer/Makefile,v 1.45 2006/04/28 11:44:33 ahze Exp $
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.8.11
-PORTREVISION=	2
+PORTVERSION=	0.10.5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://gstreamer.freedesktop.org/src/gstreamer/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${GST_VERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -24,43 +23,22 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack \
-		gnomeprefix \
-		glib20 \
-		libxml2
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnomeprefix glib20 libxml2 ltverhack
+USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
 		--disable-docs-build \
 		--disable-failing-tests
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-PLIST_SUB=	\
-		VERSION="${GST_VERSION}" \
-		SHLIB_VERSION="${SHLIB_VERSION}" \
-		PORTVERSION="${PORTVERSION}"
+PLIST_SUB=	VERSION="${GST_VERSION}"
 INSTALLS_SHLIB=	yes
+GST_VERSION=	0.10
 
-MAN1=	gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
-	gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
-	gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \
-	gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \
-	gst-xmllaunch-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1
-
-GST_VERSION=${PORTVERSION:C/...$//}
-
-# library minor number
-SHLIB_VERSION=	5
-
-.include <bsd.port.pre.mk>
-
-.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gst::cothreads.c
-.endif
-
-post-install:
-# register plugins
-	-@${PREFIX}/bin/gst-register-${GST_VERSION} \
-		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
+MAN1=	gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
+	gst-launch-${GST_VERSION}.1 \
+	gst-typefind-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1 \
+	gst-xmllaunch-${GST_VERSION}.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 2a24d9cb5c2e..111acca1cdef 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gstreamer-0.8.11.tar.bz2) = 3a251cf05b794ebac04e18f71e5b26eb
-SHA256 (gnome2/gstreamer-0.8.11.tar.bz2) = 29aaec0f345b614dfa8da97cef629d68f74b4523dd28cb0abc04352cf14e6064
-SIZE (gnome2/gstreamer-0.8.11.tar.bz2) = 1459651
+MD5 (gnome2/gstreamer-0.10.5.tar.bz2) = f088c1303f19f0423f35d699deed92e3
+SHA256 (gnome2/gstreamer-0.10.5.tar.bz2) = 1c055d04fc31ac5730a766743ece1402f93f967c8f815cd5c97112dfab8f4aa1
+SIZE (gnome2/gstreamer-0.10.5.tar.bz2) = 1620535
diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure
deleted file mode 100644
index 672c3d3170fe..000000000000
--- a/multimedia/gstreamer/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Fri Jun  4 18:19:18 2004
-+++ configure	Fri Jun  4 18:20:27 2004
-@@ -21877,7 +21877,7 @@
- 
- 
-   EXP_VAR=LOCALEDIR
--  FROM_VAR=$datadir/locale
-+  FROM_VAR=$prefix/share/locale
- 
-     prefix_save=$prefix
-   exec_prefix_save=$exec_prefix
-@@ -21981,7 +21981,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
- /* confdefs.h.  */
-@@ -22031,7 +22031,7 @@
-   CFLAGS="$save_CFLAGS"
- 
-   if test "X$flag_ok" = Xyes ; then
--    GST_ERROR_CFLAGS="$GST_ERROR_CFLAGS -Werror"
-+    GST_ERROR_CFLAGS="$GST_ERROR_CFLAGS"
-     true
-   else
- 
diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c
deleted file mode 100644
index a756de582f5e..000000000000
--- a/multimedia/gstreamer/files/patch-gst::cothreads.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gst/cothreads.c.orig	Mon Feb  2 06:56:53 2004
-+++ gst/cothreads.c	Fri Feb  6 13:05:26 2004
-@@ -42,6 +42,10 @@
- #include <ucontext.h>
- #endif
- 
-+#ifdef HAVE_MAKECONTEXT
-+#include <ucontext.h>
-+#endif
-+
- #ifndef MAP_ANONYMOUS
- #ifdef MAP_ANON
- /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */
diff --git a/multimedia/gstreamer/files/patch-gst__gstbin.c b/multimedia/gstreamer/files/patch-gst__gstbin.c
new file mode 100644
index 000000000000..edff58cedd14
--- /dev/null
+++ b/multimedia/gstreamer/files/patch-gst__gstbin.c
@@ -0,0 +1,11 @@
+--- gst/gstbin.c.orig	Tue Apr 18 21:12:49 2006
++++ gst/gstbin.c	Tue Apr 18 21:39:56 2006
+@@ -2406,7 +2406,7 @@
+ {
+   gint ret;
+ 
+-  if (G_TYPE_CHECK_INSTANCE_TYPE (element, GPOINTER_TO_INT (interface))) {
++  if (G_TYPE_CHECK_INSTANCE_TYPE (element, (GType)interface)) {
+     ret = 0;
+   } else {
+     /* we did not find the element, need to release the ref
diff --git a/multimedia/gstreamer/files/patch-gst_gstmemchunk.c b/multimedia/gstreamer/files/patch-gst_gstmemchunk.c
deleted file mode 100644
index 5a3a624cbb73..000000000000
--- a/multimedia/gstreamer/files/patch-gst_gstmemchunk.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst/gstmemchunk.c.orig	Wed Aug  4 15:31:41 2004
-+++ gst/gstmemchunk.c	Wed Aug  4 15:31:52 2004
-@@ -24,6 +24,7 @@
- #include "gstmemchunk.h"
- #include "gsttrashstack.h"
- #ifdef HAVE_VALGRIND
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <valgrind/valgrind.h>
- #endif
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 7a2d99b411c4..caaa89e4494a 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -1,140 +1,113 @@
-bin/gst-complete
-bin/gst-complete-%%VERSION%%
-bin/gst-compprep
-bin/gst-compprep-%%VERSION%%
 bin/gst-feedback
 bin/gst-feedback-%%VERSION%%
 bin/gst-inspect
 bin/gst-inspect-%%VERSION%%
 bin/gst-launch
 bin/gst-launch-%%VERSION%%
-bin/gst-md5sum
-bin/gst-md5sum-%%VERSION%%
-bin/gst-register
-bin/gst-register-%%VERSION%%
 bin/gst-typefind
 bin/gst-typefind-%%VERSION%%
 bin/gst-xmlinspect
 bin/gst-xmlinspect-%%VERSION%%
 bin/gst-xmllaunch
 bin/gst-xmllaunch-%%VERSION%%
-include/gstreamer-%%VERSION%%/gst/bytestream/adapter.h
-include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
-include/gstreamer-%%VERSION%%/gst/bytestream/filepad.h
-include/gstreamer-%%VERSION%%/gst/control/control.h
-include/gstreamer-%%VERSION%%/gst/control/dparam.h
-include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
-include/gstreamer-%%VERSION%%/gst/control/dparamcommon.h
-include/gstreamer-%%VERSION%%/gst/control/dparammanager.h
-include/gstreamer-%%VERSION%%/gst/control/dplinearinterp.h
-include/gstreamer-%%VERSION%%/gst/control/unitconvert.h
+include/gstreamer-%%VERSION%%/gst/base/gstadapter.h
+include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h
+include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h
+include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h
+include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h
+include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h
+include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
+include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h
 include/gstreamer-%%VERSION%%/gst/dataprotocol/dataprotocol.h
-include/gstreamer-%%VERSION%%/gst/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/glib-compat.h
 include/gstreamer-%%VERSION%%/gst/gst.h
-include/gstreamer-%%VERSION%%/gst/gstatomic.h
 include/gstreamer-%%VERSION%%/gst/gstbin.h
 include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbus.h
 include/gstreamer-%%VERSION%%/gst/gstcaps.h
 include/gstreamer-%%VERSION%%/gst/gstchildproxy.h
 include/gstreamer-%%VERSION%%/gst/gstclock.h
 include/gstreamer-%%VERSION%%/gst/gstcompat.h
 include/gstreamer-%%VERSION%%/gst/gstconfig.h
-include/gstreamer-%%VERSION%%/gst/gstcpu.h
-include/gstreamer-%%VERSION%%/gst/gstdata.h
 include/gstreamer-%%VERSION%%/gst/gstelement.h
+include/gstreamer-%%VERSION%%/gst/gstelementfactory.h
 include/gstreamer-%%VERSION%%/gst/gstenumtypes.h
 include/gstreamer-%%VERSION%%/gst/gsterror.h
 include/gstreamer-%%VERSION%%/gst/gstevent.h
 include/gstreamer-%%VERSION%%/gst/gstfilter.h
 include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstghostpad.h
 include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstindexfactory.h
 include/gstreamer-%%VERSION%%/gst/gstinfo.h
 include/gstreamer-%%VERSION%%/gst/gstinterface.h
+include/gstreamer-%%VERSION%%/gst/gstiterator.h
 include/gstreamer-%%VERSION%%/gst/gstmacros.h
 include/gstreamer-%%VERSION%%/gst/gstmarshal.h
-include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstmessage.h
+include/gstreamer-%%VERSION%%/gst/gstminiobject.h
 include/gstreamer-%%VERSION%%/gst/gstobject.h
 include/gstreamer-%%VERSION%%/gst/gstpad.h
+include/gstreamer-%%VERSION%%/gst/gstpadtemplate.h
 include/gstreamer-%%VERSION%%/gst/gstparse.h
 include/gstreamer-%%VERSION%%/gst/gstpipeline.h
 include/gstreamer-%%VERSION%%/gst/gstplugin.h
 include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h
-include/gstreamer-%%VERSION%%/gst/gstprobe.h
 include/gstreamer-%%VERSION%%/gst/gstquery.h
-include/gstreamer-%%VERSION%%/gst/gstqueue.h
 include/gstreamer-%%VERSION%%/gst/gstregistry.h
-include/gstreamer-%%VERSION%%/gst/gstregistrypool.h
-include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsegment.h
 include/gstreamer-%%VERSION%%/gst/gststructure.h
 include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
-include/gstreamer-%%VERSION%%/gst/gsttag.h
-include/gstreamer-%%VERSION%%/gst/gsttaginterface.h
-include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttaglist.h
+include/gstreamer-%%VERSION%%/gst/gsttagsetter.h
+include/gstreamer-%%VERSION%%/gst/gsttask.h
 include/gstreamer-%%VERSION%%/gst/gsttrace.h
-include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
 include/gstreamer-%%VERSION%%/gst/gsttypefind.h
-include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsttypefindfactory.h
 include/gstreamer-%%VERSION%%/gst/gsturi.h
-include/gstreamer-%%VERSION%%/gst/gsturitype.h
 include/gstreamer-%%VERSION%%/gst/gstutils.h
 include/gstreamer-%%VERSION%%/gst/gstvalue.h
 include/gstreamer-%%VERSION%%/gst/gstversion.h
 include/gstreamer-%%VERSION%%/gst/gstxml.h
-lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.a
-lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.la
-lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
-lib/gstreamer-%%VERSION%%/libgstbytestream.a
-lib/gstreamer-%%VERSION%%/libgstbytestream.la
-lib/gstreamer-%%VERSION%%/libgstbytestream.so
-lib/gstreamer-%%VERSION%%/libgstdataprotocol.a
-lib/gstreamer-%%VERSION%%/libgstdataprotocol.la
-lib/gstreamer-%%VERSION%%/libgstdataprotocol.so
-lib/gstreamer-%%VERSION%%/libgstelements.a
-lib/gstreamer-%%VERSION%%/libgstelements.la
-lib/gstreamer-%%VERSION%%/libgstelements.so
-lib/gstreamer-%%VERSION%%/libgstentrygthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstentrygthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstentrygthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstentryomegascheduler.a
-lib/gstreamer-%%VERSION%%/libgstentryomegascheduler.la
-lib/gstreamer-%%VERSION%%/libgstentryomegascheduler.so
-lib/gstreamer-%%VERSION%%/libgstfairgthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstfairgthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstfairgthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstgetbits.a
-lib/gstreamer-%%VERSION%%/libgstgetbits.la
-lib/gstreamer-%%VERSION%%/libgstgetbits.so
-lib/gstreamer-%%VERSION%%/libgstindexers.a
-lib/gstreamer-%%VERSION%%/libgstindexers.la
-lib/gstreamer-%%VERSION%%/libgstindexers.so
-lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.a
-lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.la
-lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
-lib/gstreamer-%%VERSION%%/libgstoptscheduler.a
-lib/gstreamer-%%VERSION%%/libgstoptscheduler.la
-lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
-lib/gstreamer-%%VERSION%%/libgstspider.a
-lib/gstreamer-%%VERSION%%/libgstspider.la
-lib/gstreamer-%%VERSION%%/libgstspider.so
-lib/libgstcontrol-%%VERSION%%.a
-lib/libgstcontrol-%%VERSION%%.la
-lib/libgstcontrol-%%VERSION%%.so
-lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+include/gstreamer-%%VERSION%%/gst/net/gstnet.h
+include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h
+include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h
+include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h
+lib/gstreamer-%%VERSION%%/libgstcoreelements.a
+lib/gstreamer-%%VERSION%%/libgstcoreelements.la
+lib/gstreamer-%%VERSION%%/libgstcoreelements.so
+lib/gstreamer-%%VERSION%%/libgstcoreindexers.a
+lib/gstreamer-%%VERSION%%/libgstcoreindexers.la
+lib/gstreamer-%%VERSION%%/libgstcoreindexers.so
+lib/libgstbase-%%VERSION%%.a
+lib/libgstbase-%%VERSION%%.la
+lib/libgstbase-%%VERSION%%.so
+lib/libgstbase-%%VERSION%%.so.0
+lib/libgstcontroller-%%VERSION%%.a
+lib/libgstcontroller-%%VERSION%%.la
+lib/libgstcontroller-%%VERSION%%.so
+lib/libgstcontroller-%%VERSION%%.so.0
+lib/libgstdataprotocol-%%VERSION%%.a
+lib/libgstdataprotocol-%%VERSION%%.la
+lib/libgstdataprotocol-%%VERSION%%.so
+lib/libgstdataprotocol-%%VERSION%%.so.0
+lib/libgstnet-%%VERSION%%.a
+lib/libgstnet-%%VERSION%%.la
+lib/libgstnet-%%VERSION%%.so
+lib/libgstnet-%%VERSION%%.so.0
 lib/libgstreamer-%%VERSION%%.a
 lib/libgstreamer-%%VERSION%%.la
 lib/libgstreamer-%%VERSION%%.so
-lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.so.0
 libdata/pkgconfig/gstreamer-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc
 share/aclocal/gst-element-check-%%VERSION%%.m4
 share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@@ -150,14 +123,12 @@ share/locale/sv/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
-@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@dirrm share/gnome/cache/gstreamer-%%VERSION%%
-@dirrmtry share/gnome/cache
-@dirrm lib/gstreamer-%%VERSION%%
-@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+@dirrm include/gstreamer-%%VERSION%%/gst/net
 @dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol
-@dirrm include/gstreamer-%%VERSION%%/gst/control
-@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst/controller
+@dirrm include/gstreamer-%%VERSION%%/gst/base
 @dirrm include/gstreamer-%%VERSION%%/gst
 @dirrm include/gstreamer-%%VERSION%%
-@exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm lib/gstreamer-%%VERSION%%