gentoo auto-resync : 22:09:2022 - 05:27:18

5 files changed, 225 insertions, 2 deletions

diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index a7a120dcb8e0..dda8b2803023 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,7 +1,9 @@
+AUX deadbeef-musl.patch 829 BLAKE2B 91294830e50ff996438563ab2b4ac4bd943d3f2c072ff5982ff810671389994b57d27d73dd61ca76ca4563974fc91254403cc946d95643941f23a808fa2f5c90 SHA512 5a7be29335f9b8a6a85dc233856346a216b1c7a0ade17f483d8c1144099e7b0ebb5a5ba531f96fa4fe6737f0971ff2bf1772edaf3739e81c54bebbdea11e6eeb
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
 DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47
 DIST deadbeef-1.9.1.tar.bz2 5136384 BLAKE2B 6e8314728b824b182ecb356d9a9cb09364650f6ca6b5e5d2f7077fc048fe62284e4959910a4cf982fd79893c503044d02417633713d0dcf34e93128aff22692e SHA512 2f959fb139078bbde3c1183019545ed3979b3c5dfc051794ea7a5ccf166156acc8d5dface3169ec705059f487d47c9b314c5400770a7572c22fbd0b903eefc5a
 EBUILD deadbeef-1.8.8-r3.ebuild 4014 BLAKE2B ea7c4dff97eddc3c2f0b4ad6449b3dc7cb5c0f7f9fd8cc3a03fab84bfe9838a90e104ac128156be569e3b6320c0b19743f67665d42946b59ee8822812dde6455 SHA512 88e4ff5728e22f9e3ddf9dc3789b56c146a65f99963ab09dd09b2c9fb5bc30c62d54eaa4c605fc2a01348d6b6289cb706c21186d18dd758e5e1a1cbfed10794b
 EBUILD deadbeef-1.8.8-r4.ebuild 4043 BLAKE2B 5008997377e53d221c24586054f9c541c3d36f6200b2e78d532d55704114a1d3d369144456fab685b5e5543510d7125a2db5e5fa9b55e6050ef78479ffa1a83a SHA512 c79472edef844bf8d6e8117f136ba660ec106994583c1652ee0e8936bcd993ab7d84bc36a22e515a3a77d865a667c6a254f4bc7a8e73dba374dcde437a76a41e
-EBUILD deadbeef-1.9.1-r2.ebuild 3971 BLAKE2B 44315ddeed4d1af490312370d4b39e19663a9bc46903410aaf6cacfed8c9afc5054169d2032f62da8d16ffa171863f245d5879f05efbb29048a30e20ecc78884 SHA512 e44b0d95e29af93e350505f5e2b27458ee3dca6575413e390a6272666f81a8b4f2cd41509cd0c9f029bd36fb5ac620a32010fa38517da30061412b4d47a5e2db
-MISC metadata.xml 892 BLAKE2B f13f0c59c3f1085f2b14a480d1c0fceca3cae3aa72523fe8ea7c92ec44f392e2f005df3bd46442d9d7bd1b9cfbf087319b679bcded7a53549789c2e481b8f5cc SHA512 a1fb3ea4e169b3b02345977dd6032bdf790b993be96778348b7eefc3900b2d2faa285d6a5e4cfdc9c48148397f5e58e9b6d48986e6f8245758bd06e4dfda51c0
+EBUILD deadbeef-1.9.1-r2.ebuild 4015 BLAKE2B a0a3bb5266ce7e8d691f6a888be0e466b31fa9bbd4ce4fab77800ebd7d2c07f1fa8bb57d15e6542777d98f1dfd9ef1447774df471360fb5104ded398bd078aae SHA512 18f2ed71b40dc9c29273901b793628cccf0f8d2e54d7bc29b376d3702079d961020548d208347058cf9654e0f0d6c9ae7a547cef7f0f2194210ed5808a81bfe3
+EBUILD deadbeef-1.9.1-r3.ebuild 4071 BLAKE2B 0d33c9e8db1898d3a957dce8bbd0e8b67255f308b413cd223d07d07e702a760558414f47a19d4906a8f9136ee7feb9c537f654c5df992d29663c076b104696ff SHA512 a32d0846460d4b6ea3e5f028a3c494ebcba7ffffc91935997c9440dc539b99be574816dbc87a7719aa9583864b5ad927757770990c997d545203813ca54ca6e2
+MISC metadata.xml 969 BLAKE2B 0f8c160dd8cf50b9d8ed80efe90575527ec0a732f1c0e3dc5c3bf8ad77cea61a81af60de3b49cb38e7fe89128db136a0e61537fdcb93a89745bd0e11b69e3e71 SHA512 4ab2ea957796b6cf15129365f10d876b794bab521861e23f0f166f413c723b34f8cac17799cfc18529498a462d7bac7f633ec33093627c4167c3f4471d43da3a
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/deadbeef-1.9.1-r3.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild
new file mode 100644
index 000000000000..a4a08e5811cc
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild
@@ -0,0 +1,192 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg flag-o-matic toolchain-funcs plocale
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:=
+	dev-libs/jansson:=
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:=
+	)
+	cover? (
+		media-libs/imlib2[jpeg,png]
+	)
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac:=
+		media-libs/libogg
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? (
+		sys-apps/dbus
+	)
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	dev-libs/libdispatch
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+	"${FILESDIR}/deadbeef-musl.patch" # 870187
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local myconf=(
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable sc68)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable libsamplerate src)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
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
diff --git a/media-sound/deadbeef/metadata.xml b/media-sound/deadbeef/metadata.xml
index 8d086b986004..acd56395e578 100644
--- a/media-sound/deadbeef/metadata.xml
+++ b/media-sound/deadbeef/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="cover">Support for cover art</flag>
 		<flag name="hotkeys">Keyboard shortcuts support</flag>
 		<flag name="lastfm">last.fm/AudioScrobbler protocol support</flag>
+		<flag name="libsamplerate">Support the Secret Rabbit Code resampler</flag>
 		<flag name="notify">Desktop notifications support</flag>
 		<flag name="nullout">Dummy output driver</flag>
 		<flag name="sc68">Atari ST and Amiga music player</flag>