[gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/, media-sound/linuxsampler/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/, media-sound/linuxsampler/files/

[David Seifert]

commit:     c3f25a35664cfe0d06ff946157e2302fed763710
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 21:17:21 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 21:17:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f25a35

media-sound/linuxsampler: Fix undefined behaviour in NPTL test

Gentoo-Bug: 537516
* EAPI=6
* Replace PTHREAD_CANCEL_ASYNCHRONOUS, which is undefined behaviour
  when used for a non-pure function

Package-Manager: portage-2.2.27

 .../files/linuxsampler-2.0.0-nptl-hardened.patch   | 15 ++++++
 .../linuxsampler/linuxsampler-2.0.0-r1.ebuild      | 58 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)

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 0000000..0c61f09
--- /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-2.0.0-r1.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild
new file mode 100644
index 0000000..4806c00
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc jack sqlite static-libs"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
+	>=media-libs/libgig-4.0.0
+	media-libs/alsa-lib
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+PATCHES=(
+	"${FILESDIR}/${P}-nptl-hardened.patch"
+)
+
+src_prepare() {
+	default
+	# Force regeneration of the file to let it build with all bison
+	# versions, bug #556204
+	rm src/network/lscpparser.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-alsa-driver \
+		--disable-arts-driver \
+		$(use_enable jack jack-driver) \
+		$(use_enable sqlite instruments-db) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	default
+
+	docinto html
+	use doc && dodoc -r doc/html/*
+
+	prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/linuxsampler/, media-sound/linuxsampler/files/

[Miroslav Šulc]

commit:     46f52034bad88ca6a60e3fe69466e91189172faa
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 07:12:35 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 07:12:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f52034

media-sound/linuxsampler: fixed yyterror not declared in 2.1.1

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../linuxsampler-2.1.1-fix-yyterror-not-declared.patch   | 16 ++++++++++++++++
 media-sound/linuxsampler/linuxsampler-2.1.1.ebuild       |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/media-sound/linuxsampler/files/linuxsampler-2.1.1-fix-yyterror-not-declared.patch b/media-sound/linuxsampler/files/linuxsampler-2.1.1-fix-yyterror-not-declared.patch
new file mode 100644
index 00000000000..4eb56fddef1
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.1.1-fix-yyterror-not-declared.patch
@@ -0,0 +1,16 @@
+--- linuxsampler-2.1.1/src/network/lscp.y	2020/06/07 15:39:31	3786
++++ linuxsampler-2.1.1/src/network/lscp.y	2020/06/08 11:55:18	3787
+@@ -1479,6 +1479,13 @@
+  */
+ typedef std::set< std::vector<YYTYPE_INT16> > YYStackHistory;
+ 
++/*
++ * YYTERROR macro was removed in Bison 3.6.0, we need it in function below.
++ */
++#ifndef YYTERROR
++# define YYTERROR YYSYMBOL_YYerror
++#endif
++
+ #define DEBUG_BISON_SYNTAX_ERROR_WALKER 0
+ 
+ /**

diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
index 3361f366169..d12a254629b 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
 	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+	"${FILESDIR}/${P}-fix-yyterror-not-declared.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README )