From 26b814e959d2f2e515ee9a9910108f1d266ab042 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 19 Aug 2009 17:05:03 +0100
Subject: [PATCH] gstreamer, gst-plugins-base: Upgrade to 0.10.22

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 ...0.10.20.bb => gst-plugins-base_0.10.22.bb} |  0
 .../gst-inspect-check-error.patch             |  0
 .../gstreamer/gstreamer/check_fix.patch       | 23 +++++++++----------
 ...reamer_0.10.20.bb => gstreamer_0.10.22.bb} |  3 +--
 4 files changed, 12 insertions(+), 14 deletions(-)
 rename meta/packages/gstreamer/{gst-plugins-base_0.10.20.bb => gst-plugins-base_0.10.22.bb} (100%)
 rename meta/packages/gstreamer/{gstreamer-0.10.20 => gstreamer-0.10.22}/gst-inspect-check-error.patch (100%)
 rename meta/packages/gstreamer/{gstreamer_0.10.20.bb => gstreamer_0.10.22.bb} (91%)

diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.20.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.22.bb
similarity index 100%
rename from meta/packages/gstreamer/gst-plugins-base_0.10.20.bb
rename to meta/packages/gstreamer/gst-plugins-base_0.10.22.bb
diff --git a/meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch b/meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch
similarity index 100%
rename from meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch
rename to meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch
diff --git a/meta/packages/gstreamer/gstreamer/check_fix.patch b/meta/packages/gstreamer/gstreamer/check_fix.patch
index 5cdf6a04ea..b7ffdd967f 100644
--- a/meta/packages/gstreamer/gstreamer/check_fix.patch
+++ b/meta/packages/gstreamer/gstreamer/check_fix.patch
@@ -1,19 +1,18 @@
-Index: gstreamer-0.10.20/configure.ac
+Index: gstreamer-0.10.22/configure.ac
 ===================================================================
---- gstreamer-0.10.20.orig/configure.ac	2008-11-10 13:20:41.000000000 +0000
-+++ gstreamer-0.10.20/configure.ac	2008-11-10 13:21:01.000000000 +0000
-@@ -501,13 +501,7 @@
+--- gstreamer-0.10.22.orig/configure.ac	2009-01-19 20:35:32.000000000 +0000
++++ gstreamer-0.10.22/configure.ac	2009-08-19 16:11:05.000000000 +0100
+@@ -498,13 +498,7 @@
  AC_SUBST(GST_DISABLE_XML_DEFINE)
  
  dnl check for "check", unit testing library/header
--AM_PATH_CHECK(0.9.2,
--    [
--        HAVE_CHECK=yes
--        AC_MSG_NOTICE(CHECK_CFLAGS: $CHECK_CFLAGS)
--        AC_MSG_NOTICE(CHECK_LIBS: $CHECK_LIBS)
--    ],
--    HAVE_CHECK=no)
-+HAVE_CHECK=no
+-if test "$cross_compiling" != yes; then
+-  AM_PATH_CHECK(0.9.2,
+-      HAVE_CHECK=yes,
+-      HAVE_CHECK=no)
+-else
+   HAVE_CHECK=no
+-fi
  AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
  
  dnl pkg-config check that for libcheck that works for cross-compiling
diff --git a/meta/packages/gstreamer/gstreamer_0.10.20.bb b/meta/packages/gstreamer/gstreamer_0.10.22.bb
similarity index 91%
rename from meta/packages/gstreamer/gstreamer_0.10.20.bb
rename to meta/packages/gstreamer/gstreamer_0.10.22.bb
index 512df0b4bd..a96e9759f2 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.20.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.22.bb
@@ -10,9 +10,8 @@ PR = "r1"
 inherit autotools_stage pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
-           file://gst-inspect-check-error.patch;patch=1 \
            file://check_fix.patch;patch=1 \
-           file://po-makefile-fix.patch;patch=1"
+           file://gst-inspect-check-error.patch;patch=1"
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug"
 
 do_configure_prepend() {