summaryrefslogtreecommitdiffstats
path: root/meta/packages/gstreamer
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-11-10 13:26:26 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-11-10 13:26:26 +0000
commitb618bcfeb94af391a5a9559efe75974c9661855e (patch)
treec882e87944cfb79d08af60a1c96d3cff80888729 /meta/packages/gstreamer
parent5751ea748f6207f78bca684ea961b9b4bd1a88c1 (diff)
downloadpoky-b618bcfeb94af391a5a9559efe75974c9661855e.tar.gz
gstreamer: Fix a problem with configure if check has already been built
Diffstat (limited to 'meta/packages/gstreamer')
-rw-r--r--meta/packages/gstreamer/gstreamer/check_fix.patch19
-rw-r--r--meta/packages/gstreamer/gstreamer_0.10.20.bb2
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/packages/gstreamer/gstreamer/check_fix.patch b/meta/packages/gstreamer/gstreamer/check_fix.patch
new file mode 100644
index 0000000000..5cdf6a04ea
--- /dev/null
+++ b/meta/packages/gstreamer/gstreamer/check_fix.patch
@@ -0,0 +1,19 @@
1Index: gstreamer-0.10.20/configure.ac
2===================================================================
3--- gstreamer-0.10.20.orig/configure.ac 2008-11-10 13:20:41.000000000 +0000
4+++ gstreamer-0.10.20/configure.ac 2008-11-10 13:21:01.000000000 +0000
5@@ -501,13 +501,7 @@
6 AC_SUBST(GST_DISABLE_XML_DEFINE)
7
8 dnl check for "check", unit testing library/header
9-AM_PATH_CHECK(0.9.2,
10- [
11- HAVE_CHECK=yes
12- AC_MSG_NOTICE(CHECK_CFLAGS: $CHECK_CFLAGS)
13- AC_MSG_NOTICE(CHECK_LIBS: $CHECK_LIBS)
14- ],
15- HAVE_CHECK=no)
16+HAVE_CHECK=no
17 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
18
19 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.20.bb
index 7b9d1ab3e0..32f6523b2a 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.20.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.20.bb
@@ -5,11 +5,13 @@ PRIORITY = "optional"
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6HOMEPAGE = "http://www.gstreamer.net/" 6HOMEPAGE = "http://www.gstreamer.net/"
7DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native" 7DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native"
8PR = "r1"
8 9
9inherit autotools pkgconfig 10inherit autotools pkgconfig
10 11
11SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ 12SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
12 file://gst-inspect-check-error.patch;patch=1 \ 13 file://gst-inspect-check-error.patch;patch=1 \
14 file://check_fix.patch;patch=1 \
13 file://po-makefile-fix.patch;patch=1" 15 file://po-makefile-fix.patch;patch=1"
14EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug" 16EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind --disable-debug"
15 17