Apply 2.2.0 diff from [community]

Except the removal of `autoreconf -vfi` which appears to still be
needed.

4 files changed, 491 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be6f2301c2fa..c6ee47d5ddea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,40 @@
 pkgbase = linuxsampler-vst
 	pkgdesc = Professional-grade audio sampler alternative to Gigasampler (including VST plugin)
-	pkgver = 2.1.1
-	pkgrel = 2
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = https://www.linuxsampler.org/
 	arch = x86_64
 	groups = pro-audio
 	license = GPL2
-	makedepends = ladspa
+	makedepends = clang
 	makedepends = dssi
+	makedepends = ladspa
 	makedepends = lv2
 	makedepends = steinberg-vst36
+	depends = alsa-lib
+	depends = libasound.so
+	depends = gcc-libs
+	depends = glibc
 	depends = libgig
+	depends = libgig.so
 	depends = jack
+	depends = libjack.so
+	depends = libsndfile
+	depends = libsndfile.so
 	depends = sqlite
+	optdepends = dssi-host: for DSSI plugin
+	optdepends = lv2-host: for LV2 plugin
 	provides = linuxsampler
+	provides = liblinuxsampler.so
 	conflicts = linuxsampler
-	source = https://download.linuxsampler.org/packages/linuxsampler-2.1.1.tar.bz2
-	sha512sums = 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
+	source = https://download.linuxsampler.org/packages/linuxsampler-2.2.0.tar.bz2
+	source = linuxsampler-2.2.0-libdir.patch
+	source = linuxsampler-2.2.0-libgig_package.patch
+	sha512sums = 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68
+	sha512sums = fd552a6efff47ddd0114f7d394d699ba2df624c5a9dfd3b88f754f38b4aa7c9e04523b79b179e1f4d8f73cb142158134d74a11eb8718f8a22ace2a0d5b2f0c86
+	sha512sums = 84c5e2a322783e33e83aa319466c5e49f32d4b5175f63515df7857ddcdb9d2a3a11afde376b77d1f18c474ab341d42d2d1e018ab2525971b680fe36abbd221d1
+	b2sums = 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a
+	b2sums = 98df780dfe7bf1a0379e7b4a15390aab411b1a5b8ef5c9c9fe04cdcd963ed572eeeaa00eb184017b61248bc396f58cfca571a748d6d17caf5030a447a05ebbf0
+	b2sums = 599ff6db7c87c4c4ee2306f62c6bec2a612d3c556c371a660430d09c93cda7b0b951f78e742d679407215fabb60939619fc9edcbf3813bf1665a9ee5fe0ddf95
 
 pkgname = linuxsampler-vst
-
diff --git a/PKGBUILD b/PKGBUILD
index ba8754f5409f..3ae9b2a2e8a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,47 @@
 # Maintainer: spider-mario <spidermario@free.fr>
-# Maintainer: David Runge <dave@sleepmap.de>
+# Maintainer: David Runge <dvzrv@archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: svoufff <svoufff at gmail dot com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 _pkgname=linuxsampler
 pkgname=linuxsampler-vst
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Professional-grade audio sampler alternative to Gigasampler (including VST plugin)"
 arch=('x86_64')
 url="https://www.linuxsampler.org/"
 license=('GPL2')
 groups=('pro-audio')
-depends=('libgig' 'jack' 'sqlite')
-makedepends=('ladspa' 'dssi' 'lv2' 'steinberg-vst36')
-provides=("${_pkgname}")
+depends=('alsa-lib' 'libasound.so' 'gcc-libs' 'glibc' 'libgig' 'libgig.so'
+'jack' 'libjack.so' 'libsndfile' 'libsndfile.so' 'sqlite')
+makedepends=('clang' 'dssi' 'ladspa' 'lv2' 'steinberg-vst36')
+optdepends=('dssi-host: for DSSI plugin'
+            'lv2-host: for LV2 plugin')
+provides=("${_pkgname}" 'liblinuxsampler.so')
 conflicts=("${_pkgname}")
