commit: 7d0d6669b10193e155bf9c8cf30eab47bc4b6ea6 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jun 2 13:24:15 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jun 2 14:56:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0d6669
media-sound/xmms2: drop 0.8_p20201016-r2 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-sound/xmms2/Manifest | 3 - media-sound/xmms2/files/xmms2-0.8-rtvg.patch | 31 --- .../files/xmms2-0.8_p20161122-cpp-client.patch | 16 -- .../xmms2/files/xmms2-0.8_p20161122-faad.patch | 16 -- .../xmms2/files/xmms2-0.8_p20161122-mac-4.patch | 38 ---- .../xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch | 127 ----------- media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild | 237 --------------------- 7 files changed, 468 deletions(-) diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index e49b5778f52a..39e87419b578 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -1,4 +1 @@ -DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5 -DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a -DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch deleted file mode 100644 index e0a970c91869..000000000000 --- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add knob to disable valgrind at test runtime. - -When valgrind is installed in system but is not -working we should still be able to run tests. - -Bug: https://bugs.gentoo.org/424377 ---- a/waftools/unittest.py -+++ b/waftools/unittest.py -@@ -64,7 +64,8 @@ def generate_coverage(bld): - - def configure(conf): - conf.load("waf_unit_test") -- conf.find_program("valgrind", var="VALGRIND", mandatory=False) -+ if conf.options.enable_valgrind is True: -+ conf.find_program("valgrind", var="VALGRIND", mandatory=False) - conf.find_program("lcov", var="LCOV", mandatory=False) - conf.find_program("genhtml", var="GENHTML", mandatory=False) - ---- a/wscript -+++ b/wscript -@@ -501,6 +501,10 @@ def options(opt): - dest='ldconfig', help="Run ldconfig after install even if not root") - opt.add_option('--without-ldconfig', action='store_false', - dest='ldconfig', help="Don't run ldconfig after install") -+ opt.add_option('--with-valgrind', action='store_true', default=None, -+ dest='enable_valgrind', help="Run testsuite under valgrind (if present).") -+ opt.add_option('--without-valgrind', action='store_false', default=None, -+ dest='enable_valgrind', help="Don't run testsuite under valgrind.") - - opt.sub_options("src/xmms") - for o in optional_subdirs + subdirs: diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch deleted file mode 100644 index df1d1c616576..000000000000 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/xmms2/xmms2-devel/pull/5 - -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Thu, 6 Dec 2018 07:19:08 +0000 -Subject: [PATCH] OTHER: fix c++ client dangling reference ---- a/src/include/xmmsclient/xmmsclient++/mainloop.h -+++ b/src/include/xmmsclient/xmmsclient++/mainloop.h -@@ -41,7 +41,7 @@ namespace Xmms - * @note The constructor should only initialize the - * mainloop, not start it! - */ -- MainloopInterface( xmmsc_connection_t* conn ) : -+ MainloopInterface( xmmsc_connection_t*& conn ) : - running_( false ), conn_( conn ) { } - - /** Destructor. Should also stop the loop. diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch deleted file mode 100644 index 2a206b913fe4..000000000000 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch +++ /dev/null @@ -1,16 +0,0 @@ -This line has stopped working since security fixes in the faad 2.9.0 -release. XMMS2 upstream were informed via IRC but have yet to act on -it. I've run XMMS2 with this patch for months without issue. - --- Chewi - ---- a/src/plugins/faad/faad.c -+++ b/src/plugins/faad/faad.c -@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform) - * and durations calculations... So we cheat and tell libfaad2 we're feeding - * it frame 1. - */ -- NeAACDecPostSeekReset (data->decoder, 1); - - /* FIXME: Because for HE AAC files some versions of libfaad return the wrong - * samplerate in init, we have to do one read and let it decide the real diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch deleted file mode 100644 index 9785b4198d51..000000000000 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/xmms2/xmms2-devel/pull/2 - -From: Jérôme Carretero <c...@zougloub.eu> -Date: Tue, 24 Oct 2017 18:43:26 -0400 -Subject: [PATCH] plugins: mac: support newer mac API version ---- a/src/plugins/mac/mac.cpp -+++ b/src/plugins/mac/mac.cpp -@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform) - gchar *name; - - field_name = pTagField->GetFieldName (); -- name = (gchar *)GetUTF8FromUTF16 (field_name); - -+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000 -+ name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name); -+#else -+ name = (gchar *)GetUTF8FromUTF16 (field_name); -+#endif - memset (field_value, 0, 255); - int size = 255; - p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE); ---- a/src/plugins/mac/source_adapter.h -+++ b/src/plugins/mac/source_adapter.h -@@ -38,7 +38,13 @@ public: - ~CSourceAdapter () {}; - - // open / close -- int Open (const wchar_t * pName) { return ERROR_SUCCESS; } -+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000 -+ int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE) -+#else -+ int Open (const wchar_t * pName) -+#endif -+ { return ERROR_SUCCESS; } -+ - int Close () { return ERROR_SUCCESS; } - - // read / write diff --git a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch deleted file mode 100644 index b338e57cdfca..000000000000 --- a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch +++ /dev/null @@ -1,127 +0,0 @@ -Lazy migration from audio4 that's missing in ffmpeg5, may not be -entirely right but tested to play at least .tta/.wma properly. - -https://github.com/xmms2/xmms2-devel/pull/11 - -Bug: https://bugs.gentoo.org/834398 -Signed-off-by: Ionen Wolkens <io...@gentoo.org> ---- a/src/plugins/avcodec/avcodec.c -+++ b/src/plugins/avcodec/avcodec.c -@@ -32,4 +32,5 @@ - typedef struct { - AVCodecContext *codecctx; -+ AVPacket packet; - - guchar *buffer; -@@ -150,4 +151,5 @@ - data->buffer_size = AVCODEC_BUFFER_SIZE; - data->codecctx = NULL; -+ data->packet.size = 0; - - data->read_out_frame = av_frame_alloc (); -@@ -155,6 +157,4 @@ - xmms_xform_private_data_set (xform, data); - -- avcodec_register_all (); -- - mimetype = xmms_xform_indata_get_str (xform, - XMMS_STREAM_TYPE_MIMETYPE); -@@ -467,43 +467,35 @@ - xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data) - { -- int got_frame = 0; -- gint bytes_read = 0; -- AVPacket packet; -+ int rc = 0; - -- av_init_packet (&packet); -- packet.data = data->buffer; -- packet.size = data->buffer_length; -- -- /* clear buffers and reset fields to defaults */ -- av_frame_unref (data->read_out_frame); -- -- bytes_read = avcodec_decode_audio4 ( -- data->codecctx, data->read_out_frame, &got_frame, &packet); -- -- /* The DTS decoder of ffmpeg is buggy and always returns -- * the input buffer length, get frame length from header */ -- /* FIXME: Is ^^^^ still true? */ -- if (!strcmp (data->codec_id, "dca") && bytes_read > 0) { -- bytes_read = ((int)data->buffer[5] << 12) | -- ((int)data->buffer[6] << 4) | -- ((int)data->buffer[7] >> 4); -- bytes_read = (bytes_read & 0x3fff) + 1; -+ if (data->packet.size == 0) { -+ av_init_packet (&data->packet); -+ data->packet.data = data->buffer; -+ data->packet.size = data->buffer_length; -+ -+ rc = avcodec_send_packet(data->codecctx, &data->packet); -+ if (rc == AVERROR_EOF) -+ rc = 0; -+ } -+ -+ if (rc == 0) { -+ rc = avcodec_receive_frame(data->codecctx, data->read_out_frame); -+ if (rc < 0) { -+ data->packet.size = 0; -+ data->buffer_length = 0; -+ if (rc == AVERROR(EAGAIN)) rc = 0; -+ else if (rc == AVERROR_EOF) rc = 1; -+ } -+ else -+ rc = 1; - } - -- if (bytes_read < 0 || bytes_read > data->buffer_length) { -+ if (rc < 0) { -+ data->packet.size = 0; - XMMS_DBG ("Error decoding data!"); - return -1; - } - -- if (bytes_read < data->buffer_length) { -- data->buffer_length -= bytes_read; -- g_memmove (data->buffer, -- data->buffer + bytes_read, -- data->buffer_length); -- } else { -- data->buffer_length = 0; -- } -- -- return got_frame ? 1 : 0; -+ return rc; - } - ---- a/src/plugins/avcodec/wscript -+++ b/src/plugins/avcodec/wscript -@@ -2,5 +2,5 @@ - - ## Code fragments for configuration --avcodec_decode_audio4_fragment = """ -+avcodec_send_packet_fragment = """ - #ifdef HAVE_LIBAVCODEC_AVCODEC_H - # include "libavcodec/avcodec.h" -@@ -10,9 +10,7 @@ - int main(void) { - AVCodecContext *ctx; -- AVFrame *frame; -- int got_frame; - AVPacket *pkt; - -- avcodec_decode_audio4 (ctx, frame, &got_frame, pkt); -+ avcodec_send_packet (ctx, pkt); - - return 0; -@@ -44,7 +42,7 @@ - # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9 - # * libav: commit 0eea212, lavc 53.25.0, release 0.8 -- conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec", -- uselib_store="avcodec_decode_audio4", -- msg="Checking for function avcodec_decode_audio4", mandatory=True) -+ conf.check_cc(fragment=avcodec_send_packet_fragment, uselib="avcodec", -+ uselib_store="avcodec_send_packet", -+ msg="Checking for function avcodec_send_packet", mandatory=True) - - # non-mandatory function avcodec_free_frame since diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild deleted file mode 100644 index 0edb6f31cd7f..000000000000 --- a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs - -XMMS2_COMMIT="46da10f0e20c53fd2b40843617ed182c0cba4ebb" -S4_COMMIT="652ac581df7a0bca04334da397f8bb4f86eb7b59" -WAF_VER="2.0.22" - -DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player" -HOMEPAGE="https://github.com/XMMS2"; -SRC_URI=" - https://github.com/xmms2/xmms2-devel/archive/${XMMS2_COMMIT}.tar.gz -> ${P}.tar.gz - https://github.com/xmms2/s4/archive/${S4_COMMIT}.tar.gz -> ${PN}-s4-${PV}.tar.gz - https://waf.io/waf-${WAF_VER}.tar.bz2"; -S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86" - -# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,... -# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt` -XMMS2_OPTIONALS=( - cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater - :nycli perl :pixmaps python server:s4 test:tests - # disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,xmmsclient-cf,xmmsclient-ecore -) -XMMS2_PLUGINS=( - aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer - ffmpeg:apefile,asf,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash - gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad mms modplug - mp3:mpg123 :mp4 musepack :normalize :null :nulstripper ofa opus oss :pls - pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis - :wave wavpack :xml xml:rss,xspf zeroconf:daap - # disabled: coreaudio,gvfs,nms,sc68,sun,waveout -) - -IUSE=" - ${XMMS2_OPTIONALS[@]%:*} - ${XMMS2_PLUGINS[@]%:*} - +server valgrind" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test ) !server? ( test )" - -COMMON_DEPEND=" - dev-libs/glib:2 - sys-libs/readline:= - server? ( - aac? ( media-libs/faad2 ) - airplay? ( dev-libs/openssl:= ) - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - cdda? ( - dev-libs/libcdio-paranoia:= - dev-libs/libcdio:= - media-libs/libdiscid - ) - curl? ( net-misc/curl ) - ffmpeg? ( media-video/ffmpeg:= ) - flac? ( media-libs/flac ) - fluidsynth? ( media-sound/fluidsynth:= ) - gme? ( media-libs/game-music-emu ) - ices? ( - media-libs/libogg - media-libs/libshout - media-libs/libvorbis - ) - jack? ( virtual/jack ) - mac? ( media-sound/mac ) - mad? ( media-libs/libmad ) - mms? ( - media-libs/libmms - media-video/ffmpeg:= - ) - modplug? ( media-libs/libmodplug ) - mp3? ( media-sound/mpg123 ) - musepack? ( media-sound/musepack-tools ) - ofa? ( - dev-libs/expat - media-libs/libofa - sci-libs/fftw:3.0= - ) - opus? ( - media-libs/libogg - media-libs/opus - media-libs/opusfile - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( net-fs/samba ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - speex? ( - media-libs/libogg - media-libs/speex - ) - tremor? ( media-libs/tremor ) - vocoder? ( - media-libs/libsamplerate - sci-libs/fftw:3.0= - ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - xml? ( dev-libs/libxml2 ) - zeroconf? ( - net-dns/avahi[mdnsresponder-compat] - net-misc/curl - ) - ) - python? ( virtual/libcrypt:= )" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/glib-perl - virtual/perl-Carp - virtual/perl-IO - virtual/perl-Scalar-List-Utils - ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]') - )" -DEPEND=" - ${COMMON_DEPEND} - cxx? ( dev-libs/boost ) - test? ( dev-util/cunit )" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - perl? ( dev-perl/Pod-Parser ) - python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') ) - test? ( valgrind? ( dev-util/valgrind ) )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8-rtvg.patch - "${FILESDIR}"/${PN}-0.8_p20161122-mac-4.patch - "${FILESDIR}"/${PN}-0.8_p20161122-cpp-client.patch - "${FILESDIR}"/${PN}-0.8_p20161122-faad.patch - "${FILESDIR}"/${P}-ffmpeg5.patch -) - -src_prepare() { - rmdir src/lib/s4 && mv ../s4-${S4_COMMIT} src/lib/s4 || die - mv ../waf-${WAF_VER}/waf{,lib} . || die - - default - - sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \ - -i src/plugins/fluidsynth/fluidsynth.c || die -} - -src_configure() { - local waf=( - ./waf configure - --prefix="${EPREFIX}"/usr - --libdir="${EPREFIX}"/usr/$(get_libdir) - --boost-includes="${ESYSROOT}"/usr/include # needed for prefix - --with-custom-version="%(version)s (git commit: ${XMMS2_COMMIT:0:8})" - --with-target-platform="${CHOST}" - ) - - xmms2_flag() { - local IFS=: - set -- ${1#+} - - if [[ ${1} ]]; then - usev ${1} ,${2:-${1}} - else - echo ,${2} - fi - } - - local flag optionals plugins - - if use server; then - for flag in "${XMMS2_PLUGINS[@]}"; do - plugins+=$(xmms2_flag ${flag}) - done - else - waf+=( --without-xmms2d ) - fi - - for flag in "${XMMS2_OPTIONALS[@]}"; do - optionals+=$(xmms2_flag ${flag}) - done - - waf+=( - # pass even if empty to avoid automagic - --with-optionals=${optionals:1} - --with-plugins=${plugins:1} - ) - - if use perl; then - perl_set_version - waf+=( --with-perl-archdir="${ARCH_LIB}" ) - fi - - if use valgrind; then - if valgrind true &>/dev/null; then - waf+=( --with-valgrind ) - else - ewarn "valgrind was disabled due to failing a basic sanity check" #807271 - fi - fi - - tc-export AR CC CXX - - echo "${waf[*]}" - "${waf[@]}" || die -} - -src_compile() { - ./waf build -j$(makeopts_jobs) --verbose --notests || die -} - -src_test() { - ./waf --alltests || die -} - -src_install() { - ./waf install --destdir="${D}" --without-ldconfig --notests || die - - einstalldocs - - use python && python_optimize - - # to avoid editing waftools/man.py (use find given not always installed) - find "${ED}" -name '*.gz' -exec gzip -d {} + || die -} - -pkg_postinst() { - use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont -}
