diff options
| author |   orbea <orbea@riseup.net> | 2022-09-21 08:45:07 -0700 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-09-22 02:09:01 +0100 |
| commit | 6f4cb8cabb375778e5d27abe788500f6c3011f20 (patch) | |
| tree | 446f7579f58b783930f885f51cb078a444c599e2 /media-sound | |
| parent | sys-fs/ntfs3g: add github upstream metadata (diff) | |
| download | gentoo-6f4cb8cabb375778e5d27abe788500f6c3011f20.tar.gz gentoo-6f4cb8cabb375778e5d27abe788500f6c3011f20.tar.bz2 gentoo-6f4cb8cabb375778e5d27abe788500f6c3011f20.zip | |
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@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/27377
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild | 1 | ||||
| -rw-r--r-- | media-sound/deadbeef/files/deadbeef-musl.patch | 27 |
2 files changed, 28 insertions, 0 deletions
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 <orbea@riseup.net> +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 |