summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/packages/gstreamer/gst-plugins-base_0.10.22.bb (renamed from meta/packages/gstreamer/gst-plugins-base_0.10.20.bb)0
-rw-r--r--meta/packages/gstreamer/gstreamer-0.10.22/gst-inspect-check-error.patch (renamed from meta/packages/gstreamer/gstreamer-0.10.20/gst-inspect-check-error.patch)0
-rw-r--r--meta/packages/gstreamer/gstreamer/check_fix.patch23
-rw-r--r--meta/packages/gstreamer/gstreamer_0.10.22.bb (renamed from meta/packages/gstreamer/gstreamer_0.10.20.bb)3
4 files changed, 12 insertions, 14 deletions
diff --git a/meta/packages/gstreamer/gst-plugins-base_0.10.20.bb b/meta/packages/gstreamer/gst-plugins-base_0.10.22.bb
index 2cb7d68f1..2cb7d68f1 100644
--- a/meta/packages/gstreamer/gst-plugins-base_0.10.20.bb
+++ b/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
index 5da6cdd9c..5da6cdd9c 100644
--- 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
diff --git a/meta/packages/gstreamer/gstreamer/check_fix.patch b/meta/packages/gstreamer/gstreamer/check_fix.patch
index 5cdf6a04e..b7ffdd967 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
index 512df0b4b..a96e9759f 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() {