gentoo auto-resync : 01:07:2024 - 08:00:50

3 files changed, 97 insertions, 3 deletions

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-r4.ebuild
index 38296a84ca1d..f7133973d09b 100644
--- a/media-sound/bristol/bristol-0.60.11-r3.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r4.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
-HOMEPAGE="https://sourceforge.net/projects/bristol"
+HOMEPAGE="https://sourceforge.net/projects/bristol/"
 SRC_URI="https://downloads.sourceforge.net/bristol/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa oss"
 # osc : configure option but no code it seems...
 # jack: fails to build if disabled
@@ -33,6 +33,7 @@ PATCHES=(
 	"${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() {
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 <stdio.h>
++#include <sys/types.h>
+ 
+ #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 <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <strings.h>
+ #include <errno.h>
+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 <sys/unistd.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+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 <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/select.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #include <unistd.h>
+ 
+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 <string.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ #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 <sys/stat.h>
+ #include <fcntl.h>
+ #include <pthread.h>
++#include <stdlib.h>
+ 
+ #include "bristol.h"
+ #include "bristolmidi.h"