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

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

[Andreas Sturmlechner]

commit:     cec84b5e29ebf6738ac3f7febdcf2bde6aa61f59
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  3 23:25:22 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 23:26:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec84b5e

media-sound/bristol: Fix build, fix QA warning, EAPI-7 bump

Closes: https://bugs.gentoo.org/590510
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 media-sound/bristol/bristol-0.60.11-r1.ebuild      | 57 ++++++++++++++++++++++
 .../files/bristol-0.60.11-dontcompress.patch       | 12 +++++
 .../files/bristol-0.60.11-rm_alsa-iatomic.h.patch  | 26 ++++++++++
 3 files changed, 95 insertions(+)

diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
new file mode 100644
index 00000000000..0cb211ac285
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="https://sourceforge.net/projects/bristol"
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss static-libs"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+# pulseaudio: not fully supported
+
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	x11-libs/libX11
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-implicit-dec.patch
+	"${FILESDIR}"/${P}-dontcompress.patch
+	"${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-version-check \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}

diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
new file mode 100644
index 00000000000..0b7cedc9e29
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.am	2012-01-12 18:23:23.000000000 +0100
++++ b/Makefile.am	2018-10-04 01:22:03.656483227 +0200
+@@ -9,9 +9,6 @@
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
+ 	$(INSTALL) -m 0644 $(srcdir)/bristoljackstats.1 $(DESTDIR)$(mandir)/man1/
+-	gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1
+-	gzip -9fn $(DESTDIR)$(mandir)/man1/bristoljackstats.1
+-	cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz
+ 
+ installdb:
+ 	mkdir -p -m 0755 $(DESTDIR)$(bristoldir)

diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
new file mode 100644
index 00000000000..9d11b4f7d99
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
@@ -0,0 +1,26 @@
+Description: Stop using alsa/iatomic.h
+             Technically this is an API breakage in libasound 1.1.2,
+             but it makes sense to me that this header was removed
+             by ALSA upstream.
+             .
+             bristol was the only user in Debian, and even here the
+             code that once used it was already commented out.
+Author: Adrian Bunk <bunk@stusta.de>
+Reviewed-by: James Cowgill <jcowgill@debian.org>
+	     Herbert Parentes Fortes Neto <hpfn@debian.org>
+Bug-Debian: https://bugs.debian.org/834180
+Forwarded: no
+Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
+===================================================================
+--- a/libbristolaudio/audioEngineJack.c
++++ b/libbristolaudio/audioEngineJack.c
+@@ -38,9 +38,6 @@
+ #include <string.h>
+ 
+ #ifdef _BRISTOL_JACK
+-#if (BRISTOL_HAS_ALSA == 1)
+-#include <alsa/iatomic.h>
+-#endif
+ 
+ /*
+  * Drop this atomic stuff, it comes from the ALSA library and it not present on

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

[Sam James]

commit:     6f438a968d00e79cb5faaf48f4f04d23583416f1
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 00:40:40 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 05:29:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f438a96

media-sound/bristol: add patch to fix broken bashisms

Upstream is dead, no point submitting a patch to sourceforge just to be
ignored.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/bristol/bristol-0.60.11-r3.ebuild      |  1 +
 ...nfigure.ac-fix-various-erroneous-bashisms.patch | 80 ++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/media-sound/bristol/bristol-0.60.11-r3.ebuild b/media-sound/bristol/bristol-0.60.11-r3.ebuild
index 9058db52ef35..0b1b4f04022c 100644
--- a/media-sound/bristol/bristol-0.60.11-r3.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r3.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-dontcompress.patch
 	"${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch
 	"${FILESDIR}"/bristol-c99.patch
+	"${FILESDIR}"/0001-configure.ac-fix-various-erroneous-bashisms.patch
 )
 
 src_prepare() {

diff --git a/media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch b/media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch
new file mode 100644
index 000000000000..c10ece7ea2d5
--- /dev/null
+++ b/media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch
@@ -0,0 +1,80 @@
+From 103c856f20b34cc315c5ae4d096b0b863aba046d Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 17 Mar 2024 20:31:15 -0400
+Subject: [PATCH] configure.ac: fix various erroneous bashisms
+
+double equals in shell scripts is ALWAYS wrong. POSIX sh uses single
+equals, and bash implements double equals as an exact alias of the
+single equals form.
+
+Using double equals accomplishes no purpose whatsoever, and for your
+troubles you end up with muscle memory telling you to use it in POSIX sh
+where it fails. Avoid at all costs.
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c233743..de50709 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,9 +62,9 @@ AC_ARG_ENABLE(version_check, [  --disable-version-check	ignore preinstalled vers
+ if test "x$TRY_VC" = 'xyes'
+ then
+ 	which startBristol > /dev/null 2>&1
+-	if test $? == 0; then showErrMsg1; fi
++	if test $? = 0; then showErrMsg1; fi
+ 	which bristol > /dev/null 2>&1
+-	if test $? == 0; then showErrMsg1; fi
++	if test $? = 0; then showErrMsg1; fi
+ 	if test -f ${prefix}/bin/bristol; then showErrMsg1; fi
+ fi
+ 
+@@ -166,7 +166,7 @@ AC_SUBST(_BRISTOL_VOICES)
+ 
+ BRISTOL_LIN_ATTACK=-DBRISTOL_LIN_ATTACK
+ AC_ARG_ENABLE(exp-attack, [  --enable-exp-attack		enable exponential attack], USE_EXP_ATTACK=yes , USE_EXP_ATTACK=no )
+-if test "x$USE_EXP_ATTACK" == "xyes"
++if test "x$USE_EXP_ATTACK" = "xyes"
+ then
+ 	BRISTOL_LIN_ATTACK=
+ fi
+@@ -176,7 +176,7 @@ BRISTOL_SEM_OPEN=
+ BRISTOL_SEMAPHORE=
+ AC_ARG_ENABLE(semaphore, [  --enable-semaphore		enable engine semaphores ],
+ 			USE_SEMAPHORE=yes , USE_SEMAPHORE=no )
+-if test "x$USE_SEMAPHORE" == "xyes"
++if test "x$USE_SEMAPHORE" = "xyes"
+ then
+ 	BRISTOL_SEMAPHORE=-DBRISTOL_SEMAPHORE
+ 
+@@ -194,7 +194,7 @@ AC_SUBST(BRISTOL_SEMAPHORE)
+ BRISTOL_BARRIER=
+ AC_ARG_ENABLE(memory-barrier, [  --enable-memory-barrier	enable ringbuffer barrier],
+ 			USE_BARRIER=yes , USE_BARRIER=no )
+-if test "x$USE_BARRIER" == "xyes"
++if test "x$USE_BARRIER" = "xyes"
+ then
+ 	BRISTOL_BARRIER=-DUSE_MLOCK
+ fi
+@@ -427,7 +427,7 @@ echo \| Build with sem_open ............................ : true
+ fi
+ fi
+ 
+-if test $USE_BARRIER == "yes"; then
++if test $USE_BARRIER = "yes"; then
+ echo \| Build with jrb memory barrier .................. : true
+ fi
+ 
+@@ -454,7 +454,7 @@ echo \| Default voicecount ............................. : BRISTOL_VOICECOUNT=$_
+ if test $BRR != 10; then
+ echo \| Envelope max ramp time ......................... : $BRR seconds
+ fi
+-if test x$USE_EXP_ATTACK == "xyes"; then
++if test x$USE_EXP_ATTACK = "xyes"; then
+ echo \| Envelope attack type ........................... : exponential
+ fi
+ echo \| author ......................................... : Nick Copeland
+-- 
+2.43.2
+