[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/, media-sound/bristol/files/
commit: 5d556c93b3cd1f4b3fc814192dedb0e89732e307
Author: Eli Schwartz gmail com>
AuthorDate: Mon Mar 18 00:26:31 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 18 05:29:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d556c93
media-sound/bristol: apply Florian's patch for Modern C
Fixes many instances of -Werror=implicit-int. Modern C changes mean
accompanying revbump for possibly-dangerous codegen flaws being
corrected.
Closes: https://bugs.gentoo.org/885527
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
media-sound/bristol/bristol-0.60.11-r3.ebuild | 62 ++
media-sound/bristol/files/bristol-c99.patch | 268 ++
2 files changed, 330 insertions(+)
diff --git a/media-sound/bristol/bristol-0.60.11-r3.ebuild
b/media-sound/bristol/bristol-0.60.11-r3.ebuild
new file mode 100644
index ..79c8d29a25e5
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+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"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+# pulseaudio: not fully supported
+
+BDEPEND="
+ virtual/pkgconfig"
+RDEPEND="
+ virtual/jack
+ x11-libs/libX11
+ alsa? ( media-libs/alsa-lib )"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cflags.patch
+ "${FILESDIR}"/${P}-dontcompress.patch
+ "${FILESDIR}"/${P}-rm_alsa-iatomic.h.patch
+ "${FILESDIR}"/bristol-c99.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ tc-export PKG_CONFIG
+
+ append-cflags -fcommon
+ econf \
+ --disable-static \
+ --disable-version-check \
+ $(use_enable alsa) \
+ $(use_enable oss)
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+ dodoc HOWTO
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/bristol/files/bristol-c99.patch
b/media-sound/bristol/files/bristol-c99.patch
new file mode 100644
index ..f3986ba8a233
--- /dev/null
+++ b/media-sound/bristol/files/bristol-c99.patch
@@ -0,0 +1,268 @@
+Florian Weimer's Modern C porting patch:
https://sourceforge.net/p/bristol/patches/3/
+
+Avoid implicit ints and implicit function declarations, to prevent
+build failures with future compilers which do not support them.
+
+diff --git a/bristol/bristolmemorymoog.c b/bristol/bristolmemorymoog.c
+index 6c58e4d92253a232..f51d684729f55b11 100644
+--- a/bristol/bristolmemorymoog.c
b/bristol/bristolmemorymoog.c
+@@ -33,6 +33,7 @@
+ #include "bristolmemorymoog.h"
+
+ extern int buildCurrentTable(Baudio *, float);
++extern void doPitchWheel(Baudio *);
+
+ /*
+ * Use of these memorymoog global buffers will be an issue with use of
multiple
+diff --git a/libbrightonC11/bRoutines.c b/libbrightonC11/bRoutines.c
+index 1983db220c0825ba..88d1e64a51a1e145 100644
+--- a/libbrightonC11/bRoutines.c
b/libbrightonC11/bRoutines.c
+@@ -24,6 +24,7 @@
+
+ void *
+ brightonX11malloc(size)
++int size;
+ {
+ void *mem;
+
+diff --git a/libbrightonX11/bRoutines.c b/libbrightonX11/bRoutines.c
+index 87dab9a93223ef0f..647f57181cdf4692 100644
+--- a/libbrightonX11/bRoutines.c
b/libbrightonX11/bRoutines.c
+@@ -25,6 +25,7 @@
+
+ void *
+ brightonX11malloc(size)
++int size;
+ {
+ void *mem;
+
+diff --git a/libbristol/bristolcdefs.c b/libbristol/bristolcdefs.c
+index a5f0638155fe40e3..45ccd11604ac37b8 100644
+--- a/libbristol/bristolcdefs.c
b/libbristol/bristolcdefs.c
+@@ -25,6 +25,7 @@
+
+ void *
+ bristolmalloc(size)
++int size;
+ {
+ char *mem;
+
+@@ -39,6 +40,7 @@ bristolmalloc(size)
+
+ void *
+ bristolmalloc0(size)
++int size;
+ {
+ char *mem;
+
+diff --git a/libbristolaudio/audioEngine.c b/libbristolaudio/audioEngine.c
+index d6aeb4b8976a1a84..e0367fc427b5dbc6 100644
+--- a/libbristolaudio/audioEngine.c
b/libbristolaudio/audioEngine.c
+@@ -85,6 +85,7 @@ int
+ initAudioDevice2(audioDev, devID, fragSize)
+ duplexDev *audioDev;
+ int devID;
++int fragSize;
+ {
+ /*
+* The device is basically just opened for the first call of this
routine.
+@@ -118,6 +119,7 @@ int devID;
+ int
+ setAudioStart2(audioDev, devID)
+ duplexDev *audioDev;
++int devID;
+ {
+ int enable;
+
+@@ -162,6 +164,7 @@ duplexDev *audioDev;
+ int
+ setAudioStop2(audioDev, devID)
+ duplexDev *audioDev;
++int devID;
+ {
+ int enable;
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 5d6e486199ed2e73f926865feeb23e70d1fbb312
Author: Eli Schwartz gmail com>
AuthorDate: Mon Mar 18 00:38:29 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 18 05:29:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6e4861
media-sound/bristol: mark as LTO-unsafe
Upstream project is dead, not worth submitting a ticket to sourceforge.
Closes: https://bugs.gentoo.org/860447
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
media-sound/bristol/bristol-0.60.11-r3.ebuild | 7 +++
1 file changed, 7 insertions(+)
diff --git a/media-sound/bristol/bristol-0.60.11-r3.ebuild
b/media-sound/bristol/bristol-0.60.11-r3.ebuild
index 3a637123b0a5..9058db52ef35 100644
--- a/media-sound/bristol/bristol-0.60.11-r3.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r3.ebuild
@@ -40,6 +40,13 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/860447
+ #
+ # Upstream is dead. The last release was in 2013 and the last maintainer
+ # comment on discussions was 2020.
+ filter-lto
+
tc-export PKG_CONFIG
append-cflags -fcommon
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 6a35c467d1ff8e3450defa0919dfb3ae94f8f9df Author: Eli Schwartz gmail com> AuthorDate: Mon Mar 18 00:38:15 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 18 05:29:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a35c467 media-sound/bristol: update EAPI 7 -> 8 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> media-sound/bristol/bristol-0.60.11-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/bristol/bristol-0.60.11-r3.ebuild b/media-sound/bristol/bristol-0.60.11-r3.ebuild index 79c8d29a25e5..3a637123b0a5 100644 --- a/media-sound/bristol/bristol-0.60.11-r3.ebuild +++ b/media-sound/bristol/bristol-0.60.11-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/files/, media-sound/bristol/
commit: 6f438a968d00e79cb5faaf48f4f04d23583416f1
Author: Eli Schwartz gmail com>
AuthorDate: Mon Mar 18 00:40:40 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 18 05:29:59 2024 +
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 gmail.com>
Signed-off-by: Sam James 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 ..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
+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-semaphoreenable 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
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 6bc1c69ba87e98a8d3c1a6968294d112b3fc4dba Author: Sam James gentoo org> AuthorDate: Wed Mar 9 22:53:29 2022 + Commit: Sam James gentoo org> CommitDate: Wed Mar 9 22:53:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc1c69b media-sound/bristol: fix IndirectInherits (toolchain-funcs) Signed-off-by: Sam James gentoo.org> media-sound/bristol/bristol-0.60.11-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/bristol/bristol-0.60.11-r2.ebuild b/media-sound/bristol/bristol-0.60.11-r2.ebuild index b23ac9b3f46b..839690ec6fd9 100644 --- a/media-sound/bristol/bristol-0.60.11-r2.ebuild +++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others" HOMEPAGE="https://sourceforge.net/projects/bristol;
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 4129259d8f3fc0c21c4ae5ce8aed47e689902d53
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Feb 13 22:52:00 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Feb 13 22:52:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4129259d
media-sound/bristol: add-flags -> append-cflags; drop static-libs
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
...0.60.11-r1.ebuild => bristol-0.60.11-r2.ebuild} | 23 ++
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild
b/media-sound/bristol/bristol-0.60.11-r2.ebuild
similarity index 78%
rename from media-sound/bristol/bristol-0.60.11-r1.ebuild
rename to media-sound/bristol/bristol-0.60.11-r2.ebuild
index a98b921d23d..e5481dc9adb 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild
@@ -12,25 +12,20 @@ SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="alsa oss static-libs"
+IUSE="alsa oss"
# osc : configure option but no code it seems...
# jack: fails to build if disabled
# pulseaudio: not fully supported
BDEPEND="
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
RDEPEND="
virtual/jack
x11-libs/libX11
- alsa? ( media-libs/alsa-lib )
-"
+ alsa? ( media-libs/alsa-lib )"
# osc? ( >=media-libs/liblo-0.22 )
DEPEND="${RDEPEND}
- x11-base/xorg-proto
-"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}"/${P}-cflags.patch
@@ -45,12 +40,12 @@ src_prepare() {
}
src_configure() {
- add-flags -fcommon
+ append-cflags -fcommon
econf \
+ --disable-static \
--disable-version-check \
$(use_enable alsa) \
- $(use_enable oss) \
- $(use_enable static-libs static)
+ $(use_enable oss)
}
src_compile() {
@@ -59,5 +54,7 @@ src_compile() {
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ dodoc HOWTO
+
+ find "${ED}" -name '*.la' -delete || die
}
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 6cce14e6ac3f03e4af19e86d8fea85d9ef91f05b
Author: Andreas K. Huettel gentoo org>
AuthorDate: Wed Jan 6 22:26:19 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Jan 6 23:22:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cce14e6
media-sound/bristol: Apply gcc-10 workaround
Closes: https://bugs.gentoo.org/746347
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel gentoo.org>
media-sound/bristol/bristol-0.60.11-r1.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild
b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 9948c638e79..a98b921d23d 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools
+inherit autotools flag-o-matic
DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
HOMEPAGE="https://sourceforge.net/projects/bristol;
@@ -45,6 +45,7 @@ src_prepare() {
}
src_configure() {
+ add-flags -fcommon
econf \
--disable-version-check \
$(use_enable alsa) \
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 3b7bd82d061d695dbb5cfc4aa5c15197853b9756
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Oct 7 07:06:13 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Oct 7 07:09:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7bd82d
media-sound/bristol: x86 stable wrt bug #746245
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-sound/bristol/bristol-0.60.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild
b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 89257239284..9948c638e79 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa oss static-libs"
# osc : configure option but no code it seems...
# jack: fails to build if disabled
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: f3331c4337bf8dfc480f1bff322d2a723b6a312a
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Oct 3 15:18:24 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Oct 3 15:18:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3331c43
media-sound/bristol: respect LDFLAGS
Closes: https://bugs.gentoo.org/727780
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc gentoo.org>
media-sound/bristol/bristol-0.60.11-r1.ebuild | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild
b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 01ee6cb806e..14c3db1d710 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.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
@@ -23,7 +23,7 @@ BDEPEND="
RDEPEND="
virtual/jack
x11-libs/libX11
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ alsa? ( media-libs/alsa-lib )
"
# osc? ( >=media-libs/liblo-0.22 )
DEPEND="${RDEPEND}
@@ -52,6 +52,10 @@ src_configure() {
$(use_enable static-libs static)
}
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}"
+}
+
src_install() {
default
find "${D}" -name '*.la' -delete || die
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/
commit: 6eb0c82fada7249e468a8c82d4810a48aac61433
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 22 12:23:47 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 22 15:41:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb0c82f
media-sound/bristol: Fix DEPENDs
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/bristol/bristol-0.60.11-r1.ebuild | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild
b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 0cb211ac285..01ee6cb806e 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,15 +17,16 @@ IUSE="alsa oss static-libs"
# jack: fails to build if disabled
# pulseaudio: not fully supported
+BDEPEND="
+ virtual/pkgconfig
+"
RDEPEND="
- >=media-sound/jack-audio-connection-kit-0.109.2
+ virtual/jack
x11-libs/libX11
alsa? ( >=media-libs/alsa-lib-1.0.0 )
"
# osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
+DEPEND="${RDEPEND}
x11-base/xorg-proto
"
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/, media-sound/bristol/files/
commit: a37e5e53453ecae495208acef9f97113f7dd9aec
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Oct 3 23:07:41 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Oct 3 23:26:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37e5e53
media-sound/bristol: Drop old
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-sound/bristol/Manifest | 1 -
media-sound/bristol/bristol-0.60.11.ebuild | 47 --
media-sound/bristol/bristol-0.60.9.ebuild | 44
.../bristol/files/bristol-0.60.9-cflags.patch | 10 -
4 files changed, 102 deletions(-)
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index dc76fe4d2fb..b9b5a0550a2 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -1,2 +1 @@
DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B
f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e
SHA512
2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-DIST bristol-0.60.9.tar.gz 4323706 BLAKE2B
39c9a834ba9411f7a434dbc8db8630dd0200c25e645a315b57f1ed8626c816b42da6b5473ff882a01f766ed10240cf7bce98d3091be5c2a8e16c4af0cd6afd5f
SHA512
216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff
diff --git a/media-sound/bristol/bristol-0.60.11.ebuild
b/media-sound/bristol/bristol-0.60.11.ebuild
deleted file mode 100644
index a5df5a18240..000
--- a/media-sound/bristol/bristol-0.60.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- x11-libs/libX11"
-# osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cflags.patch
- epatch "${FILESDIR}"/${P}-implicit-dec.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --disable-version-check \
- $(use_enable oss) \
- $(use_enable alsa)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/media-sound/bristol/bristol-0.60.9.ebuild
b/media-sound/bristol/bristol-0.60.9.ebuild
deleted file mode 100644
index 1b2744c0bfc..000
--- a/media-sound/bristol/bristol-0.60.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools-utils
-
-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
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- x11-libs/libX11"
-# osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_prepare() {
- autotools-utils_src_prepare
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-version-check
- $(use_enable alsa)
- $(use_enable oss)
- #$(use_enable osc liblo)
- )
- autotools-utils_src_configure
-}
diff --git a/media-sound/bristol/files/bristol-0.60.9-cflags.patch
b/media-sound/bristol/files/bristol-0.60.9-cflags.patch
deleted file mode 100644
index 502b8eb937f..000
--- a/media-sound/bristol/files/bristol-0.60.9-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
bristol-0.60.9/libbrighton/Makefile.am.orig
-+++ bristol-0.60.9/libbrighton/Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = foreign
-
--AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton
-I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@
[gentoo-commits] repo/gentoo:master commit in: media-sound/bristol/files/, media-sound/bristol/
commit: cec84b5e29ebf6738ac3f7febdcf2bde6aa61f59
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Oct 3 23:25:22 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Oct 3 23:26:26 2018 +
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 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 000..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 000..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.0 +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 000..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
+Reviewed-by: James Cowgill
+Herbert Parentes Fortes Neto
+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
+
+ #ifdef _BRISTOL_JACK
+-#if (BRISTOL_HAS_ALSA == 1)
+-#include
+-#endif
+
+ /*
+ * Drop this atomic stuff, it comes from the ALSA library and it not present
on
