[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/, 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@
