[arch-commits] Commit in linuxsampler/trunk (2 files)

[David Runge]

    Date: Wednesday, June 2, 2021 @ 21:28:55
  Author: dvzrv
Revision: 953457

upgpkg: linuxsampler 2.2.0-1: Upgrade to 2.2.0.

Switch to clang for build(), as that's what upstream recommends.
Remove all ld.so.conf integration, as things should (hopefully) work without.
Add dssi-host and lv2-host to optdepends for the respective plugins.

Added:
  linuxsampler/trunk/linuxsampler-2.2.0-libgig_package.patch
Modified:
  linuxsampler/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   28 ++++++++++++++++------------
 linuxsampler-2.2.0-libgig_package.patch |   12 ++++++++++++
 2 files changed, 28 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-02 21:24:07 UTC (rev 953456)
+++ PKGBUILD	2021-06-02 21:28:55 UTC (rev 953457)
@@ -4,29 +4,36 @@
 # Contributor: Shinlun Hsieh <yngwiexx at yahoo.com.tw>
 
 pkgname=linuxsampler
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Professional-grade audio sampler alternative to Gigasampler"
 arch=('x86_64')
 url="https://www.linuxsampler.org/"
 license=('GPL2')
 groups=('pro-audio')
-depends=('alsa-lib' 'gcc-libs' 'glibc' 'libgig.so' 'libjack.so' 'sqlite')
-makedepends=('dssi' 'ladspa' 'lv2')
+depends=('alsa-lib' 'libasound.so' 'gcc-libs' 'glibc' 'libgig' 'libgig.so'
+'jack' 'libjack.so' 'libsndfile' 'libsndfile.so' 'sqlite')
+makedepends=('clang' 'dssi' 'ladspa' 'lv2')
+optdepends=('dssi-host: for DSSI plugin'
+            'lv2-host: for LV2 plugin')
 provides=('liblinuxsampler.so')
-source=("https://download.linuxsampler.org/packages/${pkgname}-${pkgver}.tar.bz2")
-sha512sums=('3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c')
+source=("https://download.linuxsampler.org/packages/${pkgname}-${pkgver}.tar.bz2"
+        "${pkgname}-2.2.0-libgig_package.patch")
+sha512sums=('9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68'
+            '84c5e2a322783e33e83aa319466c5e49f32d4b5175f63515df7857ddcdb9d2a3a11afde376b77d1f18c474ab341d42d2d1e018ab2525971b680fe36abbd221d1')
+b2sums=('9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a'
+        '599ff6db7c87c4c4ee2306f62c6bec2a612d3c556c371a660430d09c93cda7b0b951f78e742d679407215fabb60939619fc9edcbf3813bf1665a9ee5fe0ddf95')
 
 prepare(){
   cd "${pkgname}-${pkgver}"
+  # fix generation of instruments in package()
+  patch -Np1 -i ../"${pkgname}-2.2.0-libgig_package.patch"
   autoreconf -vfi
-  # creating a ld.so.conf entry for linuxsampler.so
-  echo "/usr/lib/${pkgname}" > "${pkgname}.conf"
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  CXX=clang++ CC=clang ./configure --prefix=/usr
   make
 }
 
@@ -36,9 +43,6 @@
   # docs
   install -vDm 644 {AUTHORS,ChangeLog,NEWS,README} \
     -t "${pkgdir}/usr/share/doc/${pkgname}"
-  # adding linuxsampler.so library path to ld.so.conf (required for dependants
-  # during runtime)
-  install -vDm 644 "${pkgname}.conf" -t "${pkgdir}/etc/ld.so.conf.d/"
   # lscp files conflict with nilfs-utils:
   # https://bugs.archlinux.org/task/45827
   mv -v "${pkgdir}/usr/bin/lscp" "${pkgdir}/usr/bin/lscp-${pkgname}"

Added: linuxsampler-2.2.0-libgig_package.patch
===================================================================
--- linuxsampler-2.2.0-libgig_package.patch	                        (rev 0)
+++ linuxsampler-2.2.0-libgig_package.patch	2021-06-02 21:28:55 UTC (rev 953457)
@@ -0,0 +1,12 @@
+diff -ruN a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2016-04-20 17:22:58.000000000 +0200
++++ b/Makefile.am	2021-06-02 23:21:56.230175969 +0200
+@@ -32,7 +32,7 @@
+ 	echo "*** LinuxSampler was compiled with instruments DB support and"; \
+ 	echo "*** $(DESTDIR)/var/lib/linuxsampler/instruments.db"; \
+ 	echo "*** doesn't exist yet, creating it now:"; \
+-	mkdir -p $(DESTDIR)/var/lib/linuxsampler && ./src/linuxsampler \
++	mkdir -p $(DESTDIR)/var/lib/linuxsampler && LD_LIBRARY_PATH="/usr/lib/libgig/:/usr/lib/" ./src/linuxsampler \
+ 	--create-instruments-db $(DESTDIR)/var/lib/linuxsampler/instruments.db ; \
+ 	fi
+ endif