From d1c14e94a73fba924761cdad7298f3e48c6bc160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jul 2024 08:00:51 +0100 Subject: gentoo auto-resync : 01:07:2024 - 08:00:50 --- media-sound/Manifest.gz | Bin 57413 -> 57404 bytes media-sound/bristol/Manifest | 3 +- media-sound/bristol/bristol-0.60.11-r3.ebuild | 70 ---------------- media-sound/bristol/bristol-0.60.11-r4.ebuild | 71 ++++++++++++++++ .../files/bristol-0.60.11-musl-includes.patch | 92 +++++++++++++++++++++ media-sound/schismtracker/Manifest | 2 +- .../schismtracker/schismtracker-20240529.ebuild | 2 +- media-sound/vkeybd/Manifest | 2 +- media-sound/vkeybd/vkeybd-0.1.18e.ebuild | 2 +- 9 files changed, 169 insertions(+), 75 deletions(-) delete mode 100644 media-sound/bristol/bristol-0.60.11-r3.ebuild create mode 100644 media-sound/bristol/bristol-0.60.11-r4.ebuild create mode 100644 media-sound/bristol/files/bristol-0.60.11-musl-includes.patch (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 4e25185e42b6..6293b987bd95 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest index 000214f35763..a17d0d75f173 100644 --- a/media-sound/bristol/Manifest +++ b/media-sound/bristol/Manifest @@ -2,9 +2,10 @@ AUX 0001-configure.ac-fix-various-erroneous-bashisms.patch 2775 BLAKE2B 89d6c468 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-musl-includes.patch 3092 BLAKE2B 7e325cfcb1c4504fda661ec3464bb065a74e553d01711d9acd3e593504753fd8ec3ea19d6ccfe7113e4fe89e268954d36fdf6d3e9954185d2ac2d6f0a17f2517 SHA512 2806ad27136b6beb3243d65920900394f8f66c200a78bcccfc33a727c184f5d64b7683698a3d8c343056c29ab384c0ed57f238db267a99193a84c9f19fc5a514 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 1226 BLAKE2B eb6f2afd2dc0bbf1fa8217aa3c18d0f79b9021162a6a5c61728c87c1593ae5e4692a83855a8eaad0f2b50858c0f88015ef8f53cda1845a9122b09fb2f8d99848 SHA512 b41fbee91cd28cfc5fbf3f962c7f1a2e5c087faea1724142ddfd2a67fbf444173a678ea01fb62115d6c8ffcf727376c5bc1911c010a464a36c59e42e935a1f27 -EBUILD bristol-0.60.11-r3.ebuild 1481 BLAKE2B 250343757e6dd0f19c2aff5756b8bf7ac5074c3f361b209914c216dc7b14c699690e70037b0796b19949d2218b8d823d2000951b1fd039aeb7c31da363487156 SHA512 27be76f2d4db52ef9cb5b5cb88ca6c5d896ac35c1f96c0132fefe0d2f6c563b915388aaefe7c393dd65f526d329a3aeeb2a8949bb01d7a8f32578c6880b3f528 +EBUILD bristol-0.60.11-r4.ebuild 1520 BLAKE2B f5b374fdae5283b3b5ca44ff5799be427c9835b77bd3d57fd17eb95206363013b4e1921276d9a64e56c511d78d5771b3a8e8ee378da75d37cbf1cb8cd0d99c14 SHA512 75ba6f5abba0884e4e0464caf07d60336449722af21581a46de0cfc4d115b92f963b02fa31aae42b48c01de0c3aca53ce587c64c72313020ef9c75d227e16a9c 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 deleted file mode 100644 index 38296a84ca1d..000000000000 --- a/media-sound/bristol/bristol-0.60.11-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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="https://downloads.sourceforge.net/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/bristol-0.60.11-r4.ebuild b/media-sound/bristol/bristol-0.60.11-r4.ebuild new file mode 100644 index 000000000000..f7133973d09b --- /dev/null +++ b/media-sound/bristol/bristol-0.60.11-r4.ebuild @@ -0,0 +1,71 @@ +# 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="https://downloads.sourceforge.net/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 + "${FILESDIR}"/${P}-musl-includes.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/bristol-0.60.11-musl-includes.patch b/media-sound/bristol/files/bristol-0.60.11-musl-includes.patch new file mode 100644 index 000000000000..78b92e14ce05 --- /dev/null +++ b/media-sound/bristol/files/bristol-0.60.11-musl-includes.patch @@ -0,0 +1,92 @@ +bug https://bugs.gentoo.org/928954 +diff -ru a/bristol/bristol.c b/bristol/bristol.c +--- a/bristol/bristol.c 2024-05-12 16:47:06.017759794 +0000 ++++ b/bristol/bristol.c 2024-05-12 16:58:52.643366119 +0000 +@@ -789,7 +789,7 @@ + if (sched_getparam(0, &schedparam) != 0) + printf("Scheduler getparam failed...\n"); + +- schedparam.__sched_priority = audiomain.priority - 1; ++ schedparam.sched_priority = audiomain.priority - 1; + if (sched_setscheduler(0, SCHED_FIFO, &schedparam) == 0) + { + if (audiomain.debuglevel) +@@ -996,10 +996,10 @@ + if (priority != 0) + { + policy = SCHED_FIFO; +- schedparam.__sched_priority = priority; ++ schedparam.sched_priority = priority; + + if (pthread_setschedparam(thread, policy, &schedparam) == 0) +- printf("rescheduled thread: %i\n", schedparam.__sched_priority); ++ printf("rescheduled thread: %i\n", schedparam.sched_priority); + else + printf("could not reschedule thread\n"); + } else +diff -ru a/include/brighton/brightoninternals.h b/include/brighton/brightoninternals.h +--- a/include/brighton/brightoninternals.h 2024-05-12 16:47:06.014759813 +0000 ++++ b/include/brighton/brightoninternals.h 2024-05-12 16:54:56.042839079 +0000 +@@ -23,6 +23,7 @@ + #define BRIGHTONINTERNALS_H + + #include ++#include + + #include "brightondevflags.h" + #include "brightonevents.h" +diff -ru a/libbristolmidi/inetClient.c b/libbristolmidi/inetClient.c +--- a/libbristolmidi/inetClient.c 2024-05-12 16:47:06.009759844 +0000 ++++ b/libbristolmidi/inetClient.c 2024-05-12 16:48:33.048219487 +0000 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -ru a/libbristolmidi/inetServer.c b/libbristolmidi/inetServer.c +--- a/libbristolmidi/inetServer.c 2024-05-12 16:47:06.009759844 +0000 ++++ b/libbristolmidi/inetServer.c 2024-05-12 16:50:29.944493765 +0000 +@@ -21,7 +21,7 @@ + + /*#define DEBUG */ + +-#include ++#include + #include + #include + #include +diff -ru a/libbristolmidi/midiTCPDevMan.c b/libbristolmidi/midiTCPDevMan.c +--- a/libbristolmidi/midiTCPDevMan.c 2024-05-12 16:47:06.009759844 +0000 ++++ b/libbristolmidi/midiTCPDevMan.c 2024-05-12 16:51:18.921189705 +0000 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -ru a/libbristolmidi/scalaParse.c b/libbristolmidi/scalaParse.c +--- a/libbristolmidi/scalaParse.c 2024-05-12 16:47:06.009759844 +0000 ++++ b/libbristolmidi/scalaParse.c 2024-05-12 16:52:17.040828883 +0000 +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + + #include "bristolmidi.h" + +--- a/bristol/audiothread.c 2024-05-12 17:03:32.379603098 +0000 ++++ b/bristol/audiothread.c 2024-05-12 17:05:45.350756293 +0000 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "bristol.h" + #include "bristolmidi.h" diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest index 1ac901b7911f..a084b073cabc 100644 --- a/media-sound/schismtracker/Manifest +++ b/media-sound/schismtracker/Manifest @@ -1,5 +1,5 @@ DIST schismtracker-20240503.source.tar.gz 1172609 BLAKE2B 3229262a47a5b87174fc1113704100b0d5ed65468df441d7d84be9e7bd4b246613e83f6d6eaf3977d01f0c09f3a02d8d6f45c72749f5d9a6b6882f31c92b544d SHA512 f9f344962419b263a57306dd49635185a7d265da771439b6186222e768061b4b65258b87705b021d33c22c92413f07e4356c2b9db6491da86aed2ef3099aab6c DIST schismtracker-20240529.source.tar.gz 1189815 BLAKE2B d6e8de018a9fd440cba4822990060d2ea2a6fc9655482898ca236d3ee692922c4397ece78baceda894b1c56bb058d9daa5fe89e26556adffa9b59b0cf11b0e54 SHA512 1a01a2085cc607ad7a448b5ee8ad76ec9474ac5c2f69b7995303a0aaceffb637b553b53e9ec890d01208391df3bc0e8f33d9021e406aa01b166cb0433d79bb4e EBUILD schismtracker-20240503.ebuild 1317 BLAKE2B d58825d7fe7144744656daf21732a92e2fa3b70f3ec074e2db828c14e7a99e4162621202e0f8b043fda6c2ee636de0f167c5406b63e5d061fd9a12d3e9333ef7 SHA512 44a5a15f9f59f559f79a6bf246511be968aa39260041f8a07b1188104e258a2188cf565ff3bab4977d9beb605595c814b21b9644e8e65ce39e97e6782323978d -EBUILD schismtracker-20240529.ebuild 1319 BLAKE2B 23c25a3721c9794cb88eef64bc0423656fc9169d2863d4093b59f2b400fd88c91e811e92480e6851cbc5cadb27c7b6d109b790edc7c31018cf6a4a9f2521942d SHA512 d2d6925adfae5952afee421c38bd3788d64228e51a6a50be108350d0f5417fe58a4512c23dde412316db1f24e759fed1135c33c52876eff28164c5e868f783fc +EBUILD schismtracker-20240529.ebuild 1318 BLAKE2B 6d9e2ebe0fdaddb36c0f59cad5a30572ff7a0b51248d5d3b44bf1ce505b5d6611b952fcd60896c0aa88da461be29090b6c17f862c5ab168a6db1a9d91d7c606e SHA512 7588f87bad49c34511af4b9d70610ad44c302cc8257d734bec71082afea29611f8aad1bc81f0bc088f9e29604961af53f260a9946d7cf452512d15f9addbdd8c MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d diff --git a/media-sound/schismtracker/schismtracker-20240529.ebuild b/media-sound/schismtracker/schismtracker-20240529.ebuild index 9f693420ffe6..8978a6403449 100644 --- a/media-sound/schismtracker/schismtracker-20240529.ebuild +++ b/media-sound/schismtracker/schismtracker-20240529.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/ LICENSE="GPL-2 LGPL-2 public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" >=media-libs/libsdl2-2.0.5[X] diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest index a2346755b05e..bf90d047c657 100644 --- a/media-sound/vkeybd/Manifest +++ b/media-sound/vkeybd/Manifest @@ -3,5 +3,5 @@ AUX vkeybd-0.1.18c-fix-buildsystem.patch 2243 BLAKE2B 635d6c46029b9e9012bc938800 DIST vkeybd-0.1.18d.tar.bz2 38918 BLAKE2B 75af417b1458f840c22c4fb1fd10da24a78b1bff9e64c094291643bbe6c2c0dd5e552665ee41765e3cb7659f4d81dc35b69e372291ab1e154f838417b936952b SHA512 d26766e80b598af12e3962d043896f7737685a04dc5bd466be6902cc14a8bf5727900e0dfe66e443169a2539f22a110d1fbbc514a621a4a7cb8aa0e9d38be583 DIST vkeybd-0.1.18e.tar.gz 41157 BLAKE2B c37c32eb90ef6b4eb4af683c6a26d5fbce377a6f0364fe113c5cf826f3d4fc12f14b8f75d67af8ad9e00c571d44a88055cdd6bbaacfa9cbeba2dea15649110ce SHA512 0007d2315e24be26c20884df86fd622f4dd149055fc0e261260a5b7dffa11fe24b52f0f8647bb07c099a13a6612b616dbf800ca701b24376b8d3b66c55e8da11 EBUILD vkeybd-0.1.18d.ebuild 1251 BLAKE2B 5deb886515e00c504e6123086db5beea05e1996adda29d0f14fd9131ced236b0d0d2cd2e352c086ad2e4f9bc5f89f5488e977b7b30f616dd9aeddefc5c3fa50a SHA512 5b93bc7faffb3f365e35678f9c712fbbe54a7106b4cc32b76c00fda036e1dcf9554646c6f97895a13a921de66a9f58f42fcfbc398f33a43c28f3f72992d42f02 -EBUILD vkeybd-0.1.18e.ebuild 1245 BLAKE2B ebdf0baf130548856f7c9d8463482c98a5212d29459e4168135544a3f8a9ad23a67b41b46ce80fb7bccea53af36e5e13c68f37376ca2136e69aa3aaa89d96415 SHA512 a7c178439eeb22ca4a55cb215b02d374cbe38c495c26f953daa1bf8868ddcf3e1a0eccfdca5dc85942881827da51666a98b10072572714a72461e0147e6a1a0b +EBUILD vkeybd-0.1.18e.ebuild 1243 BLAKE2B 9a107e5a8ae9945cd98e6cc83c930db420aceede623cfe6bd9676f5de9b3d418b353b6becfc7499dffe5fd9720976d473615c07ff7a26beb47f242fb6f289e7b SHA512 a21930d5b564840046034818b8df954e0bcbf62caa3f1503a6947a3bdda2f9a3b0a1d8f762028dc7a69a37d2a8e2dac0b8b33331912b3fa65023b331aaa26bf3 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b diff --git a/media-sound/vkeybd/vkeybd-0.1.18e.ebuild b/media-sound/vkeybd/vkeybd-0.1.18e.ebuild index 7ddc220f14dc..f5cea6086183 100644 --- a/media-sound/vkeybd/vkeybd-0.1.18e.ebuild +++ b/media-sound/vkeybd/vkeybd-0.1.18e.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tiwai/vkeybd/archive/refs/tags/v${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" +KEYWORDS="amd64 ~sparc x86" IUSE="alsa lash oss" RDEPEND=" -- cgit v1.2.3