[arch-commits] Commit in ladspa/trunk (4 files)

[Evangelos Foutras]

    Date: Wednesday, September 26, 2012 @ 01:01:40
  Author: foutrelis
Revision: 167137

upgpkg: ladspa 1.13-4

Fix FS#4577; move memleak fix into separate patch.

Added:
  ladspa/trunk/fallback-ladspa-path.patch
    (from rev 167136, ladspa/trunk/hardcode-path.patch)
  ladspa/trunk/fix-memleak-in-plugin-scanning.patch
Modified:
  ladspa/trunk/PKGBUILD
Deleted:
  ladspa/trunk/hardcode-path.patch

--------------------------------------+
 PKGBUILD                             |   11 +++++++----
 fallback-ladspa-path.patch           |   27 +++++++++++++++++++++++++++
 fix-memleak-in-plugin-scanning.patch |   11 +++++++++++
 hardcode-path.patch                  |   28 ----------------------------
 4 files changed, 45 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-26 02:03:09 UTC (rev 167136)
+++ PKGBUILD	2012-09-26 05:01:40 UTC (rev 167137)
@@ -3,20 +3,23 @@
 
 pkgname=ladspa
 pkgver=1.13
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 arch=('i686' 'x86_64')
 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/}#" \

Copied: ladspa/trunk/fallback-ladspa-path.patch (from rev 167136, ladspa/trunk/hardcode-path.patch)
===================================================================
--- fallback-ladspa-path.patch	                        (rev 0)
+++ fallback-ladspa-path.patch	2012-09-26 05:01:40 UTC (rev 167137)
@@ -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;

Added: fix-memleak-in-plugin-scanning.patch
===================================================================
--- fix-memleak-in-plugin-scanning.patch	                        (rev 0)
+++ fix-memleak-in-plugin-scanning.patch	2012-09-26 05:01:40 UTC (rev 167137)
@@ -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);
+     }
+   }
+ }

Deleted: hardcode-path.patch
===================================================================
--- hardcode-path.patch	2012-09-26 02:03:09 UTC (rev 167136)
+++ hardcode-path.patch	2012-09-26 05:01:40 UTC (rev 167137)
@@ -1,28 +0,0 @@
---- 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);
-     }
-   }
- }
-@@ -99,13 +101,10 @@
- 
-   pcLADSPAPath = getenv("LADSPA_PATH");
-   if (!pcLADSPAPath) {
--    fprintf(stderr,
--	    "Warning: You do not have a LADSPA_PATH "
--	    "environment variable set.\n");
--    return;
-+    pcStart = "/usr/lib/ladspa/";
-+  } else {
-+    pcStart = pcLADSPAPath;
-   }
--  
--  pcStart = pcLADSPAPath;
-   while (*pcStart != '\0') {
-     pcEnd = pcStart;
-     while (*pcEnd != ':' && *pcEnd != '\0')