diff options
-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.patch | 23 | ||||
-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 2cb7d68f11..2cb7d68f11 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 5da6cdd9c8..5da6cdd9c8 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 5cdf6a04ea..b7ffdd967f 100644 --- a/meta/packages/gstreamer/gstreamer/check_fix.patch +++ b/meta/packages/gstreamer/gstreamer/check_fix.patch | |||
@@ -1,19 +1,18 @@ | |||
1 | Index: gstreamer-0.10.20/configure.ac | 1 | Index: gstreamer-0.10.22/configure.ac |
2 | =================================================================== | 2 | =================================================================== |
3 | --- gstreamer-0.10.20.orig/configure.ac 2008-11-10 13:20:41.000000000 +0000 | 3 | --- gstreamer-0.10.22.orig/configure.ac 2009-01-19 20:35:32.000000000 +0000 |
4 | +++ gstreamer-0.10.20/configure.ac 2008-11-10 13:21:01.000000000 +0000 | 4 | +++ gstreamer-0.10.22/configure.ac 2009-08-19 16:11:05.000000000 +0100 |
5 | @@ -501,13 +501,7 @@ | 5 | @@ -498,13 +498,7 @@ |
6 | AC_SUBST(GST_DISABLE_XML_DEFINE) | 6 | AC_SUBST(GST_DISABLE_XML_DEFINE) |
7 | 7 | ||
8 | dnl check for "check", unit testing library/header | 8 | dnl check for "check", unit testing library/header |
9 | -AM_PATH_CHECK(0.9.2, | 9 | -if test "$cross_compiling" != yes; then |
10 | - [ | 10 | - AM_PATH_CHECK(0.9.2, |
11 | - HAVE_CHECK=yes | 11 | - HAVE_CHECK=yes, |
12 | - AC_MSG_NOTICE(CHECK_CFLAGS: $CHECK_CFLAGS) | 12 | - HAVE_CHECK=no) |
13 | - AC_MSG_NOTICE(CHECK_LIBS: $CHECK_LIBS) | 13 | -else |
14 | - ], | 14 | HAVE_CHECK=no |
15 | - HAVE_CHECK=no) | 15 | -fi |
16 | +HAVE_CHECK=no | ||
17 | AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") | 16 | AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") |
18 | 17 | ||
19 | dnl pkg-config check that for libcheck that works for cross-compiling | 18 | 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 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" | |||
10 | inherit autotools_stage pkgconfig | 10 | inherit autotools_stage pkgconfig |
11 | 11 | ||
12 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ |
13 | file://gst-inspect-check-error.patch;patch=1 \ | ||
14 | file://check_fix.patch;patch=1 \ | 13 | file://check_fix.patch;patch=1 \ |
15 | file://po-makefile-fix.patch;patch=1" | 14 | file://gst-inspect-check-error.patch;patch=1" |
16 | EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" | 15 | EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" |
17 | 16 | ||
18 | do_configure_prepend() { | 17 | do_configure_prepend() { |