summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2024-03-17 20:40:40 -0400
committerSam James <sam@gentoo.org>2024-03-18 05:29:59 +0000
commit6f438a968d00e79cb5faaf48f4f04d23583416f1 (patch)
tree328fff73037fa8d50b8570b00508d24b781864dc /media-sound/bristol
parentmedia-sound/bristol: mark as LTO-unsafe (diff)
downloadgentoo-6f438a968d00e79cb5faaf48f4f04d23583416f1.tar.gz
gentoo-6f438a968d00e79cb5faaf48f4f04d23583416f1.tar.bz2
gentoo-6f438a968d00e79cb5faaf48f4f04d23583416f1.zip
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@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound/bristol')
-rw-r--r--media-sound/bristol/bristol-0.60.11-r3.ebuild1
-rw-r--r--media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch80
2 files changed, 81 insertions, 0 deletions
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
+