summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-12-28 10:09:17 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 12:06:53 +0000
commit494b678deaf92e86b4fa8c918e28fd0b3c3aa964 (patch)
treec9c8cfc42931aff83474c3791e7c08e59fc6af9e /meta
parentaba871fcad41935de535d656e39c725e68af9418 (diff)
downloadpoky-494b678deaf92e86b4fa8c918e28fd0b3c3aa964.tar.gz
gstreamer: upgrade to version 0.10.31
upgrade from 0.10.30. Remove make-382.patch since the fix is already in upstream. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
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.31/check_fix.patch (renamed from meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/check_fix.patch)0
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gst-inspect-check-error.patch (renamed from meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gst-inspect-check-error.patch)0
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gstregistrybinary.c (renamed from meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gstregistrybinary.c)0
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gstregistrybinary.h (renamed from meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gstregistrybinary.h)0
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb)9
6 files changed, 4 insertions, 37 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
deleted file mode 100644
index 1af2a81325..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch
+++ /dev/null
@@ -1,32 +0,0 @@
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/check_fix.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/check_fix.patch
index 72c3f6407e..72c3f6407e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/check_fix.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/check_fix.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gst-inspect-check-error.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gst-inspect-check-error.patch
index 4ca1dbe6ab..4ca1dbe6ab 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gst-inspect-check-error.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gst-inspect-check-error.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gstregistrybinary.c b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gstregistrybinary.c
index c1f3e71af6..c1f3e71af6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gstregistrybinary.c
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gstregistrybinary.c
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gstregistrybinary.h b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gstregistrybinary.h
index 2ef24d765d..2ef24d765d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/gstregistrybinary.h
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.31/gstregistrybinary.h
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
index 538884e3d0..e7b00adfa0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.31.bb
@@ -10,15 +10,14 @@ 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 = "r1" 13PR = "r0"
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 \ 16 file://check_fix.patch \
17 file://gst-inspect-check-error.patch \ 17 file://gst-inspect-check-error.patch"
18 file://make-382.patch"
19 18
20SRC_URI[md5sum] = "de01f73f71d97c5854badd363ca06509" 19SRC_URI[md5sum] = "a21fb08bdb578d972c7c14e77da8fbb6"
21SRC_URI[sha256sum] = "e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a" 20SRC_URI[sha256sum] = "7f737e6d047c1ebeb4e1e0725fc377c5d9f12ee89186de7960be3cbba709ab84"
22 21
23inherit autotools pkgconfig 22inherit autotools pkgconfig
24 23