summaryrefslogtreecommitdiffstats
path: root/meta/packages/gstreamer
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-06-26 14:51:07 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-30 13:14:34 +0100
commit2c2b1e5d3a0dfb2df52009c27e607ac738f63204 (patch)
treef810d79b2da32db3609b716b76a9e1d28a88d513 /meta/packages/gstreamer
parent52f5ad8ec703452094c0166a5a159877cc4bb9ba (diff)
downloadpoky-2c2b1e5d3a0dfb2df52009c27e607ac738f63204.tar.gz
gstreamer: Upgraded to version 0.10.29
Rebase check_fix.patch Remove po-makefile-fix.patch since it is not being used Remove do_configure_prepend since ${S}/common/m4/lib-link.m4 is not exist in the latest version Change the local file directory name to ${PN}-${PV} Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/packages/gstreamer')
-rw-r--r--meta/packages/gstreamer/gstreamer-0.10.29/check_fix.patch17
-rw-r--r--meta/packages/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch (renamed from meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch)3
-rw-r--r--meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.c (renamed from meta/packages/gstreamer/gstreamer/gstregistrybinary.c)0
-rw-r--r--meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.h (renamed from meta/packages/gstreamer/gstreamer/gstregistrybinary.h)0
-rw-r--r--meta/packages/gstreamer/gstreamer/check_fix.patch18
-rw-r--r--meta/packages/gstreamer/gstreamer/po-makefile-fix.patch21
-rw-r--r--meta/packages/gstreamer/gstreamer_0.10.29.bb (renamed from meta/packages/gstreamer/gstreamer_0.10.22.bb)7
7 files changed, 21 insertions, 45 deletions
diff --git a/meta/packages/gstreamer/gstreamer-0.10.29/check_fix.patch b/meta/packages/gstreamer/gstreamer-0.10.29/check_fix.patch
new file mode 100644
index 0000000000..72c3f6407e
--- /dev/null
+++ b/meta/packages/gstreamer/gstreamer-0.10.29/check_fix.patch
@@ -0,0 +1,17 @@
1# gstreamer: Fix a problem with configure if check has already been built
2# Richard Purdie <rpurdie@linux.intel.com>
3
4diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac
5--- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800
6+++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800
7@@ -543,8 +543,10 @@
8 *) BUILD_CHECK=yes ;;
9 esac
10 ])
11+
12 dnl bit of a misnomer, but keep the conditional named like this so we don't
13 dnl have to change too much elsewhere
14+HAVE_CHECK=no
15 AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes")
16
17 dnl configure the desired buffer alignment
diff --git a/meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch b/meta/packages/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch
index 5da6cdd9c8..4ca1dbe6ab 100644
--- a/meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch
+++ b/meta/packages/gstreamer/gstreamer-0.10.29/gst-inspect-check-error.patch
@@ -1,3 +1,6 @@
1# Fix crash with gst-inspect
2# Chris Lord <chris@openedhand.com>
3
1--- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100 4--- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100
2+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100 5+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100
3@@ -1123,7 +1123,7 @@ 6@@ -1123,7 +1123,7 @@
diff --git a/meta/packages/gstreamer/gstreamer/gstregistrybinary.c b/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.c
index c1f3e71af6..c1f3e71af6 100644
--- a/meta/packages/gstreamer/gstreamer/gstregistrybinary.c
+++ b/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.c
diff --git a/meta/packages/gstreamer/gstreamer/gstregistrybinary.h b/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.h
index 2ef24d765d..2ef24d765d 100644
--- a/meta/packages/gstreamer/gstreamer/gstregistrybinary.h
+++ b/meta/packages/gstreamer/gstreamer-0.10.29/gstregistrybinary.h
diff --git a/meta/packages/gstreamer/gstreamer/check_fix.patch b/meta/packages/gstreamer/gstreamer/check_fix.patch
deleted file mode 100644
index b7ffdd967f..0000000000
--- a/meta/packages/gstreamer/gstreamer/check_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Index: gstreamer-0.10.22/configure.ac
2===================================================================
3--- gstreamer-0.10.22.orig/configure.ac 2009-01-19 20:35:32.000000000 +0000
4+++ gstreamer-0.10.22/configure.ac 2009-08-19 16:11:05.000000000 +0100
5@@ -498,13 +498,7 @@
6 AC_SUBST(GST_DISABLE_XML_DEFINE)
7
8 dnl check for "check", unit testing library/header
9-if test "$cross_compiling" != yes; then
10- AM_PATH_CHECK(0.9.2,
11- HAVE_CHECK=yes,
12- HAVE_CHECK=no)
13-else
14 HAVE_CHECK=no
15-fi
16 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
17
18 dnl pkg-config check that for libcheck that works for cross-compiling
diff --git a/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch b/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch
deleted file mode 100644
index 9efc09be6d..0000000000
--- a/meta/packages/gstreamer/gstreamer/po-makefile-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1---
2 po/Makefile.in.in | 4 ++--
3 1 file changed, 2 insertions(+), 2 deletions(-)
4
5--- gstreamer-0.10.17.orig/po/Makefile.in.in
6+++ gstreamer-0.10.17/po/Makefile.in.in
7@@ -27,12 +27,12 @@ datadir = @datadir@
8 localedir = $(datadir)/locale
9 gettextsrcdir = $(datadir)/gettext/po
10
11 INSTALL = @INSTALL@
12 INSTALL_DATA = @INSTALL_DATA@
13-MKINSTALLDIRS = @MKINSTALLDIRS@
14-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
15+MKINSTALLDIRS = $(top_builddir)/mkinstalldirs
16+mkinstalldirs = $(MKINSTALLDIRS)
17
18 GMSGFMT = @GMSGFMT@
19 MSGFMT = @MSGFMT@
20 XGETTEXT = @XGETTEXT@
21 MSGMERGE = msgmerge
diff --git a/meta/packages/gstreamer/gstreamer_0.10.22.bb b/meta/packages/gstreamer/gstreamer_0.10.29.bb
index 9c05f2ea8e..72c155299e 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.22.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.29.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6HOMEPAGE = "http://www.gstreamer.net/" 6HOMEPAGE = "http://www.gstreamer.net/"
7DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native" 7DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native"
8PR = "r1" 8PR = "r0"
9 9
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
@@ -14,11 +14,6 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz
14 file://gst-inspect-check-error.patch;patch=1" 14 file://gst-inspect-check-error.patch;patch=1"
15EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" 15EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug"
16 16
17do_configure_prepend() {
18 # This m4 file contains nastiness which conflicts with libtool 2.2.2
19 rm -f ${S}/common/m4/lib-link.m4 || true
20}
21
22#do_compile_prepend () { 17#do_compile_prepend () {
23# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ 18# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
24#} 19#}