Update to 0.7.4.

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

5 files changed, 48 insertions, 38 deletions

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 5421bec36..2a213fcea 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTVERSION=	0.7.4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
@@ -41,16 +40,14 @@ PLIST_SUB=	\
 		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
-MAN1=	gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
-	gst-inspect-${GST_VERSION}.1 gst-launch-${GST_VERSION}.1 \
-	gst-feedback-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \
-	gst-register-${GST_VERSION}.1 gst-xmllaunch-${GST_VERSION}.1
+MAN1=	gst-inspect-${GST_VERSION}.1 gst-launch-${GST_VERSION}.1 \
+	gst-md5sum-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 GST_VERSION=${PORTVERSION:C/..$//}
 
 # library minor number
-SHLIB_VERSION=	5
+SHLIB_VERSION=	6
 
 post-install:
 # register plugins
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index aa66eb087..dc72a3713 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/gstreamer-0.7.3.tar.bz2) = 6512fd27235657e5c5ea37f47e05f9a3
+MD5 (gnome2/gstreamer-0.7.4.tar.bz2) = 121665cc808544604cc5ea2f19c1d454
+SIZE (gnome2/gstreamer-0.7.4.tar.bz2) = 1111563
diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure
index c8c9b6317..34f0e3572 100644
--- a/multimedia/gstreamer/files/patch-configure
+++ b/multimedia/gstreamer/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Fri Dec 19 13:32:43 2003
-+++ configure	Fri Dec 19 13:49:52 2003
-@@ -19973,7 +19973,7 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix=$prefix
- if test "x$CATOBJEXT" = "x.mo" ; then
--  localedir=`eval echo "${libdir}/locale"`
-+  localedir=`eval echo "${prefix}/share/locale"`
- else
-   localedir=`eval echo "${datadir}/locale"`
- fi
-@@ -20047,7 +20047,7 @@
+--- configure.orig	Fri Feb  6 13:01:39 2004
++++ configure	Fri Feb  6 13:03:19 2004
+@@ -20288,7 +20288,7 @@
+ 
+ 
+   EXP_VAR=LOCALEDIR
+-  FROM_VAR=$datadir/locale
++  FROM_VAR=$prefix/share/locale
+ 
+     prefix_save=$prefix
+   if test "x$prefix" = "xNONE"; then
+@@ -20380,7 +20380,7 @@
  echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6
  
    save_CFLAGS="$CFLAGS"
@@ -18,7 +18,7 @@
  
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -20088,7 +20088,7 @@
+@@ -20421,7 +20421,7 @@
    CFLAGS="$save_CFLAGS"
  
    if test "X$flag_ok" = Xyes ; then
@@ -27,12 +27,12 @@
      true
    else
      GST_ERROR="$GST_ERROR"
-@@ -21732,7 +21732,7 @@
-     :
- fi
+@@ -21031,7 +21031,7 @@
+ echo "${ECHO_T}$XSLTPROC_WORKS" >&6
+   fi
  
--if test "$ac_cv_check_mcsc" == "yes"; then
-+if test "$ac_cv_check_mcsc" = "yes"; then
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_MAKECONTEXT $HAVE_MAKECONTEXT
+-  if test "x$XSLTPROC_WORKS" == "xyes"; then
++  if test "x$XSLTPROC_WORKS" = "xyes"; then
+         HAVE_DOCBOOK=true
+   else
+         HAVE_DOCBOOK=false
diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c
index 3519fb0e7..b66b7062f 100644
--- a/multimedia/gstreamer/files/patch-gst::cothreads.c
+++ b/multimedia/gstreamer/files/patch-gst::cothreads.c
@@ -1,6 +1,6 @@
---- gst/cothreads.c.orig	Sat Feb  1 19:09:00 2003
-+++ gst/cothreads.c	Mon Feb  3 10:57:44 2003
-@@ -41,12 +41,16 @@
+--- 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
  
@@ -8,9 +8,11 @@
 +#include <ucontext.h>
 +#endif
 +
- /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */
  #ifndef MAP_ANONYMOUS
- #define MAP_ANONYMOUS MAP_ANON
+ #ifdef MAP_ANON
+ /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */
+@@ -52,7 +56,7 @@
+ #endif
  #endif
  
 -#define STACK_SIZE 0x200000
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 77c2c6c59..4c2a62220 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -1,13 +1,22 @@
 @unexec %D/bin/gst-register 2>/dev/null || true
+bin/gst-complete
 bin/gst-complete-%%VERSION%%
+bin/gst-compprep
 bin/gst-compprep-%%VERSION%%
-bin/gst-feedback-%%VERSION%%
+bin/gst-feedback
+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/bytestream.h
 include/gstreamer-%%VERSION%%/gst/control/control.h
@@ -22,7 +31,6 @@ 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/gstbufferpool-default.h
 include/gstreamer-%%VERSION%%/gst/gstcaps.h
 include/gstreamer-%%VERSION%%/gst/gstclock.h
 include/gstreamer-%%VERSION%%/gst/gstcompat.h
@@ -31,6 +39,7 @@ include/gstreamer-%%VERSION%%/gst/gstcpu.h
 include/gstreamer-%%VERSION%%/gst/gstdata.h
 include/gstreamer-%%VERSION%%/gst/gstelement.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
@@ -48,7 +57,6 @@ 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/gstprops.h
 include/gstreamer-%%VERSION%%/gst/gstquery.h
 include/gstreamer-%%VERSION%%/gst/gstqueue.h
 include/gstreamer-%%VERSION%%/gst/gstregistrypool.h
@@ -88,13 +96,15 @@ lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
 libdata/pkgconfig/gstreamer-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
 share/aclocal/gst-element-check-%%VERSION%%.m4
+share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/nl/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%%
 @unexec rmdir %D/share/gnome/cache 2>/dev/null || true
 @dirrm lib/gstreamer-%%VERSION%%
 @dirrm include/gstreamer-%%VERSION%%/gst/getbits
 @dirrm include/gstreamer-%%VERSION%%/gst/control
-@dirrm include/gstreamer-%%VERSION%%/gst
 @dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst
 @dirrm include/gstreamer-%%VERSION%%
 @exec %D/bin/gst-register 2>/dev/null || true