From 529bbf6d047ac6b80c0d9310ec0f666c145ec5fe Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Mar 2024 06:49:50 +0000 Subject: gentoo auto-resync : 18:03:2024 - 06:49:50 --- media-sound/bristol/Manifest | 3 + media-sound/bristol/bristol-0.60.11-r3.ebuild | 70 ++++++ ...nfigure.ac-fix-various-erroneous-bashisms.patch | 80 ++++++ media-sound/bristol/files/bristol-c99.patch | 268 +++++++++++++++++++++ 4 files changed, 421 insertions(+) create mode 100644 media-sound/bristol/bristol-0.60.11-r3.ebuild create mode 100644 media-sound/bristol/files/0001-configure.ac-fix-various-erroneous-bashisms.patch create mode 100644 media-sound/bristol/files/bristol-c99.patch (limited to 'media-sound/bristol') diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest index 92fd82be4291..0d0ada76eba5 100644 --- a/media-sound/bristol/Manifest +++ b/media-sound/bristol/Manifest @@ -1,7 +1,10 @@ +AUX 0001-configure.ac-fix-various-erroneous-bashisms.patch 2775 BLAKE2B 89d6c4688408ccacdd650c6460305cccbb95b7b9d40c9a45deb9a4c7e15a0efcd4afdbaa53aa719a6e1c2a74673e6364de32917ada6aa2deaa8fbb15e96b5294 SHA512 347f23125861a247f487f8dfdf0acdbf69bcbb19f7b9e3bd472360e3f3eb662920cdfa2ed84fa9e5796d8dc7a895227a264b6265f4b8bf107be4c34f97d2074a AUX bristol-0.60.11-cflags.patch 6738 BLAKE2B 18d7245f7c7bbd13177bd48d076bde9350128b1959a723de6f6946ea7aad2c526c5cf2c9f818d3214f788d111d2b955d0f89ad4c7731c83b212b7890ff9f8d61 SHA512 d5bc27d1747f04f187f6774004ff983a26420f2290e04d3d234a6c359cf0c80c5e8cc065e5ac25b42814016576124f94ca490a585885953f4399fffe444c097c AUX bristol-0.60.11-dontcompress.patch 504 BLAKE2B 387cc99241f4d39bf64dca83ddb7474758f4425fad51e6e518a6a99386cca008fe4a574458617b771a54182c5238915fed3fea00d5f82fe737c8afa2a417fb55 SHA512 3a0d56b83308ae3e555956ef930943420241e0951ca71d6d6d6e1ae98eafb9dc350a97873faf6b44fccb0cf1c58ccea6bb8923e8d9ada3349f2b0fa90e10d803 AUX bristol-0.60.11-implicit-dec.patch 292 BLAKE2B 6d9f900f00e7ca1642fe80d7cdfcf929954d9ef4948ca7d3037fc26f80ab1505ab33ab74ee6a0ff40e460f5305b2f2f2eb093c209d8900825e82637a6b0ae8df SHA512 88b528fd5a492bf77d87fc629e542315948a08cbec0abc8b4cbddc113bcb2f36ed6ed52f1f98c1083ba99adf8febc143736352817d5e2f21ec484cc689e59e5b AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 899 BLAKE2B 98fb23ca63f58099e06704d1cfb24c543b6e41cc8a37cab82097a526e66056006263ef8125b696e35572bc8b4646b96620c77415df6fcad38e13f61c6723a076 SHA512 3c7a9642f21fc21437468968ff54aeb958bec6251ef318ad6e27a689aebfde19c73a1c420d9a92bae0f6d63bbbb202106dad4a8199e14c066273ad2b6768008b +AUX bristol-c99.patch 7214 BLAKE2B a850715581fb671b184baf51489a857c3a1186663ff2daed7008d14b1b26c55eb80ec442014257de4dff4bbcee16b8927b44ffcfcedfc9fefc22b635b2567b50 SHA512 2f41da7aaca9c0fa8670d56eed57f572b209e6ec7c1dc4d265319a1bd65183b781d7a258fd2da0a9a74468f12c03b93611ac04ccdd356ac4f104871f087c2751 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180 EBUILD bristol-0.60.11-r2.ebuild 1213 BLAKE2B c27ff4aa23c6350b463bd59946663d740d1c8a5d78a7812396a3260ed507ce7a1c3b6e2e1e83d3da657fa9202d018dad27be22df02a021e203ff4e38d7bae968 SHA512 175b2808bf875cb04dc1f4d81a9594f6e6f4f73d15dc50eaa15deceecb33bf3885fdbef30b6957a75b18f19aae1000a03d55d71392fad3582f877a250e2dd6a2 +EBUILD bristol-0.60.11-r3.ebuild 1468 BLAKE2B 431cf467a4dd5c2882b9bff54a709b946f081484a946915be80b207f4315eb6cea757eafcb5b5d1596e414edbb8b83ef5504baa6f60b8b108cf89ad6e71c1027 SHA512 b5ff48463647c102c0b1f3ce191db00e00a0273479875df983d156650825a5abe1a0fc95b24a3da428692e79a9c42448d33904e9009bc249d3d92fd4c532cbd8 MISC metadata.xml 600 BLAKE2B 8e3fb348d7bec7909eb04960200d7e61e62a2a19a6a424fa66853430cf4642cce40852acdf50defc46c862a021c6b842d9327ef32634e32b73467790989e7b9c SHA512 87169797c5b80dc6cb84dc8497055382c808e78a5f8171c45383a29fff39cf3ce3232999235538973bad8c2e5d087a15bde9463ae79ab011953de5c10a762aae 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 000000000000..0b1b4f04022c --- /dev/null +++ b/media-sound/bristol/bristol-0.60.11-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + "${FILESDIR}"/0001-configure.ac-fix-various-erroneous-bashisms.patch +) + +src_prepare() { + default + eautoreconf +} + +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 + 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/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 +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 + diff --git a/media-sound/bristol/files/bristol-c99.patch b/media-sound/bristol/files/bristol-c99.patch new file mode 100644 index 000000000000..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; + +diff --git a/libbristolaudio/audioEngineOSS.c b/libbristolaudio/audioEngineOSS.c +index 26d9f89923bc7fb0..984b30efd4af9c2c 100644 +--- a/libbristolaudio/audioEngineOSS.c ++++ b/libbristolaudio/audioEngineOSS.c +@@ -49,6 +49,7 @@ int + ossAudioInit(audioDev, devID, fragSize) + duplexDev *audioDev; + int devID; ++int fragSize; + { + #if (BRISTOL_HAS_OSS == 1) + int results, data = 0, mode; +diff --git a/libbristolaudio/audioGUI.c b/libbristolaudio/audioGUI.c +index bd9410650b361101..bbdf5c68e6264569 100644 +--- a/libbristolaudio/audioGUI.c ++++ b/libbristolaudio/audioGUI.c +@@ -161,6 +161,7 @@ duplexDev *audioDev; + char * + getControllerName(audioDev, controller) + duplexDev *audioDev; ++int controller; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +@@ -173,6 +174,8 @@ duplexDev *audioDev; + int + setRecordSource(audioDev, controller, position) + duplexDev *audioDev; ++int controller; ++int position; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +@@ -185,6 +188,7 @@ duplexDev *audioDev; + int + getRecordability(audioDev, controller) + duplexDev *audioDev; ++int controller; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +@@ -197,6 +201,7 @@ duplexDev *audioDev; + int + getMutability(audioDev, controller) + duplexDev *audioDev; ++int controller; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +@@ -211,6 +216,7 @@ duplexDev *audioDev; + int + getStereoStatus(audioDev, controller) + duplexDev *audioDev; ++int controller; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +@@ -222,6 +228,8 @@ duplexDev *audioDev; + int + getValue(audioDev, controller, side) + duplexDev *audioDev; ++int controller; ++int side; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +@@ -233,6 +241,9 @@ duplexDev *audioDev; + int + setAudioValue(audioDev, controller, side, value) + duplexDev *audioDev; ++int controller; ++int side; ++int value; + { + if (audioDev->cflags & SLAB_AUDIODBG) + printf("setAudioValue(%p, %i, %i, %i)\n", audioDev, controller, side, value); +@@ -251,6 +262,8 @@ duplexDev *audioDev; + int + setAudioMute(audioDev, controller, value) + duplexDev *audioDev; ++int controller; ++int value; + { + if (audioDev->cflags & SLAB_AUDIODBG) + printf("setAudioMute()\n"); +@@ -280,6 +293,7 @@ char *name; + int + getAudioCapability(audioDev, controller) + duplexDev *audioDev; ++int controller; + { + if (audioDev->cflags & SLAB_AUDIODBG) + printf("getAudioCapability(%s, %i)\n", audioDev->devName, controller); +@@ -296,6 +310,7 @@ duplexDev *audioDev; + int + validDev(audioDev, index) + duplexDev *audioDev; ++int index; + { + #if (BRISTOL_HAS_ALSA == 1) + if ((audioDev->flags & AUDIO_ALSA) != 0) +diff --git a/libbristolaudio/audioGUIOSS.c b/libbristolaudio/audioGUIOSS.c +index d6e66d4ab7b72290..74dd973680d93fd0 100644 +--- a/libbristolaudio/audioGUIOSS.c ++++ b/libbristolaudio/audioGUIOSS.c +@@ -91,7 +91,11 @@ short left, right; + */ + static int + setAudioOSS(fd, audioDev, param, valueL, valueR) ++int fd; + duplexDev *audioDev; ++int param; ++int valueL; ++int valueR; + { + #if (BRISTOL_HAS_OSS == 1) + int value, command; +@@ -259,6 +263,7 @@ char *name; + int + getOSSCapability(audioDev, controller) + duplexDev *audioDev; ++int controller; + { + if ((audioDev->stereoCaps | audioDev->monoCaps) & (1 << controller)) + return controller; +@@ -268,6 +273,7 @@ duplexDev *audioDev; + int + getOSSRecordability(audioDev, cont) + duplexDev *audioDev; ++int cont; + { + if (audioDev->cflags & SLAB_AUDIODBG) + printf("getOSSRecordability(%i, %i)\n", audioDev->devID, cont); +diff --git a/libbristolmidi/inetClient.c b/libbristolmidi/inetClient.c +index 17761c7588a9747e..06499763d28f8f2a 100644 +--- a/libbristolmidi/inetClient.c ++++ b/libbristolmidi/inetClient.c +@@ -66,6 +66,7 @@ void clientCheckSocket(); + int + initControlPort(host, port) + char *host; ++int port; + { + struct sockaddr_in connect_socket_addr; + char hostname[NAME_LENGTH]; +diff --git a/libbristolmidi/midiRoutines.c b/libbristolmidi/midiRoutines.c +index 15a5835f09f28fbe..e4458a395fd94036 100644 +--- a/libbristolmidi/midiRoutines.c ++++ b/libbristolmidi/midiRoutines.c +@@ -85,6 +85,7 @@ bristolMidiDevSanity(int dev) + + void + bristolMidiPrintHandle(handle) ++int handle; + { + printf(" Handle: %i\n", bmidi.handle[handle].handle); + printf(" State: %i\n", bmidi.handle[handle].state); +@@ -103,6 +104,7 @@ bristolMidiPrintHandle(handle) + + int + bristolMidiSanity(handle) ++int handle; + { + #ifdef DEBUG + printf("bristolMidiSanity(%i)\n", handle); +diff --git a/libbristolmidi/socketToolKit.c b/libbristolmidi/socketToolKit.c +index 7e4e5b1423905afe..f9b129fd577953c6 100644 +--- a/libbristolmidi/socketToolKit.c ++++ b/libbristolmidi/socketToolKit.c +@@ -57,7 +57,9 @@ struct sockaddr_un local_socket_addr; + int + open_remote_socket(name, port, listens, reqsig) + char *name; /* service name, must be known */ ++int port; + int listens; /* Parameter for the number of connections accepted */ ++int reqsig; + { + struct servent *service, service_tmp; + struct sockaddr_in remote_socket_addr; -- cgit v1.2.3