commit: 6f4cb8cabb375778e5d27abe788500f6c3011f20 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Wed Sep 21 15:45:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 22 01:09:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4cb8ca
media-sound/deadbeef: Fix the build with musl There are two more musl build issues, but they are musl bugs that affect code that is force disabled in the ebuild. See: https://github.com/DeaDBeeF-Player/deadbeef/issues/2856 https://github.com/DeaDBeeF-Player/deadbeef/issues/2857 https://www.openwall.com/lists/musl/2022/04/12/1 Bug: https://bugs.gentoo.org/870187 Closes: https://bugs.gentoo.org/870187 Upstream-Commit: https://github.com/DeaDBeeF-Player/deadbeef/commit/6864a5779fd6beb21507357736e0c988748cec5a Upstream-Issue: https://github.com/DeaDBeeF-Player/deadbeef/issues/2858 Upstream-PR: https://github.com/DeaDBeeF-Player/deadbeef/pull/2859 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/27377 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild | 1 + media-sound/deadbeef/files/deadbeef-musl.patch | 27 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild index 97c9f5b329de..e555833d4e50 100644 --- a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild +++ b/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild @@ -66,6 +66,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch" + "${FILESDIR}/deadbeef-musl.patch" # 870187 ) src_prepare() { diff --git a/media-sound/deadbeef/files/deadbeef-musl.patch b/media-sound/deadbeef/files/deadbeef-musl.patch new file mode 100644 index 000000000000..a62827243e9f --- /dev/null +++ b/media-sound/deadbeef/files/deadbeef-musl.patch @@ -0,0 +1,27 @@ +https://github.com/DeaDBeeF-Player/deadbeef/commit/6864a5779fd6beb21507357736e0c988748cec5a + +Bug: https://bugs.gentoo.org/870187 + +From 6864a5779fd6beb21507357736e0c988748cec5a Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Wed, 21 Sep 2022 08:36:46 -0700 +Subject: [PATCH] Fix the build with musl + +Fixes: https://github.com/DeaDBeeF-Player/deadbeef/issues/2858 +--- + threading_pthread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/threading_pthread.c b/threading_pthread.c +index 004eb6bdc..8d5f4c31c 100644 +--- a/threading_pthread.c ++++ b/threading_pthread.c +@@ -97,7 +97,7 @@ thread_start_low_priority (void (*fn)(void *ctx), void *ctx) { + pthread_cancel (tid); + return 0; + } +- return tid; ++ return (intptr_t)tid; + #else + return thread_start (fn, ctx); + #endif
