[SCM] audacity/master: Fix default LADSPA search paths on Linux.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f9bf2cdb0afe1937b2e626c78ff0e8dba9d5a3e2
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat May 31 22:02:02 2014 +0200

    Fix default LADSPA search paths on Linux.
    
    The default LADSPA search paths should be
    /home/<user>/.ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa according to
    http://www.ladspa.org/ladspa_sdk/shared_plugins.html
    
    Additional search in the ladspa subdirectory of the system library directory
    (which could be /usr/lib/x86_64-linux-gnu/ on Debian, for example).
    
    Closes: #724836
    LP: #1261654

diff --git a/debian/patches/fix-ladspa-search-path.patch b/debian/patches/fix-ladspa-search-path.patch
new file mode 100644
index 0000000..b920a2b
--- /dev/null
+++ b/debian/patches/fix-ladspa-search-path.patch
@@ -0,0 +1,24 @@
+Description: Fix default LADSPA search paths on Linux.
+ The default LADSPA search paths should be
+ /home/<user>/.ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa according to
+ http://www.ladspa.org/ladspa_sdk/shared_plugins.html
+ .
+ Additional search in the ladspa subdirectory of the system library directory
+ (which could be /usr/lib/x86_64-linux-gnu/ on Debian, for example).
+Author: Benjamin Drung <bdrung at debian.org>
+Bug-Debian: http://bugs.debian.org/724836
+Bug-Ubuntu: https://launchpad.net/bugs/1261654
+
+--- a/src/effects/ladspa/LoadLadspa.cpp
++++ b/src/effects/ladspa/LoadLadspa.cpp
+@@ -286,8 +286,9 @@
+       wxGetApp().AddMultiPathsToPathList(pathVar, pathList);
+ 
+    #ifdef __WXGTK__
+-   wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
++   wxGetApp().AddUniquePathToPathList(wxT("~/.ladspa"), pathList);
+    wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
++   wxGetApp().AddUniquePathToPathList(wxT("/usr/lib/ladspa"), pathList);
+    wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
+    #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ccbbc06..7846144 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ distclean.patch
 path-max.patch
 ffmpeg.patch
 remove-strict-prototype-warnings.patch
+fix-ladspa-search-path.patch

-- 
Audacity debian packaging