Version bump for deadbeef

2026-01-02 12:02:30 +01:00 · 2023-11-08 16:01:45 +01:00
parent 6da6cfe357
commit 8aaf047252
5 changed files with 294 additions and 0 deletions
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,4 +1,9 @@
 AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a202e1260cb542b4b65d3cec3ec8d2f3fce097646a6bcbbd2204e39c246500b13096714d99426c4f3d468dbf0115c5907a5f SHA512 101e7316165fc28b2a300245c0fa9d86a5c1fdf2823b638fb8c3698df03a559b4dde07ac2aabd1b08ae498a42a7b298e4fc9330d2da9fec80cce6418bd504b9b
+AUX deadbeef-1.9.6-drop-Werror.patch 2503 BLAKE2B 340760fb15bcda932a0de9476e8a840dcccc8808dc743524bf35c1b3cca1ee99c98fa4dd885a7de27c0d2e222a27cd2552b51341fce5943a182446774fa2ca36 SHA512 91c26400dfeb94db72c880d52c2ea62fbcfe512bcba94b055d898f6f41d58c6eec241ac882c5194c3cecde414e1bf73fd1412f627757b2cf5e6202b1c03f6c64
+AUX deadbeef-1.9.6-fix-desktop-launcher.patch 1719 BLAKE2B 77060bb2071ee51d5fbf0e87be2c055833515c3d322845cfb5ae3f9c103daf5e7f7af9a8a3fde124b6b9ba0ed26cc93c37d2a6d0fe085e173819e69384d7e353 SHA512 464406d73f134043adb055b9ddc3ebf97a3a040b451f3a4512f4ae782b4fa56ec4c98720d965de497a8930cbe48b3ddc5a60d3382b1575de8d64b2fa571c1473
+AUX deadbeef-1.9.6-update-gettext.patch 442 BLAKE2B 9ca35a539157daa7c7e11a30400643b4094879c9922b08e7b30fdd132a82743c14b9cffbd74db155e5bcc7f3020f18521d6747b3b440ca958f3fd9a0e5b1dee5 SHA512 5e0ba05537cbb54d9fcecc777ec2e506fd3ede7c4e4eb9a3aae38675b34b1b0dfa57bfa7cd81f5fd4a1c507f7153c2c7cb4b57dccf517c6fce8283f1c0d9a665
 DIST deadbeef-1.9.5.tar.bz2 5204015 BLAKE2B 45b9023807a5652c38f6cafd5ea0fca87e2872db264538f5c9d9ee4815281fe3f4e08eee5d43a083a67b3a9f646de24a90147d76f15622710d8f4adbdabe0c8d SHA512 c7a15f47fd8081a363e5cba732aa4ff4b1c311408728fbc5f7f47cf349bc112274a1d9fe0df8a58f09abf8f7656d914fb1baafa38fdf4dcb38fae7e1f70f682c
+DIST deadbeef-1.9.6.tar.bz2 5182123 BLAKE2B 2cf515dbc3175e04319075462e88d18ee2fae06e8b317d1cc0c958ac23498217bb0a02e0201f47a39dfd4c0092ba568b8aebe4c37c99b439d2dcc18a7848ba2e SHA512 6e507399f7452a66c5591e09d4309f2aab676992d048625c9b4d801ea40af6ce79862fb497e8c94efdf3a13572c964dca717b42f1c946f5ec4695dc38c1db572
 EBUILD deadbeef-1.9.5-r10.ebuild 4375 BLAKE2B c8bf15016c1fc1a04f1e1c119733a90f898ab46e7a48b0f1525a4f9b8150b359a979803f4f7da0e2043b80063fcb3db77412a2ae063f1a6c353745c52663411c SHA512 c5244430b4c7c1a73635650076c94ff604ab749eebec84c6a1470301c921a25de17e1e13b09b572894e2e079e6c36dbb5bee32eabd2484304eac562a4f4bcef9
+EBUILD deadbeef-1.9.6-r10.ebuild 4687 BLAKE2B 63b3e36dc77d58df6e5656e7da0056d5e1ec9f37fdaea4464713aba533d996c4ae45deb36d4153dd6f137bc024e2d77f45fc26e1cb6c2fbcc4dc001d226c06ad SHA512 7f700ec996cbeeaa838ae73dd34834d550e33fb55889068d03930c441f468b934d96506476c01aaedd6ffd5be0d5768001fe1586e8be0d53950b965180e63882
 MISC metadata.xml 1081 BLAKE2B 7c008d6901514e9e05beef2888b7aad4101598f27a80ceeff57623637b672ac6d48bbdfb00239f0e39cec09e5bdc0ed1145575d0497c0dc95271a34a1a3aefce SHA512 d40cf17bb95a7946a985b07607f139a912290a5419f4b38166cdfd554e38b27360390f3abac038882e1cf9042ff9189ff33cc10732d65d99f77fc947a9b74a7d
