From 97e5ac8a082d0d11fc18e8b8994a78e8d155899e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Oct 2022 21:56:23 +0100 Subject: gentoo auto-resync : 26:10:2022 - 21:56:23 --- media-sound/Manifest.gz | Bin 57188 -> 57195 bytes media-sound/deadbeef/Manifest | 3 +- media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild | 194 +++++++++++++++++++++ media-sound/deadbeef/deadbeef-1.9.2.ebuild | 193 -------------------- ...deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch | 34 ++++ 5 files changed, 230 insertions(+), 194 deletions(-) create mode 100644 media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild delete mode 100644 media-sound/deadbeef/deadbeef-1.9.2.ebuild create mode 100644 media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 94e1e43eebdd..500c5eea816c 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest index 70c2b5cb75ab..f862075a6ca6 100644 --- a/media-sound/deadbeef/Manifest +++ b/media-sound/deadbeef/Manifest @@ -1,4 +1,5 @@ AUX deadbeef-1.9.1-ffmpeg-5.0-fixes.patch 1298 BLAKE2B 5ff65bf6208ad7e75c56db0a47ff6a70e7d014140355dcdce902e3d443752b058f1abc4b4dfb5f99bc0ac28de38401f3ada135404c02ccfe072c106ae6fd1cd7 SHA512 f8617108d2720a033ec072433f076921f5150775c345767a658d474e8d9eccf7dec3d1fbac509f0629e8ac28c3edef1426cef3dc38458dce6df5d11e1b7f2156 +AUX deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch 1122 BLAKE2B 7693cb8fa0c5951eae240ff2d1ea7ca68c151dfcacab27dcb1cb293ae84e8ec11b94d49017f8a942b7443a9d80fcbda3a87eff84bf71d19ea1bb92fc64baf832 SHA512 ae7bddf970898d2e07ade6752b09f26782529186d880bceba93777380b103b2de8c67fbae784841904515e7a8c16e4bc34a6d1f390e1f6633ecff0bd3100dc58 AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a202e1260cb542b4b65d3cec3ec8d2f3fce097646a6bcbbd2204e39c246500b13096714d99426c4f3d468dbf0115c5907a5f SHA512 101e7316165fc28b2a300245c0fa9d86a5c1fdf2823b638fb8c3698df03a559b4dde07ac2aabd1b08ae498a42a7b298e4fc9330d2da9fec80cce6418bd504b9b AUX deadbeef-musl.patch 829 BLAKE2B 91294830e50ff996438563ab2b4ac4bd943d3f2c072ff5982ff810671389994b57d27d73dd61ca76ca4563974fc91254403cc946d95643941f23a808fa2f5c90 SHA512 5a7be29335f9b8a6a85dc233856346a216b1c7a0ade17f483d8c1144099e7b0ebb5a5ba531f96fa4fe6737f0971ff2bf1772edaf3739e81c54bebbdea11e6eeb AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6 @@ -9,5 +10,5 @@ EBUILD deadbeef-1.8.8-r3.ebuild 4014 BLAKE2B ea7c4dff97eddc3c2f0b4ad6449b3dc7cb5 EBUILD deadbeef-1.8.8-r4.ebuild 4043 BLAKE2B 5008997377e53d221c24586054f9c541c3d36f6200b2e78d532d55704114a1d3d369144456fab685b5e5543510d7125a2db5e5fa9b55e6050ef78479ffa1a83a SHA512 c79472edef844bf8d6e8117f136ba660ec106994583c1652ee0e8936bcd993ab7d84bc36a22e515a3a77d865a667c6a254f4bc7a8e73dba374dcde437a76a41e EBUILD deadbeef-1.9.1-r2.ebuild 4015 BLAKE2B a0a3bb5266ce7e8d691f6a888be0e466b31fa9bbd4ce4fab77800ebd7d2c07f1fa8bb57d15e6542777d98f1dfd9ef1447774df471360fb5104ded398bd078aae SHA512 18f2ed71b40dc9c29273901b793628cccf0f8d2e54d7bc29b376d3702079d961020548d208347058cf9654e0f0d6c9ae7a547cef7f0f2194210ed5808a81bfe3 EBUILD deadbeef-1.9.1-r3.ebuild 4071 BLAKE2B 0d33c9e8db1898d3a957dce8bbd0e8b67255f308b413cd223d07d07e702a760558414f47a19d4906a8f9136ee7feb9c537f654c5df992d29663c076b104696ff SHA512 a32d0846460d4b6ea3e5f028a3c494ebcba7ffffc91935997c9440dc539b99be574816dbc87a7719aa9583864b5ad927757770990c997d545203813ca54ca6e2 -EBUILD deadbeef-1.9.2.ebuild 4128 BLAKE2B 073510990b95f3bf61076b9640f7a3ed92531f4e4511467604f7c446c67685678944d89deea04f25b16cb7d3f4445e3c64638469184c062fdfb6f3405e546763 SHA512 27d408268e6f1ccf2bbd3510b471c9f454aafee752af6d2d942191cf392474f4f52c57d2eead882c75c49bcfb35afc32e512f9c248b47e0843567d0efa20c359 +EBUILD deadbeef-1.9.2-r1.ebuild 4191 BLAKE2B 42d24a0ceaf9867a1a7e8ba38fc500eb531ba0b865850bc4853d8fe317d337c3d6d28e9c601e0d82e73740a0643124d340c04dd27f95f7717bb00661067b1d27 SHA512 fffd91bdb425acd9ac55107f5f69f74947065332a89751154295c2d66b1b3cc4443cb0c8678242b731fd848d7e8f85ab3df3ce04a09fcb5b0d9b9adf103d2c66 MISC metadata.xml 969 BLAKE2B 0f8c160dd8cf50b9d8ed80efe90575527ec0a732f1c0e3dc5c3bf8ad77cea61a81af60de3b49cb38e7fe89128db136a0e61537fdcb93a89745bd0e11b69e3e71 SHA512 4ab2ea957796b6cf15129365f10d876b794bab521861e23f0f166f413c723b34f8cac17799cfc18529498a462d7bac7f633ec33093627c4167c3f4471d43da3a diff --git a/media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild b/media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild new file mode 100644 index 000000000000..669ba2ccf77e --- /dev/null +++ b/media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild @@ -0,0 +1,194 @@ +# 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" + "${FILESDIR}/deadbeef-1.9.2-cdda-plugin-clang-16-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/deadbeef-1.9.2.ebuild b/media-sound/deadbeef/deadbeef-1.9.2.ebuild deleted file mode 100644 index 7208c1c907e2..000000000000 --- a/media-sound/deadbeef/deadbeef-1.9.2.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# 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.2-cdda-plugin-clang-16-fixes.patch b/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch new file mode 100644 index 000000000000..cef941162b93 --- /dev/null +++ b/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch @@ -0,0 +1,34 @@ +From 779066a54aa8a1a92b92ebdabc8a93d6ef3fb3ba Mon Sep 17 00:00:00 2001 +From: Oleksiy Yakovenko +Date: Wed, 26 Oct 2022 11:50:02 +0200 +Subject: [PATCH] cdda: enum cast fix (fixes #2879) + +--- + plugins/cdda/cdda.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/cdda/cdda.c b/plugins/cdda/cdda.c +index 7229d9592..2fe3b5fda 100644 +--- a/plugins/cdda/cdda.c ++++ b/plugins/cdda/cdda.c +@@ -846,7 +846,7 @@ get_param (const char *key, char *value, int len, const char *def) + "property \"CD drive to load\" select[%u] cdda.drive_device 0" + + static int +-cda_action_add_cd (DB_plugin_action_t *act, int ctx) ++cda_action_add_cd (DB_plugin_action_t *act, ddb_action_context_t ctx) + { + /* Get all devices containg CD audio media */ + cdio_close_tray(NULL, NULL); +@@ -982,7 +982,7 @@ load_cddb_data (ddb_playlist_t *plt, cddb_disc_t *disc, const size_t disc_num) + } + + static int +-action_disc_n (DB_plugin_action_t *act, int ctx) ++action_disc_n (DB_plugin_action_t *act, ddb_action_context_t ctx) + { + const int disc_num = atoi(act->name+11); + int res = -1; +-- +2.38.1 + -- cgit v1.2.3