commit: ee84d83ae840f477f1ce10c1477748ea2cb5445d Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Sun Oct 2 17:23:10 2022 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Sun Oct 2 17:24:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee84d83a
media-sound/deadbeef: 1.9.2 version bump. Together with upstream ffmpeg-5.0 build fixes and Werror dropping patch. Closes: https://bugs.gentoo.org/show_bug.cgi?id=854984 Closes: https://bugs.gentoo.org/show_bug.cgi?id=834392 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> media-sound/deadbeef/Manifest | 1 + media-sound/deadbeef/deadbeef-1.9.2.ebuild | 193 +++++++++++++++++++++ .../files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch | 37 ++++ .../files/deadbeef-1.9.2-drop-Werror.patch | 54 ++++++ 4 files changed, 285 insertions(+) diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest index 315ce3f2e738..dd938b522393 100644 --- a/media-sound/deadbeef/Manifest +++ b/media-sound/deadbeef/Manifest @@ -1,2 +1,3 @@ DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47 DIST deadbeef-1.9.1.tar.bz2 5136384 BLAKE2B 6e8314728b824b182ecb356d9a9cb09364650f6ca6b5e5d2f7077fc048fe62284e4959910a4cf982fd79893c503044d02417633713d0dcf34e93128aff22692e SHA512 2f959fb139078bbde3c1183019545ed3979b3c5dfc051794ea7a5ccf166156acc8d5dface3169ec705059f487d47c9b314c5400770a7572c22fbd0b903eefc5a +DIST deadbeef-1.9.2.tar.bz2 5105029 BLAKE2B fbf63f9df22fecacb2fadfe722856aeaa756bb75796a381822de4c033509f88680bb4ca458f4a270608396b3125911f974c283769da184401c4a152da49e2c27 SHA512 fa4298fb3a89b3891c2f0403b2c66e20f64206101ad44f53be5208a69b33d3de3e0ced329cf090c17a1a3c4f7b28920baf5f8c964df2b6bdea6095465d0a02d9 diff --git a/media-sound/deadbeef/deadbeef-1.9.2.ebuild b/media-sound/deadbeef/deadbeef-1.9.2.ebuild new file mode 100644 index 000000000000..7208c1c907e2 --- /dev/null +++ b/media-sound/deadbeef/deadbeef-1.9.2.ebuild @@ -0,0 +1,193 @@ +# 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-1.9.2-drop-Werror.patch" + "${FILESDIR}/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch" +) + +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-1.9.1-ffmpeg-5.0-fixes.patch b/media-sound/deadbeef/files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch new file mode 100644 index 000000000000..14f6b8e70556 --- /dev/null +++ b/media-sound/deadbeef/files/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch @@ -0,0 +1,37 @@ +From 7b52bac5a69abeab6d8b6601fd9e36803842d9c1 Mon Sep 17 00:00:00 2001 +From: xuzhen <xuz...@users.noreply.github.com> +Date: Sun, 2 Oct 2022 12:23:02 +0800 +Subject: [PATCH] Fix build with ffmpeg 5.0+ + +av_iformat_next was replaced with av_demuxer_iterate. https://trac.ffmpeg.org/wiki/Bump59 +--- + plugins/ffmpeg/ffmpeg.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 5409cc482..bfc9b6f6f 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -802,7 +802,12 @@ ffmpeg_init_exts (void) { + * encoding purpose, because ffmpeg will guess the output format from + * the file name specified by users. + */ ++#if LIBAVFORMAT_VERSION_MAJOR >= 59 ++ void *iter = NULL; ++ while ((ifmt = av_demuxer_iterate(&iter))) { ++#else + while ((ifmt = av_iformat_next(ifmt))) { ++#endif + #ifdef AV_IS_INPUT_DEVICE + if (ifmt->priv_class && AV_IS_INPUT_DEVICE(ifmt->priv_class->category)) + continue; // Skip all input devices +@@ -849,7 +854,9 @@ ffmpeg_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) { + static int + ffmpeg_start (void) { + ffmpeg_init_exts (); ++#if LIBAVFORMAT_VERSION_MAJOR < 58 + av_register_all (); ++#endif + return 0; + } + diff --git a/media-sound/deadbeef/files/deadbeef-1.9.2-drop-Werror.patch b/media-sound/deadbeef/files/deadbeef-1.9.2-drop-Werror.patch new file mode 100644 index 000000000000..ec005fc6c8c1 --- /dev/null +++ b/media-sound/deadbeef/files/deadbeef-1.9.2-drop-Werror.patch @@ -0,0 +1,54 @@ +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
