[arch-commits] Commit in swh-plugins/trunk (PKGBUILD use_system_gsm.patch)

[David Runge]

    Date: Friday, February 23, 2018 @ 23:12:30
  Author: dvzrv
Revision: 297276

upgpkg: swh-plugins 0.4.17-2

Applying patch to use system gsm library.

Added:
  swh-plugins/trunk/use_system_gsm.patch
Modified:
  swh-plugins/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   15 +++++++++-----
 use_system_gsm.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-23 22:36:30 UTC (rev 297275)
+++ PKGBUILD	2018-02-23 23:12:30 UTC (rev 297276)
@@ -1,25 +1,30 @@
 # $Id$
 # Maintainer: David Runge <dave at sleepmap.de>
 # Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Rob Til Freedmen <rob.til.freedman at gmail.com>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 # Contributor: Robert Emil Berge
 
 pkgname=swh-plugins
 pkgver=0.4.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Steve Harris' LADSPA plug-ins suite"
 arch=('x86_64')
 url="http://plugin.org.uk/"
 license=('GPL2')
-depends=('fftw' 'ladspa')
+depends=('fftw' 'ladspa' 'gsm')
 makedepends=('libxml2' 'perl-xml-parser')
-groups=('ladspa-plugins')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/swh/ladspa/archive/v${pkgver}.tar.gz")
-sha512sums=('6b566030b43c3929ce8938648abd458efa0fea0b4916410a34b4f4fa788c45e4a6ec3f46ca435f8546179ff0c4674303db22314e1c1f1d09e5f2b71e6c5aecc7')
+groups=('ladspa-plugins' 'pro-audio')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/swh/ladspa/archive/v${pkgver}.tar.gz"
+        'use_system_gsm.patch')
+sha512sums=('6b566030b43c3929ce8938648abd458efa0fea0b4916410a34b4f4fa788c45e4a6ec3f46ca435f8546179ff0c4674303db22314e1c1f1d09e5f2b71e6c5aecc7'
+            '7080a115442d682bdad17b2bfa2694ba5f6ef53efcd214748fe26133dda6a79726f57e34819e2324d1bf0a999baf5c895cba488658cc9695d4903755dce5774f')
 
 prepare() {
   mv -v ladspa-${pkgver} "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
+  # patching to use system gsm library
+  patch -Np1 -i "${srcdir}/use_system_gsm.patch"
   autoreconf -vfi
   export CFLAGS="$CFLAGS -fPIC"
 }

Added: use_system_gsm.patch
===================================================================
--- use_system_gsm.patch	                        (rev 0)
+++ use_system_gsm.patch	2018-02-23 23:12:30 UTC (rev 297276)
@@ -0,0 +1,51 @@
+Description: Use system-wide copies of gsm.h.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: not-needed
+
+Index: swh-plugins/gsm_1215.xml
+===================================================================
+--- swh-plugins.orig/gsm_1215.xml
++++ swh-plugins/gsm_1215.xml
+@@ -9,7 +9,7 @@
+     <code><![CDATA[
+       #include <stdlib.h>
+       #include "ladspa-util.h"
+-      #include "gsm/gsm.h"
++      #include <gsm/gsm.h>
+       #include "util/biquad.h"
+ 
+       #define SCALE 32768.0f
+Index: swh-plugins/configure.ac
+===================================================================
+--- swh-plugins.orig/configure.ac
++++ swh-plugins/configure.ac
+@@ -143,7 +143,6 @@ AC_SUBST(LIBTOOL)
+ AC_OUTPUT([
+ Makefile
+ util/Makefile
+-gsm/Makefile
+ gverb/Makefile
+ metadata/Makefile
+ po/Makefile.in
+Index: swh-plugins/Makefile.am
+===================================================================
+--- swh-plugins.orig/Makefile.am
++++ swh-plugins/Makefile.am
+@@ -34,7 +34,7 @@ plugin_LTLIBRARIES = \
+ 	latency_1914.la xfade_1915.la sc4m_1916.la \
+ 	mbeq_1197.la pitch_scale_1193.la pitch_scale_1194.la imp_1199.la
+ 
+-SUBDIRS = po util gsm gverb metadata
++SUBDIRS = po util gverb metadata
+ 
+ # Wacky stuff to stop automake getting confused
+ EXTRA_DIST = config.rpath  @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
+@@ -73,7 +73,7 @@ sc3_1427_la_LIBADD = -Lutil -ldb -lrms
+ sc4_1882_la_LIBADD = -Lutil -ldb -lrms
+ sc4m_1916_la_LIBADD = -Lutil -ldb -lrms
+ se4_1883_la_LIBADD = -Lutil -ldb -lrms
+-gsm_1215_la_LIBADD = gsm/libgsm.a
++gsm_1215_la_LIBADD = -lgsm
+ gverb_1216_la_LIBADD = -Lgverb -lgverb
+ lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
+