[gst-cvs] gst-plugins-bad: frei0r: Load plugins in /usr/{local/, }lib{32, 64}/ frei0r-1 too

[Olivier Crête]

Module: gst-plugins-bad
Branch: master
Commit: 3579c1164b6420e2aef31028ef09230e3d33925d
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=3579c1164b6420e2aef31028ef09230e3d33925d

Author: Olivier Crête <olivier.crete at collabora.co.uk>
Date:   Fri Aug  6 03:19:16 2010 +0200

frei0r: Load plugins in /usr/{local/,}lib{32,64}/frei0r-1 too

Loads the plugins in more paths where they could be installed by
multilib distributions.

Fixes #623710

---

 gst/frei0r/gstfrei0r.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c
index baca1a8..6d2c6fc 100644
--- a/gst/frei0r/gstfrei0r.c
+++ b/gst/frei0r/gstfrei0r.c
@@ -631,7 +631,9 @@ plugin_init (GstPlugin * plugin)
 
   gst_plugin_add_dependency_simple (plugin,
       "HOME/.frei0r-1/lib",
-      "/usr/lib/frei0r-1:/usr/local/lib/frei0r-1",
+      "/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:"
+      "/usr/lib32/frei0r-1:/usr/local/lib32/frei0r-1:"
+      "/usr/lib64/frei0r-1:/usr/local/lib64/frei0r-1",
       NULL, GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
 
   homedir = g_get_home_dir ();
@@ -641,6 +643,10 @@ plugin_init (GstPlugin * plugin)
 
   register_plugins (plugin, "/usr/local/lib/frei0r-1");
   register_plugins (plugin, "/usr/lib/frei0r-1");
+  register_plugins (plugin, "/usr/local/lib32/frei0r-1");
+  register_plugins (plugin, "/usr/lib32/frei0r-1");
+  register_plugins (plugin, "/usr/local/lib64/frei0r-1");
+  register_plugins (plugin, "/usr/lib64/frei0r-1");
 
   return TRUE;
 }