[arch-commits] Commit in ladspa/trunk (PKGBUILD fallback-ladspa-path.patch)

[Antonio Rojas]

    Date: Wednesday, February 6, 2019 @ 08:38:59
  Author: arojas
Revision: 345325

Update to 1.15

Modified:
  ladspa/trunk/PKGBUILD
Deleted:
  ladspa/trunk/fallback-ladspa-path.patch

----------------------------+
 PKGBUILD                   |   37 ++++++++++++++++++++-----------------
 fallback-ladspa-path.patch |   27 ---------------------------
 2 files changed, 20 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-06 08:22:20 UTC (rev 345324)
+++ PKGBUILD	2019-02-06 08:38:59 UTC (rev 345325)
@@ -1,34 +1,37 @@
 # Maintainer: damir <damir at archlinux.org>
+# Contributor: David Runge <dave at sleepmap.de>
 
 pkgname=ladspa
-pkgver=1.13
-pkgrel=7
+pkgver=1.15
+pkgrel=1
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 arch=('x86_64')
 license=('LGPL')
-url="http://www.ladspa.org/"
+url="https://www.ladspa.org/"
 depends=('gcc-libs')
-source=("https://github.com/OpenMandrivaAssociation/ladspa/raw/master/${pkgname}_sdk_${pkgver}.tgz"
-        'fix-memleak-in-plugin-scanning.patch'
-        'fallback-ladspa-path.patch')
-md5sums=('671be3e1021d0722cadc7fb27054628e'
-         '478c400e04c9db9cfd6ee1198beec9c5'
-         '8a0ad7d442662af160381e7302c6ed4c')
+source=("https://ladspa.org/download/ladspa_sdk_${pkgver}.tgz"
+        'fix-memleak-in-plugin-scanning.patch')
+sha512sums=('a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65'
+            'e80a575e6afe42f9d0ac1234a7832a29fb9362c7ab7b2d6b14cc3e6da6a9ba67af886cf09f1c0b78c161205084f705049fb4dc22fe2795efaeb7d94da90dc93e')
 
+prepare() {
+  mv -v ${pkgname}_sdk_${pkgver} ${pkgname}-${pkgver}
+  cd "${pkgname}-${pkgver}"
+  patch -Np0 -i "../fix-memleak-in-plugin-scanning.patch"
+  # add LDFLAGS for full RELRO
+  sed -e "s#-O2#${CFLAGS} ${LDFLAGS}#" -i src/Makefile
+}
+
 build() {
-  cd "${srcdir}/${pkgname}_sdk/src"
-  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/}#" \
-    -i makefile
+  cd "${pkgname}-${pkgver}/src"
   make targets
 }
 
 package() {
-  cd "${srcdir}/${pkgname}_sdk/src"
+  cd "${pkgname}-${pkgver}/src"
   make INSTALL_PLUGINS_DIR="${pkgdir}/usr/lib/ladspa/" \
        INSTALL_INCLUDE_DIR="${pkgdir}/usr/include/" \
        INSTALL_BINARY_DIR="${pkgdir}/usr/bin/" install
+  install -vDm 644 ../doc/*.{html,txt} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
+

Deleted: fallback-ladspa-path.patch
===================================================================
--- fallback-ladspa-path.patch	2019-02-06 08:22:20 UTC (rev 345324)
+++ fallback-ladspa-path.patch	2019-02-06 08:38:59 UTC (rev 345325)
@@ -1,27 +0,0 @@
-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;