diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2010-12-14 15:39:42 +0000 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 17:36:00 +0000 |
| commit | 8fc07ca039c417d86ff7e3d4d1fd41dc04217d7d (patch) | |
| tree | 35ba700f69e4c4631b2dccba84870ef11292cc44 /meta/recipes-multimedia | |
| parent | ece252c42aac034a91c1d5d01c108badec1a97d8 (diff) | |
| download | openembedded-core-contrib-8fc07ca039c417d86ff7e3d4d1fd41dc04217d7d.tar.gz | |
gstreamer: fix to comply with make 3.82's stricter parser
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb | 7 |
2 files changed, 36 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch new file mode 100644 index 0000000000..1af2a81325 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch @@ -0,0 +1,32 @@ +The whitespaces instead of tabs here cause the new, stricter, parser in make +3.82 to barf on the doc makefiles. + +This patch should no longer be required in more recent gstreamer version + +JL - 14/12/10 + +Index: gstreamer-0.10.29/common/gtk-doc.mak +=================================================================== +--- gstreamer-0.10.29.orig/common/gtk-doc.mak ++++ gstreamer-0.10.29/common/gtk-doc.mak +@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -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 +Index: gstreamer-0.10.29/common/gtk-doc-plugins.mak +=================================================================== +--- gstreamer-0.10.29.orig/common/gtk-doc-plugins.mak ++++ gstreamer-0.10.29/common/gtk-doc-plugins.mak +@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -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 923365f782..538884e3d0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb @@ -10,11 +10,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://check_fix.patch \ + file://gst-inspect-check-error.patch \ + file://make-382.patch" SRC_URI[md5sum] = "de01f73f71d97c5854badd363ca06509" SRC_URI[sha256sum] = "e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a" |