Apply changes from upstream to deadbeef

media-sound/deadbeef/Manifest

@@ -1,7 +1,6 @@
-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.6.tar.bz2 5182123 BLAKE2B 2cf515dbc3175e04319075462e88d18ee2fae06e8b317d1cc0c958ac23498217bb0a02e0201f47a39dfd4c0092ba568b8aebe4c37c99b439d2dcc18a7848ba2e SHA512 6e507399f7452a66c5591e09d4309f2aab676992d048625c9b4d801ea40af6ce79862fb497e8c94efdf3a13572c964dca717b42f1c946f5ec4695dc38c1db572
-EBUILD deadbeef-1.9.6-r10.ebuild 4687 BLAKE2B 63b3e36dc77d58df6e5656e7da0056d5e1ec9f37fdaea4464713aba533d996c4ae45deb36d4153dd6f137bc024e2d77f45fc26e1cb6c2fbcc4dc001d226c06ad SHA512 7f700ec996cbeeaa838ae73dd34834d550e33fb55889068d03930c441f468b934d96506476c01aaedd6ffd5be0d5768001fe1586e8be0d53950b965180e63882
+EBUILD deadbeef-1.9.6-r10.ebuild 4741 BLAKE2B 2e71b49cbb6c53335dc78df97411f544d4898120a1825f0b15c8f8721e0622dfc26f5676d4676d1aec9dfaf3ab1d655c6d06af77632e93be8fde57df44b4c5f4 SHA512 9846ac14345a46d389f27345d298b459a7e54590ce3b8d2dc96eae505143e59388b6143e31ec8d3118b49b04b5c0c06be79338f4e3614184a1b628e548a14cbe
 MISC metadata.xml 1081 BLAKE2B 7c008d6901514e9e05beef2888b7aad4101598f27a80ceeff57623637b672ac6d48bbdfb00239f0e39cec09e5bdc0ed1145575d0497c0dc95271a34a1a3aefce SHA512 d40cf17bb95a7946a985b07607f139a912290a5419f4b38166cdfd554e38b27360390f3abac038882e1cf9042ff9189ff33cc10732d65d99f77fc947a9b74a7d

media-sound/deadbeef/deadbeef-1.9.6-r10.ebuild

@@ -13,11 +13,12 @@ SRC_URI="https://sourceforge.net/projects/${PN}/files/travis/linux/${PV}/deadbee
 LICENSE="
 	GPL-2
 	LGPL-2.1
+	MIT
 	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"
+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 zip"
 
 REQUIRED_USE="
 	|| ( alsa oss pulseaudio pipewire nullout )
@@ -47,8 +48,10 @@ DEPEND="
 		media-libs/flac:=
 		media-libs/libogg
 	)
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	libsamplerate? ( media-libs/libsamplerate )
-	mp3? ( media-sound/mpg123 )
+	mp3? ( media-sound/mpg123-base )
 	musepack? ( media-sound/musepack-tools )
 	nls? ( virtual/libintl )
 	notify? ( sys-apps/dbus )
@@ -58,14 +61,15 @@ DEPEND="
 	sid? ( media-libs/libsidplay )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
+	zip? ( dev-libs/libzip:= )
 "
 
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-util/intltool
-	sys-devel/clang
+	llvm-core/clang
 	>=sys-devel/gettext-0.21
-	sys-devel/llvm
+	llvm-core/llvm
 	virtual/pkgconfig
 "
 
@@ -105,8 +109,6 @@ src_prepare() {
 	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 () {
@@ -138,12 +140,10 @@ src_configure () {
 		"--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"
@@ -180,11 +180,13 @@ src_configure () {
 		"$(use_enable libretro)"
 		"$(use_enable libsamplerate src)"
 		"$(use_enable wavpack)"
+		"$(use_enable zip vfs-zip)"
 
 		"--enable-vfs-curl"
 		"--enable-shared"
 		"--enable-m3u"
 		"--enable-pltbrowser"
+		"--enable-rgscanner"
 	)
 	if use gtk2; then
 		myconf+=( "--disable-gtk3" "--enable-gtk2" )

media-sound/deadbeef/files/deadbeef-1.9.2-drop-Werror.patch

@@ -1,54 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e11ae7e..8e3c590 100644
---- 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])
- ])
-diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
-index 739cdbb..cc0dce9 100644
---- a/plugins/gtkui/Makefile.am
-+++ b/plugins/gtkui/Makefile.am
-@@ -94,7 +94,7 @@ ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
- 
- 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 ../../analyzer/libanalyzer.la ../../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) -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) -DDDB_WARN_DEPRECATED=1
- 
- endif
- 
-@@ -105,7 +105,7 @@ ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
- 
- 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 ../../analyzer/libanalyzer.la ../../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) -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) -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
-diff --git a/plugins/gtkui/Makefile.in b/plugins/gtkui/Makefile.in
-index 319bda2..66baad7 100644
---- a/plugins/gtkui/Makefile.in
-+++ b/plugins/gtkui/Makefile.in
-@@ -723,12 +723,12 @@ sdk_HEADERS = gtkui_api.h
- @HAVE_GTK2_TRUE@ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
- @HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
- @HAVE_GTK2_TRUE@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 ../../analyzer/libanalyzer.la ../../scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
--@HAVE_GTK2_TRUE@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) -DDDB_WARN_DEPRECATED=1
-+@HAVE_GTK2_TRUE@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) -DDDB_WARN_DEPRECATED=1
- @HAVE_GTK3_TRUE@GTKUI_SOURCES_GTK3 = deadbeefapp.c deadbeefapp.h $(GTKUI_SOURCES)
- @HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
- @HAVE_GTK3_TRUE@ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
- @HAVE_GTK3_TRUE@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 ../../analyzer/libanalyzer.la ../../scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
--@HAVE_GTK3_TRUE@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) -DDDB_WARN_DEPRECATED=1
-+@HAVE_GTK3_TRUE@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) -DDDB_WARN_DEPRECATED=1
- @HAVE_GTK3_TRUE@ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS)
- @HAVE_GTK3_TRUE@nodist_ddb_gui_GTK3_la_SOURCES = gtkui-gresources.c
- @HAVE_GTK3_TRUE@BUILT_SOURCES = gtkui-gresources.c