summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb7
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 @@
1The whitespaces instead of tabs here cause the new, stricter, parser in make
23.82 to barf on the doc makefiles.
3
4This patch should no longer be required in more recent gstreamer version
5
6JL - 14/12/10
7
8Index: gstreamer-0.10.29/common/gtk-doc.mak
9===================================================================
10--- gstreamer-0.10.29.orig/common/gtk-doc.mak
11+++ gstreamer-0.10.29/common/gtk-doc.mak
12@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l
13 -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
14 -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
15 cd $(distdir) && rm -f $(DISTCLEANFILES)
16- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
17+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
18
19 .PHONY : dist-hook-local docs
20Index: gstreamer-0.10.29/common/gtk-doc-plugins.mak
21===================================================================
22--- gstreamer-0.10.29.orig/common/gtk-doc-plugins.mak
23+++ gstreamer-0.10.29/common/gtk-doc-plugins.mak
24@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
25 -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
26 -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
27 cd $(distdir) && rm -f $(DISTCLEANFILES)
28- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
29+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
30
31 .PHONY : dist-hook-local docs
32
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 \
10 file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" 10 file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
11DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native" 11DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native"
12 12
13PR = "r0" 13PR = "r1"
14 14
15SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ 15SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
16 file://check_fix.patch;patch=1 \ 16 file://check_fix.patch \
17 file://gst-inspect-check-error.patch;patch=1" 17 file://gst-inspect-check-error.patch \
18 file://make-382.patch"
18 19
19SRC_URI[md5sum] = "de01f73f71d97c5854badd363ca06509" 20SRC_URI[md5sum] = "de01f73f71d97c5854badd363ca06509"
20SRC_URI[sha256sum] = "e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a" 21SRC_URI[sha256sum] = "e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a"