Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/geany/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/cpupower.conf
	community/linux-tools/cpupower.rc
	community/stk/PKGBUILD
	core/patch/PKGBUILD
	core/systemd/PKGBUILD
	extra/lftp/PKGBUILD
	extra/lftp/lftp-4.3.8-gets.patch
	extra/mysql/PKGBUILD
	extra/qt/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/gcr/PKGBUILD
	gnome-unstable/glibmm/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/pango/PKGBUILD
	gnome-unstable/polkit/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/wine/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus/PKGBUILD
	testing/libusbx/PKGBUILD
	testing/systemd/PKGBUILD
	testing/xf86-video-intel/PKGBUILD

3 files changed, 46 insertions, 5 deletions

diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD
index e7009dfdf..be50e285b 100644
--- a/extra/ladspa/PKGBUILD
+++ b/extra/ladspa/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 137623 2011-09-10 08:28:05Z pierre $
+# $Id: PKGBUILD 167138 2012-09-26 05:02:07Z foutrelis $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=ladspa
 pkgver=1.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 arch=("i686" "x86_64" 'mips64el')
 license=('LGPL')
 url="http://www.ladspa.org/"
 depends=('gcc-libs')
 source=("http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz"
-        'hardcode-path.patch')
+        'fix-memleak-in-plugin-scanning.patch'
+        'fallback-ladspa-path.patch')
 md5sums=('671be3e1021d0722cadc7fb27054628e'
-         '27743258232d828575d66940e6de2858')
+         '478c400e04c9db9cfd6ee1198beec9c5'
+         '8a0ad7d442662af160381e7302c6ed4c')
 
 build() {
   cd "${srcdir}/${pkgname}_sdk/src"
-  patch -Np1 -i "${srcdir}/hardcode-path.patch"
+  patch -Np1 -i "${srcdir}/fix-memleak-in-plugin-scanning.patch"
+  patch -Np2 -i "${srcdir}/fallback-ladspa-path.patch"
   sed \
     -e 's/mkdirhier/mkdir -p/' \
     -e "s#-O3#${CFLAGS} ${LDFLAGS/,--as-needed/}#" \
diff --git a/extra/ladspa/fallback-ladspa-path.patch b/extra/ladspa/fallback-ladspa-path.patch
new file mode 100644
index 000000000..7743bf4b4
--- /dev/null
+++ b/extra/ladspa/fallback-ladspa-path.patch
@@ -0,0 +1,27 @@
+diff -upr ladspa_sdk.orig/src/load.c ladspa_sdk/src/load.c
+--- ladspa_sdk.orig/src/load.c	2012-09-26 07:37:24.000000000 +0300
++++ ladspa_sdk/src/load.c	2012-09-26 07:38:58.000000000 +0300
+@@ -54,6 +54,8 @@ dlopenLADSPA(const char * pcFilename, in
+        to search. */
+ 
+     pcLADSPAPath = getenv("LADSPA_PATH");
++    if (! pcLADSPAPath)
++      pcLADSPAPath = "/usr/lib/ladspa";
+     
+     if (pcLADSPAPath) {
+ 
+diff -upr ladspa_sdk.orig/src/search.c ladspa_sdk/src/search.c
+--- ladspa_sdk.orig/src/search.c	2012-09-26 07:37:24.000000000 +0300
++++ ladspa_sdk/src/search.c	2012-09-26 07:38:46.000000000 +0300
+@@ -99,10 +99,7 @@ LADSPAPluginSearch(LADSPAPluginSearchCal
+ 
+   pcLADSPAPath = getenv("LADSPA_PATH");
+   if (!pcLADSPAPath) {
+-    fprintf(stderr,
+-	    "Warning: You do not have a LADSPA_PATH "
+-	    "environment variable set.\n");
+-    return;
++    pcLADSPAPath = "/usr/lib/ladspa";
+   }
+   
+   pcStart = pcLADSPAPath;
diff --git a/extra/ladspa/fix-memleak-in-plugin-scanning.patch b/extra/ladspa/fix-memleak-in-plugin-scanning.patch
new file mode 100644
index 000000000..76cb2e864
--- /dev/null
+++ b/extra/ladspa/fix-memleak-in-plugin-scanning.patch
@@ -0,0 +1,11 @@
+--- src/search.c.orig	2008-11-07 00:38:18.000000000 +0100
++++ src/search.c	2008-11-07 00:50:51.000000000 +0100
+@@ -83,6 +83,8 @@
+ 	dlclose(pcFilename);
+ 	free(pcFilename);
+       }
++    } else {
++      free(pcFilename);
+     }
+   }
+ }