7:51 a.m.
commit 2cc4db4f71d60fa0ffc8254be0ca9e7e52f73c60
Author: Bastien Nocera <hadess(a)hadess.net>
Date: Mon Nov 8 19:36:38 2010 +0000
Add fixes for new make
0001-.mak-more-spaces-tabs-clean-ups.patch | 175 +++++++++++++++++++++
...k-use-tabs-instead-of-spaces-to-fix-build.patch | 39 +++++
gstreamer-plugins-base.spec | 7 +
3 files changed, 221 insertions(+)
---
diff --git a/0001-.mak-more-spaces-tabs-clean-ups.patch
b/0001-.mak-more-spaces-tabs-clean-ups.patch
new file mode 100644
index 0000000..1e931f5
--- /dev/null
+++ b/0001-.mak-more-spaces-tabs-clean-ups.patch
@@ -0,0 +1,175 @@
+From 3e8db1d3bbc6e0be3e2aa1f4850b7c1b62676b67 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller(a)collabora.co.uk>
+Date: Tue, 10 Aug 2010 10:44:12 +0100
+Subject: [PATCH] *.mak: more spaces/tabs clean-ups
+
+Use tabs consistently for the first indentation, even if it's not
+really needed in these cases (continuation lines).
+---
+ gtk-doc-plugins.mak | 30 +++++++++++++++---------------
+ gtk-doc.mak | 18 +++++++++---------
+ release.mak | 8 ++++----
+ 3 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
+index f3b7f2d..faa73df 100644
+--- a/gtk-doc-plugins.mak
++++ b/gtk-doc-plugins.mak
+@@ -55,11 +55,11 @@ DOC_STAMPS = \
+ # files generated/updated by gtkdoc-scangobj
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).signals \
+- $(DOC_MODULE).hierarchy \
+- $(DOC_MODULE).interfaces \
+- $(DOC_MODULE).prerequisites \
++ $(DOC_MODULE).hierarchy \
++ $(DOC_MODULE).interfaces \
++ $(DOC_MODULE).prerequisites \
+ $(DOC_MODULE).types \
+- $(DOC_MODULE).args
++ $(DOC_MODULE).args
+
+ SCANOBJ_FILES_O = \
+ .libs/$(DOC_MODULE)-scan.o
+@@ -96,9 +96,9 @@ all-local: html-build.stamp
+ # only look at the plugins in this module when building inspect .xml stuff
+ INSPECT_REGISTRY=$(top_builddir)/docs/plugins/inspect-registry.xml
+ INSPECT_ENVIRONMENT=\
+- GST_PLUGIN_SYSTEM_PATH= \
+-
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(top_builddir)/plugins:$(top_builddir)/src:$(top_builddir)/gnl
\
+- GST_REGISTRY=$(INSPECT_REGISTRY) \
++ GST_PLUGIN_SYSTEM_PATH= \
++ GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(top_builddir)/plugins:$(top_builddir)/src:$(top_builddir)/gnl
\
++ GST_REGISTRY=$(INSPECT_REGISTRY) \
+ $(INSPECT_EXTRA_ENVIRONMENT)
+
+ # update the element and plugin XML descriptions; store in inspect/
+@@ -143,9 +143,9 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(SCANOBJ_FILES_O):
scan-build.stamp
+ scan-build.stamp: $(HFILE_GLOB) $(EXTRA_HFILES) $(basefiles) scanobj-build.stamp
+ if test "x$(top_srcdir)" != "x$(top_builddir)" && \
+ test -d "$(top_builddir)/gst"; \
+- then \
+- export BUILT_OPTIONS="--source-dir=$(top_builddir)/gst"; \
+- fi; \
++ then \
++ export BUILT_OPTIONS="--source-dir=$(top_builddir)/gst"; \
++ fi; \
+ gtkdoc-scan \
+ $(SCAN_OPTIONS) $(EXTRA_HFILES) \
+ --module=$(DOC_MODULE) \
+@@ -183,14 +183,14 @@ sgml-build.stamp: tmpl.stamp scan-build.stamp $(CFILE_GLOB)
$(top_srcdir)/common
+ @echo '*** Building XML ***'
+ @-mkdir -p xml
+ @for a in $(srcdir)/inspect/*.xml; do \
+- xsltproc --stringparam module $(MODULE) \
++ xsltproc --stringparam module $(MODULE) \
+ $(top_srcdir)/common/plugins.xsl $$a > xml/`basename $$a`; done
+ @for f in $(EXAMPLE_CFILES); do \
+ $(PYTHON) $(top_srcdir)/common/c-to-xml.py $$f > xml/element-`basename $$f .c`.xml;
done
+ gtkdoc-mkdb \
+ --module=$(DOC_MODULE) \
+ --source-dir=$(DOC_SOURCE_DIR) \
+- --expand-content-files="$(expand_content_files)" \
++ --expand-content-files="$(expand_content_files)" \
+ --main-sgml-file=$(srcdir)/$(DOC_MAIN_SGML_FILE) \
+ --output-format=xml \
+ --ignore-files="$(IGNORE_HFILES) $(IGNORE_CFILES)" \
+@@ -254,7 +254,7 @@ install-data-local:
+ if test "$$installfiles" = '$(srcdir)/html/*.sgml $(srcdir)/html/*.html
$(srcdir)/html/*.png $(srcdir)/html/*.css'; \
+ then echo '-- Nothing to install' ; \
+ else \
+- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+ for i in $$installfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+@@ -270,8 +270,8 @@ install-data-local:
+ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+ if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
+- $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
++ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
++ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+ fi; \
+ (which gtkdoc-rebase >/dev/null && \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR))
|| true ; \
+diff --git a/gtk-doc.mak b/gtk-doc.mak
+index f44bcd3..eee6d0b 100644
+--- a/gtk-doc.mak
++++ b/gtk-doc.mak
+@@ -74,13 +74,13 @@ scan-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles)
+ else \
+ cd $(srcdir) ; \
+ for i in $(SCANOBJ_FILES) ; do \
+- test -f $$i || touch $$i ; \
++ test -f $$i || touch $$i ; \
+ done \
+ fi
+ if test "x$(top_srcdir)" != "x$(top_builddir)"; \
+- then \
+- export BUILT_OPTIONS="--source-dir=$(DOC_BUILD_DIR)"; \
+- fi; \
++ then \
++ export BUILT_OPTIONS="--source-dir=$(DOC_BUILD_DIR)"; \
++ fi; \
+ gtkdoc-scan \
+ $(SCAN_OPTIONS) $(EXTRA_HFILES) \
+ --module=$(DOC_MODULE) \
+@@ -170,7 +170,7 @@ clean-local: clean-local-gtkdoc
+ # make distcheck work
+ distclean-local:
+ rm -f $(REPORT_FILES) \
+- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ rm -rf tmpl/*.sgml.bak
+ rm -f $(DOC_MODULE).hierarchy
+ rm -f *.stamp || true
+@@ -178,7 +178,7 @@ distclean-local:
+ rm -f $(DOC_MODULE)-docs.sgml ; \
+ rm -f $(DOC_MODULE).types ; \
+ rm -f $(DOC_MODULE).interfaces ; \
+- rm -f $(DOC_MODULE)-overrides.txt ; \
++ rm -f $(DOC_MODULE)-overrides.txt ; \
+ rm -f $(DOC_MODULE).prerequisites ; \
+ rm -f $(DOC_MODULE)-sections.txt ; \
+ rm -rf tmpl/*.sgml ; \
+@@ -187,7 +187,7 @@ distclean-local:
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf html \
+- xml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++ xml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ # thomas: make docs parallel installable; devhelp requires majorminor too
+ install-data-local:
+@@ -204,8 +204,8 @@ install-data-local:
+ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+ if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
+- $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
++ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
++ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+ fi; \
+ (which gtkdoc-rebase >/dev/null && \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR))
|| true ; \
+diff --git a/release.mak b/release.mak
+index afb0c8c..4a9b7d5 100644
+--- a/release.mak
++++ b/release.mak
+@@ -19,7 +19,7 @@ distcheck-hook:
+ @test "x" = "x`find $(distdir) -name \*-enumtypes.[ch] | grep -v
win32`" && \
+ test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \
+ ( $(ECHO) "*** Leftover enumtypes or marshal files in the tarball."
&& \
+- $(ECHO) "*** Make sure the following files are not disted:"
&& \
+- find $(distdir) -name \*-enumtypes.[ch] | grep -v win32 && \
+- find $(distdir) -name \*-marshal.[ch] && \
+- false )
++ $(ECHO) "*** Make sure the following files are not disted:" && \
++ find $(distdir) -name \*-enumtypes.[ch] | grep -v win32 && \
++ find $(distdir) -name \*-marshal.[ch] && \
++ false )
+--
+1.7.3.2
+
diff --git a/0001-gtk-doc-.mak-use-tabs-instead-of-spaces-to-fix-build.patch
b/0001-gtk-doc-.mak-use-tabs-instead-of-spaces-to-fix-build.patch
new file mode 100644
index 0000000..a850c29
--- /dev/null
+++ b/0001-gtk-doc-.mak-use-tabs-instead-of-spaces-to-fix-build.patch
@@ -0,0 +1,39 @@
+From 4a070a90a7f679b26fd571c30b76c4ba4cc49381 Mon Sep 17 00:00:00 2001
+From: Ken Moffat <zarniwhoop73(a)googlemail.com>
+Date: Mon, 9 Aug 2010 23:41:22 +0100
+Subject: [PATCH] gtk-doc*.mak: use tabs instead of spaces to fix build with make-3.82
+
+https://bugs.freedesktop.org/show_bug.cgi?id=29426
+---
+ gtk-doc-plugins.mak | 2 +-
+ gtk-doc.mak | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
+index 02fecfd..f3b7f2d 100644
+--- a/gtk-doc-plugins.mak
++++ b/gtk-doc-plugins.mak
+@@ -332,7 +332,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+diff --git a/gtk-doc.mak b/gtk-doc.mak
+index bdbd07e..f44bcd3 100644
+--- a/gtk-doc.mak
++++ b/gtk-doc.mak
+@@ -236,6 +236,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+--
+1.7.3.2
+
diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec
index 4e00fa3..e623ff5 100644
--- a/gstreamer-plugins-base.spec
+++ b/gstreamer-plugins-base.spec
@@ -42,6 +42,10 @@ Obsoletes: gstreamer-plugins
BuildRequires: gtk-doc >= 1.3
BuildRequires: PyXML
+# Building with new make
+Patch0: 0001-gtk-doc-.mak-use-tabs-instead-of-spaces-to-fix-build.patch
+Patch1: 0001-.mak-more-spaces-tabs-clean-ups.patch
+
%description
GStreamer is a streaming media framework, based on graphs of filters which
operate on media data. Applications using this library can do anything
@@ -55,6 +59,9 @@ This package contains a set of well-maintained base plug-ins.
%prep
%setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -b .new-make
+%patch1 -p1 -b .new-make2
+
%build
%configure \
--with-package-name='Fedora gstreamer-plugins-base package' \