diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-sound/xmms2/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'media-sound/xmms2/files')
5 files changed, 0 insertions, 228 deletions
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 <slyfox@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 <cJ@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 <ionen@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 |