-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-libdir.patch"
+        "${_pkgname}-2.2.0-libgig_package.patch")
+sha512sums=('9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68'
+            'fd552a6efff47ddd0114f7d394d699ba2df624c5a9dfd3b88f754f38b4aa7c9e04523b79b179e1f4d8f73cb142158134d74a11eb8718f8a22ace2a0d5b2f0c86'
+            '84c5e2a322783e33e83aa319466c5e49f32d4b5175f63515df7857ddcdb9d2a3a11afde376b77d1f18c474ab341d42d2d1e018ab2525971b680fe36abbd221d1')
+b2sums=('9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a'
+        '98df780dfe7bf1a0379e7b4a15390aab411b1a5b8ef5c9c9fe04cdcd963ed572eeeaa00eb184017b61248bc396f58cfca571a748d6d17caf5030a447a05ebbf0'
+        '599ff6db7c87c4c4ee2306f62c6bec2a612d3c556c371a660430d09c93cda7b0b951f78e742d679407215fabb60939619fc9edcbf3813bf1665a9ee5fe0ddf95')
 
-prepare() {
+prepare(){
   cd "${_pkgname}-${pkgver}"
   autoreconf -vfi
-  # creating a ld.so.conf entry for linuxsampler.so
-  echo "/usr/lib/${_pkgname}" > "${pkgname}.conf"
+  # install shared object in global namespace
+  patch -Np1 -i ../"${_pkgname}-2.2.0-libdir.patch"
+  # fix generation of instruments in package()
+  patch -Np1 -i ../"${_pkgname}-2.2.0-libgig_package.patch"
 }
 
 build() {
   cd "${_pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-vstsdk-dir=/usr/include/vst36/
+  CXX=clang++ CC=clang ./configure --prefix=/usr --enable-vstsdk-dir=/usr/include/vst36/
   make
 }
 
@@ -39,9 +51,6 @@ package() {
   # 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}"
diff --git a/linuxsampler-2.2.0-libdir.patch b/linuxsampler-2.2.0-libdir.patch
new file mode 100644
index 000000000000..cd89099bd9ba
--- /dev/null
+++ b/linuxsampler-2.2.0-libdir.patch
@@ -0,0 +1,431 @@
+diff -ruN a/Artwork/Makefile.in b/Artwork/Makefile.in
+--- a/Artwork/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/Artwork/Makefile.in	2021-06-03 18:30:10.963664740 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/Documentation/Engines/Makefile.in b/Documentation/Engines/Makefile.in
+--- a/Documentation/Engines/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/Documentation/Engines/Makefile.in	2021-06-03 18:29:20.283645118 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/Documentation/Engines/gig/Makefile.in b/Documentation/Engines/gig/Makefile.in
+--- a/Documentation/Engines/gig/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/Documentation/Engines/gig/Makefile.in	2021-06-03 18:41:56.388041211 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/Documentation/Makefile.in b/Documentation/Makefile.in
+--- a/Documentation/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/Documentation/Makefile.in	2021-06-03 18:01:05.488845036 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/Makefile.in	2021-06-03 18:42:04.861392398 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/linuxsampler.pc.in b/linuxsampler.pc.in
+--- a/linuxsampler.pc.in	2007-05-30 01:59:36.000000000 +0200
++++ b/linuxsampler.pc.in	2021-06-03 18:01:30.448923989 +0200
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@/linuxsampler
++libdir=@libdir@
+ includedir=@includedir@
+ plugindir=@libdir@/linuxsampler/plugins
+ 
+diff -ruN a/man/Makefile.in b/man/Makefile.in
+--- a/man/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/man/Makefile.in	2021-06-03 18:30:45.210350835 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/scripts/Makefile.in b/scripts/Makefile.in
+--- a/scripts/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/scripts/Makefile.in	2021-06-03 18:29:57.810325235 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/src/Makefile.in	2021-06-03 18:30:24.540338536 +0200
+@@ -74,8 +74,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/common/Makefile.in b/src/common/Makefile.in
+--- a/src/common/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/src/common/Makefile.in	2021-06-03 18:40:50.091237574 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/db/Makefile.in b/src/db/Makefile.in
+--- a/src/db/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/src/db/Makefile.in	2021-06-03 18:31:00.433694298 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/drivers/Makefile.in b/src/drivers/Makefile.in
+--- a/src/drivers/Makefile.in	2021-05-09 14:11:11.000000000 +0200
++++ b/src/drivers/Makefile.in	2021-06-03 18:38:09.900929911 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/drivers/audio/Makefile.in b/src/drivers/audio/Makefile.in
+--- a/src/drivers/audio/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/drivers/audio/Makefile.in	2021-06-03 18:39:27.331074101 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/drivers/midi/Makefile.in b/src/drivers/midi/Makefile.in
+--- a/src/drivers/midi/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/drivers/midi/Makefile.in	2021-06-03 18:40:22.244514915 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/effects/Makefile.in b/src/effects/Makefile.in
+--- a/src/effects/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/effects/Makefile.in	2021-06-03 18:37:55.930904906 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/engines/Makefile.in b/src/engines/Makefile.in
+--- a/src/engines/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/engines/Makefile.in	2021-06-03 18:31:36.570388507 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/engines/common/Makefile.in b/src/engines/common/Makefile.in
+--- a/src/engines/common/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/engines/common/Makefile.in	2021-06-03 18:31:59.410408324 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/engines/gig/Makefile.in b/src/engines/gig/Makefile.in
+--- a/src/engines/gig/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/engines/gig/Makefile.in	2021-06-03 18:37:07.690821150 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/engines/sf2/Makefile.in b/src/engines/sf2/Makefile.in
+--- a/src/engines/sf2/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/engines/sf2/Makefile.in	2021-06-03 18:36:50.820792859 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/engines/sfz/Makefile.in b/src/engines/sfz/Makefile.in
+--- a/src/engines/sfz/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/engines/sfz/Makefile.in	2021-06-03 18:32:23.620431259 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/hostplugins/Makefile.in b/src/hostplugins/Makefile.in
+--- a/src/hostplugins/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/hostplugins/Makefile.in	2021-06-03 18:38:31.964303391 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/hostplugins/au/Makefile.in b/src/hostplugins/au/Makefile.in
+--- a/src/hostplugins/au/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/hostplugins/au/Makefile.in	2021-06-03 18:39:47.204445865 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/hostplugins/dssi/Makefile.in b/src/hostplugins/dssi/Makefile.in
+--- a/src/hostplugins/dssi/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/hostplugins/dssi/Makefile.in	2021-06-03 18:40:00.301138149 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/hostplugins/lv2/Makefile.in b/src/hostplugins/lv2/Makefile.in
+--- a/src/hostplugins/lv2/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/hostplugins/lv2/Makefile.in	2021-06-03 18:38:45.100994326 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/hostplugins/vst/Makefile.in b/src/hostplugins/vst/Makefile.in
+--- a/src/hostplugins/vst/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/hostplugins/vst/Makefile.in	2021-06-03 18:39:08.147704203 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/network/Makefile.in b/src/network/Makefile.in
+--- a/src/network/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/network/Makefile.in	2021-06-03 18:37:35.890869613 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/plugins/Makefile.in b/src/plugins/Makefile.in
+--- a/src/plugins/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/plugins/Makefile.in	2021-06-03 18:37:20.050842214 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/scriptvm/Makefile.in b/src/scriptvm/Makefile.in
+--- a/src/scriptvm/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/scriptvm/Makefile.in	2021-06-03 18:31:20.187042091 +0200
+@@ -73,8 +73,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/scriptvm/editor/Makefile.in b/src/scriptvm/editor/Makefile.in
+--- a/src/scriptvm/editor/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/scriptvm/editor/Makefile.in	2021-06-03 18:41:09.957944762 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/shell/Makefile.in b/src/shell/Makefile.in
+--- a/src/shell/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/shell/Makefile.in	2021-06-03 18:40:34.181205467 +0200
+@@ -72,8 +72,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+diff -ruN a/src/testcases/Makefile.in b/src/testcases/Makefile.in
+--- a/src/testcases/Makefile.in	2021-05-09 14:11:12.000000000 +0200
++++ b/src/testcases/Makefile.in	2021-06-03 18:41:25.604643663 +0200
+@@ -71,8 +71,8 @@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkglibdir = $(libdir)/
++pkglibexecdir = $(libexecdir)/
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
diff --git a/linuxsampler-2.2.0-libgig_package.patch b/linuxsampler-2.2.0-libgig_package.patch
new file mode 100644
index 000000000000..401c429ab0df
--- /dev/null
+++ b/linuxsampler-2.2.0-libgig_package.patch
@@ -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