From bb48dc2e47b414a865db19fc830b463ced281553 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 22 Aug 2006 09:27:13 +0000
Subject: [PATCH] Re-fixing #1762. Removed the previous fix [2213], and added a
 better solution.

---
 .../tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh   |  4 +++-
 .../tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in  |  3 +--
 .../gstreamer/gstreamer-0.8.10/etc/valgrind.patch     | 11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/valgrind.patch

diff --git a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh
index fd3c4da09..2e178fea0 100755
--- a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh
+++ b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh
@@ -50,7 +50,9 @@ cd ${tmpdir}
 if [ ! -d $product ]; then
     tar xfj ${gstreamer_tar}
     cd ${product}
-    # patch here
+    # see bug report at http://bugzilla.gnome.org/show_bug.cgi?id=330308
+    # for details of the following patch
+    patch -p1 < ${etcdir}/valgrind.patch
 fi
 
 cd ${tmpdir}
diff --git a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
index 285d73dee..6db9468f7 100644
--- a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
+++ b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
@@ -80,8 +80,7 @@ all: ${TMP_DIR}/all.stamp
 ${TMP_DIR}/all.stamp:
 	cd ${GSTREAMER_DIR} && \
         ./configure --prefix=${prefix} \
-                    --with-pkg-config-path=${pkg_config_path} \
-                    --disable-valgrind
+                    --with-pkg-config-path=${pkg_config_path}
 	${MAKE} -C ${GSTREAMER_DIR}
 	${MAKE} -C ${GSTREAMER_DIR} install
 	cd ${GST_PLUGINS_DIR} && \
diff --git a/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/valgrind.patch b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/valgrind.patch
new file mode 100644
index 000000000..e8b10441c
--- /dev/null
+++ b/livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/valgrind.patch
@@ -0,0 +1,11 @@
+--- gstreamer-0.8.10/configure.ac	2005-05-03 15:24:30.000000000 +0200
++++ gstreamer-0.8.10-livesupport/configure.ac	2006-08-22 11:12:12.000000000 +0200
+@@ -589,7 +589,7 @@
+ dnl Private vars for libgst only
+ GST_LIB_CFLAGS="$GST_PKG_CFLAGS $GST_INT_CFLAGS \
+   $VALGRIND_CFLAGS -I\$(top_srcdir)"
+-GST_LIB_LIBS="$XML_LIBS $GLIB_LIBS -lpopt $GST_PKG_LIBS $LTLIBINTL $VALGRIND_LIBS -lm"
++GST_LIB_LIBS="$XML_LIBS $GLIB_LIBS -lpopt $GST_PKG_LIBS $LTLIBINTL -lm"
+ GST_LIB_LDFLAGS="$GST_LT_LDFLAGS -version-info $GST_LIBVERSION $EXPORT_LDFLAGS"
+ AC_SUBST(GST_LIB_CFLAGS)
+ AC_SUBST(GST_LIB_LIBS)