media-sound/linuxsampler-9999: synced with the main tree

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

5 files changed, 93 insertions, 33 deletions

diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index ebdc21e30..97b7e9198 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,2 +1,4 @@
-EBUILD linuxsampler-9999.ebuild 1318 BLAKE2B a3bc42d976e3191ec380456f0a763b2f72b8f6b6760fd677cc50ab2cfe9ae0a6ca79e24afff6faac2b8eacb92f87fbebe55d9817e8647b06db63a1409a7a82aa SHA512 222ccdc5bd0bba8c360b127b2213252b98d448a8692f0a678244e035ec60cb4a5d642bfc04172c95323420ad3a1cf1235b58c06072c612f44f80e42a8fa96033
-MISC metadata.xml 328 BLAKE2B e56524043dc7ec6f27d080547c10413e55b2e8ec8be8382678c7eb02775349c8447e7ce2060f12fd095b67db054c5bb41d5422866f82aba915e53af6b40bf7a7 SHA512 cefe889a23b24b8fc6fc0d6bbdfa0d50871d068f0272734b1372af768123a1514034895d3e142f5722b0636934e2ba71b3bd1527941c6832bafe3be3a4eb346c
+AUX linuxsampler-2.0.0-lv2-automagic.patch 727 BLAKE2B 23d836320c5bdd8e022599c65d26c3c757828a348e9ce87d158e1bdc9f3fb82ae174cc08a7ee4b4981378c4fd556fb932b2dcd4cf7bdb88c27920fb8a2033f8f SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd
+AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
+EBUILD linuxsampler-9999.ebuild 1621 BLAKE2B ef639d5e4d584767d1638f44e547765419847562d7e9718f4e3ed54617c3364fb832961a00ef604f108e725b98dce3cecb58999083b1bb71a9e698122a87742e SHA512 a0de4125232af947c8365dd10ee3a2b9f5308ca4b0b0c93f4fd4e25e7530f9cace17bdc656d030f9e26e851139ec70b23edeeb6ced2b6aec7998f7141aebf3c8
+MISC metadata.xml 387 BLAKE2B 7541ab360589bcabe2e16f9514d1ccebc946238b0d643dac412079d05a39ad5c0f7712f28b2eebf721e715d2fc09e9b84e71b129064ca15366dc1838b506a099 SHA512 182b646afdd5143dac6c29febeeaae43a52621d2ebe53d042081a1a60f09f9fae10716c3738d1a2837e3d67d75452c12e08d02050015512e0381c43ff3d990b0
diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
new file mode 100644
index 000000000..a5b9f8d71
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
@@ -0,0 +1,21 @@
+--- linuxsampler-2.0.0/configure.ac
++++ linuxsampler-2.0.0/configure.ac
+@@ -532,12 +532,12 @@
+ AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
+ 
+ # LV2
+-PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+-if test "$config_have_lv2" != "yes"; then
+-    PKG_CHECK_MODULES(LV2, lv2core >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+-fi
+-AC_SUBST(LV2_CFLAGS)
+-AC_SUBST(LV2_LIBS)
++AC_ARG_ENABLE([lv2],
++	AS_HELP_STRING([--enable-lv2], [Enable building with lv2]))
++config_have_lv2="no"
++AS_IF([test "x$enable_lv2" = "xyes"], [
++	PKG_CHECK_MODULES([LV2], [lv2 >= 1.0.0 lv2core >= 1.0.0], [config_have_lv2="yes"])
++])
+ AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")
+ 
+ # VST
diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch
new file mode 100644
index 000000000..0c61f096c
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch
@@ -0,0 +1,15 @@
+Fix breakage caused by undefined behaviour. Using PTHREAD_CANCEL_ASYNCHRONOUS
+is only allowed in pure functions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=537516
+
+--- linuxsampler-2.0.0/m4/nptl_bug.m4
++++ linuxsampler-2.0.0/m4/nptl_bug.m4
+@@ -47,7 +47,7 @@
+ void* __pthread_launcher(void* p) {
+     // let the thread be killable under any circumstances
+     // (without this function call, this test always succeeds !)
+-    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
++    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+ 
+     // this will block this 2nd thread, since we already
+     // locked this mutex by the main thread
diff --git a/media-sound/linuxsampler/linuxsampler-9999.ebuild b/media-sound/linuxsampler/linuxsampler-9999.ebuild
index b99d3cfc3..acaeb1537 100644
--- a/media-sound/linuxsampler/linuxsampler-9999.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -2,54 +2,75 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils subversion
 
-DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features"
-HOMEPAGE="http://www.linuxsampler.org/"
+inherit autotools subversion
+
+DESCRIPTION="Software audio sampler engine with professional grade features"
+HOMEPAGE="https://www.linuxsampler.org/"
 ESVN_REPO_URI="https://svn.linuxsampler.org/svn/linuxsampler/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-# it also supports vst but it's masked in the tree at this moment
-IUSE="alsa doc jack sf2 sqlite static-libs"
+IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"
 
-RDEPEND=">media-libs/libgig-4
-	media-libs/libsndfile
+RDEPEND="
+	>=media-libs/libgig-4.1.0
+	media-libs/libsndfile[-minimal]
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
-	sqlite? ( >=dev-db/sqlite-3.3 )"
+	lv2? ( media-libs/lv2 )
+	sqlite? ( >=dev-db/sqlite-3.3 )
+"
 DEPEND="${RDEPEND}
+	media-libs/dssi
+	media-libs/ladspa-sdk
+"
+BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
+	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+)
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-src_configure() {
+src_prepare() {
+	default
+
 	emake -f Makefile.svn
 
-	econf \
-		$(use_enable alsa alsa-driver) \
-		--disable-arts-driver \
-		$(use_enable jack jack-driver) \
-		$(use_enable sqlite instruments-db) \
-		$(use_enable sf2 sf2-engine) \
-		$(! has static-libs && echo --enable-static=no)
+	eautoreconf
 }
 
-src_compile() {
-	default
+src_configure() {
+	local myeconfargs=(
+		--disable-arts-driver
+		--disable-static
+		$(use_enable alsa alsa-driver)
+		$(use_enable jack jack-driver)
+		$(use_enable lv2)
+		$(use_enable sqlite instruments-db)
+		$(use_enable sf2 sf2-engine)
+	)
+	econf "${myeconfargs[@]}"
+}
 
+src_compile() {
+	emake -j1 # fails with parallel jobs, bug #666738
 	use doc && emake docs
 }
 
 src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
 	default
+	find "${D}" -name '*.la' -delete || die
 
-	# For liblinuxsampler.so to be found at runtime
-	printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/linuxsampler/\"" > 99${PN}
-	doenvd "99${PN}"
-
-	! use static-libs && prune_libtool_files --modules
+	# lscp files conflict with nilfs-utils, bug #556330
+	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
+	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
 }
diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
index 3b629523e..818e207d2 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>fordfrog@gentoo.org</email>
-	<name>Miroslav Šulc</name>
-</maintainer>
-<use>
-	<flag name="sf2">Add support for SoundFont 2 sound bank files</flag>
-</use>
+	<maintainer type="person">
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
+	</maintainer>
+	<use>
+		<flag name="lv2">Add support for Ladspa V2</flag>
+		<flag name="sf2">Add support for SoundFont 2 sound bank files</flag>
+	</use>
 </pkgmetadata>