--- a/media-sound/deadbeef/deadbeef-1.9.6-r10.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.6-r10.ebuild
@@ -0,0 +1,205 @@
+# Copyright 2021-2023 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="https://sourceforge.net/projects/${PN}/files/travis/linux/${PV}/deadbeef-${PV}.tar.bz2/download
+	-> ${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 gtk2 -gtk3 +hotkeys lastfm libretro libsamplerate mod mp3 musepack nls notify +nullout opus oss pulseaudio pipewire sc68 shellexec sid +supereq vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio pipewire nullout )
+"
+
+DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	dev-libs/glib:2
+	dev-libs/jansson:=
+	dev-libs/libdispatch
+	net-misc/curl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11
+	x11-libs/pango
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:=
+		media-libs/libcddb
+		media-sound/cdparanoia
+	)
+	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-libs/libpulse )
+	pipewire? ( media-video/pipewire:= )
+	sid? ( media-libs/libsidplay )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/clang
+	>=sys-devel/gettext-0.21
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.6-drop-Werror.patch
+	"${FILESDIR}"/${PN}-1.9.6-update-gettext.patch
+	"${FILESDIR}"/${PN}-1.9.6-fix-desktop-launcher.patch
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		einfo drop_and_stub "${1}"
+		rm -r "${1}" || die
+		mkdir "${1}" || die
+		cat > "${1}/Makefile.in" <<-EOF || die
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext. (Avoid build failures with musl)
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac ffap mms gme mono2stereo psf shn soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -r "${S}/plugins/rg_scanner/ebur128" || die
+}
+
+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-adplug"
+		"--disable-coreaudio"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-shn"
+		"--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 mod dumb)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(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 pipewire)"
+		"$(use_enable sc68)"
+		"$(use_enable shellexec)"
+		"$(use_enable sid)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable libretro)"
+		"$(use_enable libsamplerate src)"
+		"$(use_enable wavpack)"
+
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+	if use gtk2; then
+		myconf+=( "--disable-gtk3" "--enable-gtk2" )
+	elif use gtk3; then
+		myconf+=( "--disable-gtk2" "--enable-gtk3" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# if compressed, help doesn't work
+	docompress -x /usr/share/doc/${PF}
+}
--- a/media-sound/deadbeef/files/deadbeef-1.9.6-drop-Werror.patch
+++ b/media-sound/deadbeef/files/deadbeef-1.9.6-drop-Werror.patch
@@ -0,0 +1,35 @@
+Remove -Werror 
+
+See also: https://devmanual.gentoo.org/ebuild-writing/common-mistakes/index.html#-werror-compiler-flag-not-removed
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -337,7 +337,7 @@ AS_IF([test "${have_iconv}" = "yes"], [
+     AC_DEFINE(HAVE_LIBICONV,1,[Use libiconv instead of glibc iconv])
+ ])
+ 
+-AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, [], -Werror)
+AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, [])
+ AS_IF([test "${HAVE_SSE2}"], [
+     AC_DEFINE(HAVE_SSE2,1,[Support SSE2 instructions])
+ ])
+--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
+@@ -94,7 +94,7 @@
+ 
+ ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+ 
+-ddb_gui_GTK2_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ddb_gui_GTK2_la_CFLAGS = -std=c99 -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ 
+ endif
+ 
+@@ -105,7 +105,7 @@
+ 
+ ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
+ ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+-ddb_gui_GTK3_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ddb_gui_GTK3_la_CFLAGS = -std=c99 -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS)
+ 
+ nodist_ddb_gui_GTK3_la_SOURCES = gtkui-gresources.c
--- a/media-sound/deadbeef/files/deadbeef-1.9.6-fix-desktop-launcher.patch
+++ b/media-sound/deadbeef/files/deadbeef-1.9.6-fix-desktop-launcher.patch
@@ -0,0 +1,32 @@
+Fix QA issue about malformed desktop launcher.
+
+ * QA Notice: This package installs one or more .desktop files that do not
+ * pass validation.
+ *
+ * 	/usr/share/applications/deadbeef.desktop: error: action group "Desktop Action Next" exists, but there is no matching action "Next"
+ * 	/usr/share/applications/deadbeef.desktop: error: action group "Desktop Action Prev" exists, but there is no matching action "Prev"
+ * 	/usr/share/applications/deadbeef.desktop: error: action group "Desktop Action Stop" exists, but there is no matching action "Stop"
+ * 	/usr/share/applications/deadbeef.desktop: error: file contains group "Desktop Action Toggle Pause", which has an invalid action identifier, only alphanumeric characters and '-' are allowed
+ * 	/usr/share/applications/deadbeef.desktop: error: value "Play;Pause;Toggle Pause;Stop;Next;Prev;" for key "Actions" in group "Desktop Entry" contains invalid action identifier "Toggle Pause", only alphanumeric characters and '-' are allowed
+ *
+
+--- a/deadbeef.desktop.in
+++ b/deadbeef.desktop.in
+@@ -14,7 +14,7 @@
+ Icon=deadbeef
+ Exec=deadbeef %F
+ Terminal=false
+-Actions=Play;Pause;Toggle Pause;Stop;Next;Prev;
+Actions=Play;Pause;Toggle-Pause;Stop;Next;Prev;
+ MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;audio/x-mpegurl;audio/x-scpls;application/x-cue;
+ Categories=Audio;AudioVideo;Player;GTK;
+ Keywords=Sound;Music;Audio;Player;Musicplayer;MP3;
+@@ -35,7 +35,7 @@
+ Name[zh_TW]=暫停
+ Exec=deadbeef --pause
+ 
+-[Desktop Action Toggle Pause]
+[Desktop Action Toggle-Pause]
+ Name=Toggle Pause
+ Name[zh_CN]=播放/暂停
+ Name[zh_TW]=播放/暫停
--- a/media-sound/deadbeef/files/deadbeef-1.9.6-update-gettext.patch
+++ b/media-sound/deadbeef/files/deadbeef-1.9.6-update-gettext.patch
@@ -0,0 +1,17 @@
+Update to a newer gettext to fix clang issues
+
+See also: https://bugs.gentoo.org/908414
+See also: https://github.com/gentoo/gentoo/pull/32491
+--- a/configure.ac
+++ b/configure.ac
+@@ -17,8 +17,8 @@ AC_SYS_LARGEFILE
+ dnl AC_PROG_LIBTOOL
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_C_BIGENDIAN
+-AM_GNU_GETTEXT
+-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
+ PKG_PROG_PKG_CONFIG
+ AM_PROG_CC_C_O
+ AM_ICONV