summaryrefslogtreecommitdiffstats
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)
downloadpoky-a0ae2c8101122f7607d8afedf985b86da89f1a23.tar.gz
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 @@
1--- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100
2+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100
3@@ -1123,7 +1123,7 @@
4 g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
5 g_option_context_add_group (ctx, gst_init_get_option_group ());
6 if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
7- g_print ("Error initializing: %s\n", err->message);
8+ g_print ("Error initializing: %s\n", err ? err->message : "(null)");
9 exit (1);
10 }
11 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"
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6HOMEPAGE = "http://www.gstreamer.net/" 6HOMEPAGE = "http://www.gstreamer.net/"
7MAINTAINER = "Chris Lord <chris@openedhand.com>" 7MAINTAINER = "Chris Lord <chris@openedhand.com>"
8DEPENDS = "glib-2.0 gettext-native popt libxml2" 8DEPENDS = "glib-2.0 gettext-native libxml2"
9PR = "r1" 9PR = "r2"
10 10
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" 13SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
14# file://gstregistrybinary.c \ 14 file://gst-inspect-check-error.patch;patch=1"
15# file://gstregistrybinary.h \ 15# file://gstregistrybinary.c \
16# file://gstreamer-0.9-binary-registry.patch;patch=1" 16# file://gstregistrybinary.h \
17# file://gstreamer-0.9-binary-registry.patch;patch=1"
17EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" 18EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
18 19
19#do_compile_prepend () { 20#do_compile_prepend () {