[poky] [PATCH 2/5] gstreamer: fix build issue with make-3.82
Wolfgang Denk
wd at denx.de
Tue Dec 7 13:14:00 PST 2010
Fix gstreamer-0.10.29 build errors with make-3.82:
make[4]: Entering directory `.../gstreamer-0.10.29-r0/gstreamer-0.10.29/docs/gst'
Makefile:923: *** missing separator (did you mean TAB instead of 8 spaces?). Stop.
Signed-off-by: Wolfgang Denk <wd at denx.de>
---
.../gstreamer-0.10.29/gstreamer-make-382.patch | 178 ++++++++++++++++++++
.../gstreamer/gstreamer_0.10.30.bb | 5 +-
2 files changed, 181 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstreamer-make-382.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstreamer-make-382.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstreamer-make-382.patch
new file mode 100644
index 0000000..452eef8
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/gstreamer-make-382.patch
@@ -0,0 +1,178 @@
+--- gstreamer-0.10.29/docs/libs/Makefile.in.ORIG 2010-12-04 05:55:07.453342358 +0100
++++ gstreamer-0.10.29/docs/libs/Makefile.in 2010-12-04 14:23:21.382158587 +0100
+@@ -698,10 +698,10 @@
+
+ upload: $(FORMATS)
+ @if test "x$(PACKAGE_VERSION_NANO)" = x0; then \
+- export DOCVERSION=$(VERSION); \
+- else export DOCVERSION=head; \
+- fi; \
+- export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
++ export DOCVERSION=$(VERSION); \
++ else export DOCVERSION=head; \
++ fi; \
++ export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
+ ssh $(DOC_SERVER) mkdir -p $$DIR; \
+ if echo $(FORMATS) | grep html > /dev/null; then \
+ echo "Preparing docs for upload (rebasing cross-references) ..." ; \
+@@ -853,7 +853,7 @@
+ # 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
+@@ -861,7 +861,7 @@
+ 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 ; \
+@@ -870,7 +870,7 @@
+
+ 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:
+@@ -887,7 +887,7 @@
+ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@.devhelp; \
+ if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
+- $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
++ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@.devhelp2; \
+ fi; \
+ (which gtkdoc-rebase >/dev/null && \
+@@ -915,7 +915,7 @@
+ -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
+
+--- gstreamer-0.10.29/docs/gst/Makefile.in.ORIG 2010-12-04 05:55:06.996308940 +0100
++++ gstreamer-0.10.29/docs/gst/Makefile.in 2010-12-04 14:22:30.997447871 +0100
+@@ -509,7 +509,7 @@
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+- && { if test -f $@; then exit 0; else break; fi; }; \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+@@ -700,10 +700,10 @@
+
+ upload: $(FORMATS)
+ @if test "x$(PACKAGE_VERSION_NANO)" = x0; then \
+- export DOCVERSION=$(VERSION); \
+- else export DOCVERSION=head; \
+- fi; \
+- export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
++ export DOCVERSION=$(VERSION); \
++ else export DOCVERSION=head; \
++ fi; \
++ export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
+ ssh $(DOC_SERVER) mkdir -p $$DIR; \
+ if echo $(FORMATS) | grep html > /dev/null; then \
+ echo "Preparing docs for upload (rebasing cross-references) ..." ; \
+@@ -753,8 +753,8 @@
+ @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null; \
+ @ENABLE_GTK_DOC_TRUE@ then \
+ @ENABLE_GTK_DOC_TRUE@ if test x"$(srcdir)" != x. ; then \
+- at ENABLE_GTK_DOC_TRUE@ cp $(srcdir)/$(DOC_MODULE).types . ; \
+- at ENABLE_GTK_DOC_TRUE@ chmod u+w $(DOC_MODULE).types ; \
++ at ENABLE_GTK_DOC_TRUE@ cp $(srcdir)/$(DOC_MODULE).types . ; \
++ at ENABLE_GTK_DOC_TRUE@ chmod u+w $(DOC_MODULE).types ; \
+ @ENABLE_GTK_DOC_TRUE@ fi ; \
+ @ENABLE_GTK_DOC_TRUE@ GST_PLUGIN_SYSTEM_PATH=`cd $(top_builddir) && pwd` \
+ @ENABLE_GTK_DOC_TRUE@ GST_PLUGIN_PATH= \
+@@ -764,17 +764,17 @@
+ @ENABLE_GTK_DOC_TRUE@ CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \
+ @ENABLE_GTK_DOC_TRUE@ LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ @ENABLE_GTK_DOC_TRUE@ gtkdoc-scangobj --type-init-func="gst_init(NULL,NULL)" \
+- at ENABLE_GTK_DOC_TRUE@ --module=$(DOC_MODULE) ; \
++ at ENABLE_GTK_DOC_TRUE@ --module=$(DOC_MODULE) ; \
+ @ENABLE_GTK_DOC_TRUE@ else \
+ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \
+ @ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \
+- at ENABLE_GTK_DOC_TRUE@ test -f $$i || touch $$i ; \
++ at ENABLE_GTK_DOC_TRUE@ test -f $$i || touch $$i ; \
+ @ENABLE_GTK_DOC_TRUE@ done \
+ @ENABLE_GTK_DOC_TRUE@ fi
+ @ENABLE_GTK_DOC_TRUE@ if test "x$(top_srcdir)" != "x$(top_builddir)"; \
+- at ENABLE_GTK_DOC_TRUE@ then \
+- at ENABLE_GTK_DOC_TRUE@ export BUILT_OPTIONS="--source-dir=$(DOC_BUILD_DIR)"; \
+- at ENABLE_GTK_DOC_TRUE@ fi; \
++ at ENABLE_GTK_DOC_TRUE@ then \
++ at ENABLE_GTK_DOC_TRUE@ export BUILT_OPTIONS="--source-dir=$(DOC_BUILD_DIR)"; \
++ at ENABLE_GTK_DOC_TRUE@ fi; \
+ @ENABLE_GTK_DOC_TRUE@ gtkdoc-scan \
+ @ENABLE_GTK_DOC_TRUE@ $(SCAN_OPTIONS) $(EXTRA_HFILES) \
+ @ENABLE_GTK_DOC_TRUE@ --module=$(DOC_MODULE) \
+@@ -844,7 +844,7 @@
+ @ENABLE_GTK_DOC_TRUE@ rm -rf xml tmpl html
+ # clean files copied for nonsrcdir templates build
+ @ENABLE_GTK_DOC_TRUE@ if test x"$(srcdir)" != x. ; then \
+- at ENABLE_GTK_DOC_TRUE@ rm -rf $(DOC_MODULE).types; \
++ at ENABLE_GTK_DOC_TRUE@ rm -rf $(DOC_MODULE).types; \
+ @ENABLE_GTK_DOC_TRUE@ fi
+ @ENABLE_GTK_DOC_FALSE at all-local:
+ @ENABLE_GTK_DOC_FALSE at clean-local-gtkdoc:
+@@ -858,7 +858,7 @@
+ # 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
+@@ -866,7 +866,7 @@
+ 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 ; \
+@@ -875,7 +875,7 @@
+
+ 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:
+@@ -892,8 +892,8 @@
+ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
+ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@.devhelp; \
+ if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
+- $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@.devhelp2; \
++ $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
++ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@.devhelp2; \
+ fi; \
+ (which gtkdoc-rebase >/dev/null && \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
+@@ -920,7 +920,7 @@
+ -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/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
index 38e28fa..2da32a3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
@@ -9,11 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
file://check_fix.patch;patch=1 \
- file://gst-inspect-check-error.patch;patch=1"
+ file://gst-inspect-check-error.patch;patch=1 \
+ file://gstreamer-make-382.patch;patch=1"
inherit autotools pkgconfig
--
1.7.3.2
More information about the poky
mailing list