[Pkg-gstreamer-commits] [SCM] GStreamer Core 1.0 Packaging branch, master, updated. debian/0.11.1-2-21-g928c650
Sebastian Dröge
sebastian.droege at collabora.co.uk
Wed May 2 15:55:52 UTC 2012
The following commit has been merged in the master branch:
commit 928c650ece6aadc72b29cef0bffef1bbd461f4da
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date: Wed May 2 17:27:57 2012 +0200
80_ia32-hack.patch: Dropped, shouldn't be needed anymore.
diff --git a/debian/changelog b/debian/changelog
index 0b426ea..db60ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ gstreamer1.0 (0.11.90-1) experimental; urgency=low
backwards compatibility anymore.
* Remove libxml2-dev build-dependency again.
* Update copyright.
+ * 80_ia32-hack.patch: Dropped, shouldn't be needed anymore.
- -- Sebastian Dröge <slomo at debian.org> Wed, 02 May 2012 17:22:42 +0200
+ -- Sebastian Dröge <slomo at debian.org> Wed, 02 May 2012 17:27:44 +0200
gstreamer0.11 (0.11.1-3) UNRELEASED; urgency=low
diff --git a/debian/patches/80_ia32-hack.patch b/debian/patches/80_ia32-hack.patch
deleted file mode 100644
index b28fd10..0000000
--- a/debian/patches/80_ia32-hack.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: gstreamer0.11/gst/gstregistry.c
-===================================================================
---- gstreamer0.11.orig/gst/gstregistry.c 2011-12-12 11:50:39.093747189 +0100
-+++ gstreamer0.11/gst/gstregistry.c 2011-12-12 11:50:41.941747231 +0100
-@@ -121,6 +121,10 @@
- #include <stdio.h>
- #include <string.h>
-
-+#ifdef HAVE_SYS_UTSNAME_H
-+#include <sys/utsname.h>
-+#endif
-+
- /* For g_stat () */
- #include <glib/gstdio.h>
-
-@@ -1507,6 +1511,9 @@
- * path, and the plugins installed in the user's home directory */
- plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH");
- if (plugin_path == NULL) {
-+#if defined(__linux__) && defined (__i386__)
-+ struct utsname uts;
-+#endif
- char *home_plugins, *backwards_compat_plugins;
-
- GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set");
-@@ -1527,6 +1534,16 @@
- /* finally, look in the /usr/lib backwards-compatibility path. */
- backwards_compat_plugins = g_build_filename ("/usr/lib",
- "gstreamer-" GST_API_VERSION, NULL);
-+#if defined(__linux__) && defined (__i386__)
-+ uname(&uts);
-+ if (!strcmp("x86_64", uts.machine)
-+ && !access("/usr/lib32/gstreamer-0.10", R_OK|X_OK))
-+ {
-+ g_free (backwards_compat_plugins);
-+ backwards_compat_plugins = g_build_filename ("/usr/lib32",
-+ "gstreamer-" GST_API_VERSION, NULL);
-+ }
-+#endif
- GST_DEBUG ("scanning plugins %s", backwards_compat_plugins);
- changed |= gst_registry_scan_path_internal (&context, backwards_compat_plugins);
- g_free (backwards_compat_plugins);
diff --git a/debian/patches/series b/debian/patches/series
index 1858e7c..2497acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-80_ia32-hack.patch
99_ltmain_as-needed.patch
--
GStreamer Core 1.0 Packaging
More information about the Pkg-gstreamer-commits
mailing list