From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 22 Apr 2017 12:28:51 +0000 (+0530)
Subject: gst-uninstalled: Match plugin path when lib64 is libdir
X-Git-Tag: 1.19.3~481^2~369
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71cf22cc19a41c578a1f24721d66ce6c3a4d24cb;p=platform%2Fupstream%2Fgstreamer.git

gst-uninstalled: Match plugin path when lib64 is libdir

Fixes setting of GST_PLUGIN_PATH on Fedora 64-bit
---

diff --git a/gst-uninstalled.py b/gst-uninstalled.py
index 724f748..acd91b3 100755
--- a/gst-uninstalled.py
+++ b/gst-uninstalled.py
@@ -45,6 +45,7 @@ def get_subprocess_env(options):
 
     sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll')
     typelib_reg = re.compile(r'.*\.typelib$')
+    pluginpath_reg = re.compile(r'lib\w*' + os.path.normpath('/gstreamer-1.0/'))
 
     if os.name is 'nt':
         lib_path_envvar = 'PATH'
@@ -69,8 +70,7 @@ def get_subprocess_env(options):
         elif sharedlib_reg.search(filename):
             if target.get('type') != "shared library":
                 continue
-
-            if os.path.normpath("lib/gstreamer-1.0") in os.path.normpath(target.get('install_filename')):
+            if pluginpath_reg.search(os.path.normpath(target.get('install_filename'))):
                 prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(options.builddir, root))
                 continue