summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-09-12 15:25:37 +0000
committerChris Lord <chris@openedhand.com>2006-09-12 15:25:37 +0000
commita0ae2c8101122f7607d8afedf985b86da89f1a23 (patch)
tree8f9affb08aefbe2b714d15c35879cda22602eab6
parentcb2180680286d61ae4c92830fa6af05fb98cfd20 (diff)
downloadopenembedded-core-a0ae2c8101122f7607d8afedf985b86da89f1a23.tar.gz
openembedded-core-a0ae2c8101122f7607d8afedf985b86da89f1a23.tar.bz2
openembedded-core-a0ae2c8101122f7607d8afedf985b86da89f1a23.zip
Fix crash with gst-inspect
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@705 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gstreamer/gstreamer-0.10.9/gst-inspect-check-error.patch11
-rw-r--r--meta/packages/gstreamer/gstreamer_0.10.9.bb13
2 files changed, 18 insertions, 6 deletions
diff --git a/meta/packages/gstreamer/gstreamer-0.10.9/gst-inspect-check-error.patch b/meta/packages/gstreamer/gstreamer-0.10.9/gst-inspect-check-error.patch
new file mode 100644
index 0000000000..5da6cdd9c8
--- /dev/null
+++ b/meta/packages/gstreamer/gstreamer-0.10.9/gst-inspect-check-error.patch
@@ -0,0 +1,11 @@
+--- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100
++++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100
+@@ -1123,7 +1123,7 @@
+ g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
+ g_option_context_add_group (ctx, gst_init_get_option_group ());
+ if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
+- g_print ("Error initializing: %s\n", err->message);
++ g_print ("Error initializing: %s\n", err ? err->message : "(null)");
+ exit (1);
+ }
+ g_option_context_free (ctx);
diff --git a/meta/packages/gstreamer/gstreamer_0.10.9.bb b/meta/packages/gstreamer/gstreamer_0.10.9.bb
index cdf8de72b4..43d5e34df4 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.9.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.9.bb
@@ -5,15 +5,16 @@ PRIORITY = "optional"
LICENSE = "LGPL"
HOMEPAGE = "http://www.gstreamer.net/"
MAINTAINER = "Chris Lord <chris@openedhand.com>"
-DEPENDS = "glib-2.0 gettext-native popt libxml2"
-PR = "r1"
+DEPENDS = "glib-2.0 gettext-native libxml2"
+PR = "r2"
inherit autotools pkgconfig
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
-# file://gstregistrybinary.c \
-# file://gstregistrybinary.h \
-# file://gstreamer-0.9-binary-registry.patch;patch=1"
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
+ file://gst-inspect-check-error.patch;patch=1"
+# file://gstregistrybinary.c \
+# file://gstregistrybinary.h \
+# file://gstreamer-0.9-binary-registry.patch;patch=1"
EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
#do_compile_prepend () {