From f4a618526681084dd8fb074e991ce3f791586ca5 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 8 Jan 2008 14:14:09 +0000
Subject: gstreamer: don't try and load .debug libraries

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3420 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../gstreamer-omit-debug-directories.patch         | 24 ++++++++++++++++++++++
 meta/packages/gstreamer/gstreamer_0.10.14.bb       |  5 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta/packages/gstreamer/gstreamer-0.10.14/gstreamer-omit-debug-directories.patch

(limited to 'meta/packages')

diff --git a/meta/packages/gstreamer/gstreamer-0.10.14/gstreamer-omit-debug-directories.patch b/meta/packages/gstreamer/gstreamer-0.10.14/gstreamer-omit-debug-directories.patch
new file mode 100644
index 000000000..1abce2ec7
--- /dev/null
+++ b/meta/packages/gstreamer/gstreamer-0.10.14/gstreamer-omit-debug-directories.patch
@@ -0,0 +1,24 @@
+Index: gstreamer-cvs/gst/gstregistry.c
+===================================================================
+RCS file: /cvs/gstreamer/gstreamer/gst/gstregistry.c,v
+retrieving revision 1.75
+diff -u -r1.75 gstregistry.c
+--- gstreamer-cvs/gst/gstregistry.c	31 Jul 2007 11:51:38 -0000	1.75
++++ gstreamer-cvs/gst/gstregistry.c	8 Jan 2008 14:12:40 -0000
+@@ -813,6 +813,16 @@
+     GST_LOG_OBJECT (registry, "examining file: %s", filename);
+ 
+     if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
++      /* 
++       * skip .debug directories, these contain elf files that can crash
++       * dlopen 
++       */
++      if (g_str_equal (dirent, ".debug")) {
++        GST_LOG_OBJECT (registry, "found .debug directory, ignoring");
++        g_free (filename);
++        continue;
++      }
++
+       if (level > 0) {
+         GST_LOG_OBJECT (registry, "found directory, recursing");
+         changed |= gst_registry_scan_path_level (registry, filename, level - 1);
diff --git a/meta/packages/gstreamer/gstreamer_0.10.14.bb b/meta/packages/gstreamer/gstreamer_0.10.14.bb
index 7a37770f7..33deedc45 100644
--- a/meta/packages/gstreamer/gstreamer_0.10.14.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.14.bb
@@ -5,12 +5,13 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "glib-2.0 gettext-native libxml2 bison-native flex-native"
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
-           file://gst-inspect-check-error.patch;patch=1"
+           file://gst-inspect-check-error.patch;patch=1 \
+        file://gstreamer-omit-debug-directories.patch;patch=1;pnum=0"
 #           file://gstregistrybinary.c \
 #           file://gstregistrybinary.h \
 #           file://gstreamer-0.9-binary-registry.patch;patch=1"
-- 
cgit v1.2.3