From 67acc6dfa51b7321d1df3eec68358bffc2093ef1 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Mon, 8 Dec 2008 00:48:05 +1100
Subject: [PATCH] gstreamer: fix compile with premade patch

---
 gstreamer/.md5sum                             |  2 +-
 gstreamer/Pkgfile                             | 15 ++--
 ...mer-0.10.21-disable_gtkdoc_generated.patch | 70 +++++++++++++++++++
 3 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 gstreamer/gstreamer-0.10.21-disable_gtkdoc_generated.patch

diff --git a/gstreamer/.md5sum b/gstreamer/.md5sum
index 7e20301c9..ff8c48d80 100644
--- a/gstreamer/.md5sum
+++ b/gstreamer/.md5sum
@@ -1,2 +1,2 @@
-06f616439c28779a9b727c547f15b30a  gstreamer-0.10.21-disable-gtkdoc.patch
+49975d157be138a60cf07541725f19f9  gstreamer-0.10.21-disable_gtkdoc_generated.patch
 7bad90af3fd81a1535363cf85359125c  gstreamer-0.10.21.tar.bz2
diff --git a/gstreamer/Pkgfile b/gstreamer/Pkgfile
index c5b72ad45..1a605f31d 100644
--- a/gstreamer/Pkgfile
+++ b/gstreamer/Pkgfile
@@ -7,14 +7,18 @@
 name=gstreamer
 version=0.10.21
 release=1
-source=(http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$version.tar.bz2
-	gstreamer-0.10.21-disable-gtkdoc.patch)
+source=(http://gstreamer.freedesktop.org/src/$name/$name-$version.tar.bz2
+	$name-0.10.21-disable_gtkdoc_generated.patch)
 
 build() {
-	cd gstreamer-$version
+	cd $name-$version
 
-	patch -p 1 -i $SRC/gstreamer-0.10.21-disable-gtkdoc.patch
-	automake
+	# this patch created with autoconf-2.61 automake-1.10.1 in chroot
+	patch -p 7 -i $SRC/$name-0.10.21-disable_gtkdoc_generated.patch
+
+	# origional patch wont work on recent autoconf and automake versions.
+	#patch -p 1 -i $SRC/$name-0.10.21-disable-gtkdoc.patch
+	#automake
 
 	./configure \
 		--prefix=/usr \
@@ -31,4 +35,3 @@ build() {
 	make
 	make DESTDIR=$PKG install
 }
-
diff --git a/gstreamer/gstreamer-0.10.21-disable_gtkdoc_generated.patch b/gstreamer/gstreamer-0.10.21-disable_gtkdoc_generated.patch
new file mode 100644
index 000000000..cba49e07d
--- /dev/null
+++ b/gstreamer/gstreamer-0.10.21-disable_gtkdoc_generated.patch
@@ -0,0 +1,70 @@
+diff -pruN /usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.am /home/romster/.safe-build/usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.am
+--- /usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.am	2008-01-10 00:48:03.000000000 +1100
++++ /home/romster/.safe-build/usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.am	2008-12-08 00:28:43.954541600 +1100
+@@ -12,17 +12,23 @@ aclocal_DATA = gst-element-check-@GST_MA
+ 
+ SUBDIRS = \
+ 	gst libs plugins tools tests \
+-	docs \
+ 	pkgconfig po \
+ 	common
+ 
++if ENABLE_GTK_DOC
++	SUBDIRS += docs
++endif
++
+ # These are all the possible subdirs
+ DIST_SUBDIRS = \
+ 	gst libs plugins tools tests \
+-	docs \
+ 	pkgconfig po \
+ 	common
+ 
++if ENABLE_GTK_DOC
++        DIST_SUBDIRS += docs
++endif
++
+ # include before EXTRA_DIST for win32 assignment
+ include $(top_srcdir)/common/win32.mak
+ 
+diff -pruN /usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.in /home/romster/.safe-build/usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.in
+--- /usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.in	2008-10-03 07:54:23.000000000 +1000
++++ /home/romster/.safe-build/usr/ports/work/gstreamer/src/gstreamer-0.10.21/Makefile.in	2008-12-08 00:28:52.503419831 +1100
+@@ -37,6 +37,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++@ENABLE_GTK_DOC_TRUE@am__append_1 = docs
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(srcdir)/gst-element-check.m4.in $(srcdir)/gstreamer.spec.in \
+@@ -359,18 +360,13 @@ aclocaldir = $(datadir)/aclocal
+ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
+ SUBDIRS = \
+ 	gst libs plugins tools tests \
+-	docs \
+ 	pkgconfig po \
+ 	common
+ 
+ 
+ # These are all the possible subdirs
+-DIST_SUBDIRS = \
+-	gst libs plugins tools tests \
+-	docs \
+-	pkgconfig po \
+-	common
+-
++DIST_SUBDIRS = gst libs plugins tools tests pkgconfig po common \
++	$(am__append_1)
+ 
+ # the MANIFEST contains all win32 related files that should be disted
+ win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
+@@ -884,6 +880,8 @@ all-local: gst-element-check-@GST_MAJORM
+ gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
+ 	cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
+ 
++@ENABLE_GTK_DOC_TRUE@	SUBDIRS += docs
++
+ win32-debug:
+ 	@echo; \
+ 	echo win32     = $(win32); \