[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 7d0d6669b10193e155bf9c8cf30eab47bc4b6ea6 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Jun 2 13:24:15 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Thu Jun 2 14:56:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0d6669 media-sound/xmms2: drop 0.8_p20201016-r2 Signed-off-by: Ionen Wolkens 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.. --- 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.. --- 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 -Date: Thu, 6 Dec 2018 07:19:08 + -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
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 24f50fc0c415d1037d79b26c802c944ef0da4035 Author: Ionen Wolkens gentoo org> AuthorDate: Tue May 3 04:29:08 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue May 3 05:55:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f50fc0 media-sound/xmms2: add 0.9.1 Special thanks to slyfox for handling a few things upstream and making a release after so long. Mostly same as previous snapshot with patches but with several of these upstreamed and now have a proper release tarball including s4 submodule and updated waf to simplify the ebuild. Also refreshed older patches (none are new). Signed-off-by: Ionen Wolkens gentoo.org> media-sound/xmms2/Manifest | 1 + .../xmms2/files/xmms2-0.9.1-cpp-client.patch | 13 ++ media-sound/xmms2/files/xmms2-0.9.1-faad.patch | 13 ++ media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch | 23 +++ media-sound/xmms2/xmms2-0.9.1.ebuild | 224 + 5 files changed, 274 insertions(+) diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index 38569c9908ac..e49b5778f52a 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -1,3 +1,4 @@ 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.9.1-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.9.1-cpp-client.patch new file mode 100644 index ..491c6fb9771d --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.9.1-cpp-client.patch @@ -0,0 +1,13 @@ +https://github.com/xmms2/xmms2-devel/pull/5 +From: Sergei Trofimovich +Date: Thu, 6 Dec 2018 07:19:08 + +Subject: [PATCH] OTHER: fix c++ client dangling reference +--- a/src/include/xmmsclient/xmmsclient++/mainloop.h b/src/include/xmmsclient/xmmsclient++/mainloop.h +@@ -42,5 +42,5 @@ +*mainloop, not start it! +*/ +- MainloopInterface( xmmsc_connection_t* conn ) : ++ MainloopInterface( xmmsc_connection_t*& conn ) : + running_( false ), conn_( conn ) { } + diff --git a/media-sound/xmms2/files/xmms2-0.9.1-faad.patch b/media-sound/xmms2/files/xmms2-0.9.1-faad.patch new file mode 100644 index ..6c282ed6d0a4 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.9.1-faad.patch @@ -0,0 +1,13 @@ +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 +@@ -243,5 +243,4 @@ +* it frame 1. +*/ +- NeAACDecPostSeekReset (data->decoder, 1); + + /* FIXME: Because for HE AAC files some versions of libfaad return the wrong diff --git a/media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch b/media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch new file mode 100644 index ..86f48ca066dc --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch @@ -0,0 +1,23 @@ +Add knob to control valgrind usage during tests. +https://bugs.gentoo.org/424377 +--- a/waftools/unittest.py b/waftools/unittest.py +@@ -147,5 +147,6 @@ + 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 +@@ -624,4 +624,8 @@ + opt.add_option('--without-ldconfig', action='store_false', +
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 393ed20e6cb0037c61b4ca85edaa5d58cece6719 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Mar 16 03:17:38 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Mar 16 03:41:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393ed20e media-sound/xmms2: fix build with ffmpeg5 Closes: https://bugs.gentoo.org/834398 Signed-off-by: Ionen Wolkens gentoo.org> .../xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch | 125 +++ media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild| 237 + 2 files changed, 362 insertions(+) diff --git a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch new file mode 100644 index ..14f999643241 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch @@ -0,0 +1,125 @@ +Lazy migration from audio4 that's missing in ffmpeg5, may not be +entirely right but tested to play at least .tta/.wma properly. + +Bug: https://bugs.gentoo.org/834398 +Signed-off-by: Ionen Wolkens +--- 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.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, _frame, ); +- +- /* 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 (>packet); ++ data->packet.data = data->buffer; ++ data->packet.size = data->buffer_length; ++ ++ rc = avcodec_send_packet(data->codecctx, >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, _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) ++
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: e1518299472358d02997f641a51b00accb95a955 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 22 21:45:55 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 22 22:25:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1518299 media-sound/xmms2: drop 0.8_p20161122-r8 Signed-off-by: Ionen Wolkens gentoo.org> media-sound/xmms2/Manifest | 2 - media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch| 15 - .../xmms2/files/xmms2-0.8_p20161122-be-hash.patch | 39 --- .../xmms2/files/xmms2-0.8_p20161122-gcc-10.patch | 11 - .../xmms2/files/xmms2-0.8_p20161122-tarball.patch | 78 - media-sound/xmms2/metadata.xml | 1 - media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild| 327 - 7 files changed, 473 deletions(-) diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index 0ae44e63d98..38569c9908a 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -1,5 +1,3 @@ -DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59 DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5 -DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch deleted file mode 100644 index 2e9fac380ea..000 --- a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c -=== xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c -+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c -@@ -29,6 +29,10 @@ - - #define AVCODEC_BUFFER_SIZE 16384 - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - typedef struct { - AVCodecContext *codecctx; - diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch deleted file mode 100644 index 5fa43298cf7..000 --- a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 30 Jul 2017 23:08:02 +0100 -Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function - endianness-agnostic - -The following code: -uint32_t k; -memcpy (, data, sizeof (k)); -computes different data depending on platform endianness. - -That causes test_xmmsv_serialize_coll_match test to fail -as collection order is serialized in wrong order. - -Signed-off-by: Sergei Trofimovich - src/lib/xmmstypes/xmmsv_dict.c | 6 -- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c -index 5ebe4eb3..32533285 100644 a/src/lib/xmmstypes/xmmsv_dict.c -+++ b/src/lib/xmmstypes/xmmsv_dict.c -@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len) - - while (len >= 4) - { -- uint32_t k; -- memcpy (, data, sizeof (k)); -+ uint32_t k = data [0] -+ | data [1] << 8 -+ | data [2] << 16 -+ | data [3] << 24; - - k *= m; - k ^= k >> r; --- -2.13.3 - diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch deleted file mode 100644
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 19469ee08b4e50d056384139750a488db8276cfa Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Dec 6 08:11:50 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Dec 6 19:35:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19469ee0 media-sound/xmms2: fix c++ client dangling reference Picked patch from https://github.com/xmms2/xmms2-devel/pull/5 Reported-by: James Le Cuirot Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/xmms2-0.8_p20161122-cpp-client.patch | 68 + media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild| 300 + 2 files changed, 368 insertions(+) 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 new file mode 100644 index 000..cedc87fcc46 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch @@ -0,0 +1,68 @@ +https://github.com/xmms2/xmms2-devel/pull/5 + +From 82741bf3094c8e0bca8eb1b7f3bc147eeb51ea06 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 6 Dec 2018 07:19:08 + +Subject: [PATCH] OTHER: fix c++ client dangling reference + +On #xmm2 Chewi reported c++/tut7 to be broken at start: + +``` +GLib-WARNING **: glib-2.56.2/glib/giounix.c:410 +Error while getting flags for FD: Bad file descriptor (9) +``` + +valgrind shows the problem as read of uninitialized data: + +``` +$ valgrind ./tut7 + +==32268== Conditional jump or move depends on uninitialised value(s) +==32268==at 0x49DC36B: xmmsc_mainloop_gmain_init (xmmsclient-glib.c:80) +==32268==by 0x49E11BE: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:11) +==32268==by 0x10C64D: main (in /home/slyfox/dev/git/xmms2-devel/doc/tutorial/c++/tut7) +==32268== Uninitialised value was created by a stack allocation +==32268==at 0x49E119A: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:8) +``` + +This happens due to use of dangling C++ reference to stack variable: + +``` +// somewhere in src/include/xmmsclient/xmmsclient++/mainloop.h +class MainloopInterface { +MainloopInterface( xmmsc_connection_t* conn ) : +running_( false ), conn_( conn ) { } + protected: +bool running_; +xmmsc_connection_t*& conn_; +} +``` + +Note: `conn_` refers to dangling local variable of +`MainloopInterface::MainloopInterface` constructor. + +The fix is to pass through pointer reference. +`MainLoop::MainLoop()` already does it. + +Reported-by: James Le Cuirot +Signed-off-by: Sergei Trofimovich +--- + src/include/xmmsclient/xmmsclient++/mainloop.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/xmmsclient/xmmsclient++/mainloop.h b/src/include/xmmsclient/xmmsclient++/mainloop.h +index de97e20d..268ca6f7 100644 +--- 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. +-- +2.19.2 + diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild new file mode 100644 index 000..d6d2392bada --- /dev/null +++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +USE_RUBY="ruby23 ruby24 ruby25" + +inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs + +# generated as 'python2 ./utils/gen-tarball.py' from clean git tree +MY_P="${P%_p*}DrO_o-949-gca15e830" + +DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player" +HOMEPAGE="https://xmms2.org/wiki/Main_Page; +#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2; +LICENSE="GPL-2 LGPL-2.1" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86" + +IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices +jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss +perl phonehome pulseaudio python ruby samba +server sid sndfile speex +test valgrind +vorbis vocoder wavpack xml zeroconf" + +RDEPEND="server? ( + >=dev-db/sqlite-3.3.4 + + aac? ( >=media-libs/faad2-2.0 ) + airplay? ( dev-libs/openssl:0= ) + alsa? ( media-libs/alsa-lib ) + ao? (
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: fef415c56f13404c0ec5501d26012eaf9ca34292 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 30 22:15:45 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 30 22:15:55 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef415c5 media-sound/xmms2: fix hash computation on big-endian platforms Was manifested as a single test failure in xmms2. Package-Manager: Portage-2.3.6, Repoman-2.3.3 .../xmms2/files/xmms2-0.8_p20161122-be-hash.patch | 39 +++ media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild| 294 + 2 files changed, 333 insertions(+) diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch new file mode 100644 index 000..5fa43298cf7 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch @@ -0,0 +1,39 @@ +From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich+Date: Sun, 30 Jul 2017 23:08:02 +0100 +Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function + endianness-agnostic + +The following code: +uint32_t k; +memcpy (, data, sizeof (k)); +computes different data depending on platform endianness. + +That causes test_xmmsv_serialize_coll_match test to fail +as collection order is serialized in wrong order. + +Signed-off-by: Sergei Trofimovich +--- + src/lib/xmmstypes/xmmsv_dict.c | 6 -- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c +index 5ebe4eb3..32533285 100644 +--- a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c +@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len) + + while (len >= 4) + { +- uint32_t k; +- memcpy (, data, sizeof (k)); ++ uint32_t k = data [0] ++ | data [1] << 8 ++ | data [2] << 16 ++ | data [3] << 24; + + k *= m; + k ^= k >> r; +-- +2.13.3 + diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild new file mode 100644 index 000..68cca7d5b76 --- /dev/null +++ b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +USE_RUBY="ruby20 ruby21 ruby22" + +inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs + +# generated as 'python2 ./utils/gen-tarball.py' from clean git tree +MY_P="${P%_p*}DrO_o-949-gca15e830" + +DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player" +HOMEPAGE="https://xmms2.org/wiki/Main_Page; +#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2; +LICENSE="GPL-2 LGPL-2.1" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" + +IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs ices +jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss +perl phonehome pulseaudio python ruby samba +server sid sndfile speex +test valgrind +vorbis vocoder wavpack xml zeroconf" + +RDEPEND="server? ( + >=dev-db/sqlite-3.3.4 + + aac? ( >=media-libs/faad2-2.0 ) + airplay? ( dev-libs/openssl:0= ) + alsa? ( media-libs/alsa-lib ) + ao? ( media-libs/libao ) + cdda? ( dev-libs/libcdio-paranoia + >=media-libs/libdiscid-0.1.1 + >=media-sound/cdparanoia-3.9.8 ) + curl? ( >=net-misc/curl-7.15.1 ) + ffmpeg? ( virtual/ffmpeg ) + flac? ( media-libs/flac ) + fluidsynth? ( media-sound/fluidsynth ) + gvfs? ( gnome-base/gnome-vfs ) + ices? ( media-libs/libogg + media-libs/libshout + media-libs/libvorbis ) + jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 ) + mac? ( media-sound/mac ) + mms? ( virtual/ffmpeg + >=media-libs/libmms-0.3 ) + modplug? ( media-libs/libmodplug ) + mad? ( media-libs/libmad ) + mp3? ( >=media-sound/mpg123-1.5.1 ) + musepack? ( media-sound/musepack-tools ) + ofa? ( media-libs/libofa ) + opus? ( media-libs/opus + media-libs/opusfile ) + pulseaudio? ( media-sound/pulseaudio ) + samba? ( >=net-fs/samba-4.2 ) + sid? ( media-sound/sidplay + media-libs/resid ) + sndfile? ( media-libs/libsndfile ) + speex? ( media-libs/speex
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 88e32c614265db1783bc02782cdae880d786d227 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat May 20 10:21:13 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat May 20 10:21:36 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e32c61 media-sound/xmms2: bump up to 0.8_p20161122, latest snapshot This bump is a snapshot of a xmms2-devel/master git branch. Devel tree has fixes like: - waf bump (ruby-2.1 support) - ffmpeg/libav upstream patches - new plugins - new s4 storage as a database (instead of sqlite) - many other things It's a a bit hard to backport patches to 6 years old release. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/618850 Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-sound/xmms2/Manifest | 1 + .../xmms2/files/xmms2-0.8_p20161122-tarball.patch | 78 ++ media-sound/xmms2/metadata.xml | 2 + media-sound/xmms2/xmms2-0.8-r4.ebuild | 2 +- ...s2-0.8-r4.ebuild => xmms2-0.8_p20161122.ebuild} | 56 5 files changed, 108 insertions(+), 31 deletions(-) diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest index be39c69..442ad25250d 100644 --- a/media-sound/xmms2/Manifest +++ b/media-sound/xmms2/Manifest @@ -1 +1,2 @@ +DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 SHA256 58bd62f1e3ca83d4d82ad6854ee769b97238fc1c89967262c0e9e9e20e35092e SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb WHIRLPOOL 438d33793b808dd151b27ac51af9998b819ffc03cbc0ce789d693192f8aa5cab3c48402ef83f2b8fe1442dd9130248f561b1fe466168c0569c2e017ee1a0ede3 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd579d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch new file mode 100644 index 000..eef49b13f16 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch @@ -0,0 +1,78 @@ +diff --git a/utils/gen-changelog.py b/utils/gen-changelog.py +index b539088a..301c0461 100755 +--- a/utils/gen-changelog.py b/utils/gen-changelog.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + from subprocess import check_output + import os + +diff --git a/utils/gen-tarball.py b/utils/gen-tarball.py +index 2ae2a4d1..09ed5074 100755 +--- a/utils/gen-tarball.py b/utils/gen-tarball.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + from subprocess import check_output, call + import tarfile + import os +@@ -40,15 +40,19 @@ def add_files(ball, prefix, template, files): + + VERSION = check_output(["git", "describe"]).strip() + ++# TODO: derive paths from submodule configuration + TUTORIAL_DIR="doc/tutorial" ++S4_DIR="src/lib/s4" + + PREFIX="xmms2-%s" % VERSION + PREFIX_TUTORIAL="%s/%s" % (PREFIX, TUTORIAL_DIR) ++PREFIX_S4="%s/%s" % (PREFIX, S4_DIR) + + DIST_DIR="dist" + DIST_XMMS2="%s/xmms2-%s.tar" % (DIST_DIR, VERSION) + DIST_XMMS2_BZ2="%s/xmms2-%s.tar.bz2" % (DIST_DIR, VERSION) + DIST_TUTORIAL="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION) ++DIST_S4="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION) + + if not os.path.exists(DIST_DIR): + os.mkdir(DIST_DIR) +@@ -62,6 +66,9 @@ if os.path.exists(DIST_XMMS2_BZ2): + if os.path.exists(DIST_TUTORIAL): + os.unlink(DIST_TUTORIAL) + ++if os.path.exists(DIST_S4): ++os.unlink(DIST_S4) ++ + # Tar up XMMS2 + call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), shell=True) + +@@ -69,9 +76,11 @@ call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), s + call("git submodule init", shell=True) + call("git submodule update", shell=True) + call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (TUTORIAL_DIR, PREFIX_TUTORIAL, DIST_TUTORIAL), shell=True) ++call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (S4_DIR, PREFIX_S4, DIST_S4), shell=True) + +-# Append the tutorials to the XMMS2 archive ++# Append the tutorials and s4 to the XMMS2 archive + call("tar -Af %s %s" % (DIST_XMMS2, DIST_TUTORIAL), shell=True) ++call("tar -Af %s %s" % (DIST_XMMS2, DIST_S4), shell=True) + + # Append ChangeLog and a summary of all file hashes." + add_files(DIST_XMMS2, PREFIX, get_template(DIST_XMMS2, os.path.join(PREFIX, "wscript")), [ +diff --git a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py +index 7f8b9e4f..9d27adb0 100755 +--- a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 +
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 998de2831a15b5d8635babc38ed57292bee6d491 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Apr 2 14:45:16 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 2 14:45:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998de283 media-sound/xmms2: backported samba detection fix While at it updated to non-deprecated python and ruby eclasses. Package-Manager: portage-2.2.28 media-sound/xmms2/files/xmms2-0.8-samba-4.patch| 30 +++ media-sound/xmms2/xmms2-0.8-r2.ebuild | 1 + .../{xmms2-0.8-r2.ebuild => xmms2-0.8-r3.ebuild} | 45 ++ 3 files changed, 51 insertions(+), 25 deletions(-) diff --git a/media-sound/xmms2/files/xmms2-0.8-samba-4.patch b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch new file mode 100644 index 000..937f3d7 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch @@ -0,0 +1,30 @@ +commit 86ea5e2d2ac2d8c8c1aee484e8c264440fafcb6a +Author: Daniel P. Chokola+Date: Wed Jan 1 14:57:35 2014 -0500 + +BUG(2573): Samba 4.0 uses pkg-config. Find libsmbclient.h properly. + +diff --git a/src/plugins/samba/wscript b/src/plugins/samba/wscript +index 8398169..77d7cda 100644 +--- a/src/plugins/samba/wscript b/src/plugins/samba/wscript +@@ -1,8 +1,17 @@ + from waftools.plugin import plugin ++from waflib import Errors + + def plugin_configure(conf): +-conf.check_cc(header_name="libsmbclient.h") +-conf.check(lib="smbclient", uselib_store="smbclient") ++try: ++conf.check_cfg(package="smbclient", uselib_store="smbclient", ++ args="--cflags --libs") ++except Errors.ConfigurationError: ++conf.check_cc(header_name="libsmbclient.h", ++ uselib="smbclient", ++ type="cshlib") ++conf.check(lib="smbclient", uselib_store="smbclient", ++ uselib="smbclient", ++ type="cshlib") + + configure, build = plugin("samba", configure=plugin_configure, + libs=["smbclient"]) diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild index 515550e..c0a1811 100644 --- a/media-sound/xmms2/xmms2-0.8-r2.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild @@ -125,6 +125,7 @@ src_prepare() { epatch "${FILESDIR}/${P}"-audio4-p6.patch epatch "${FILESDIR}/${P}"-audio4-p7.patch epatch "${FILESDIR}/${P}"-rtvg.patch #424377 + epatch "${FILESDIR}/${P}"-samba-4.patch if has_version dev-libs/libcdio-paranoia; then sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r3.ebuild similarity index 92% copy from media-sound/xmms2/xmms2-0.8-r2.ebuild copy to media-sound/xmms2/xmms2-0.8-r3.ebuild index 515550e..c910ef3 100644 --- a/media-sound/xmms2/xmms2-0.8-r2.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r3.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=3 +EAPI=5 -inherit eutils python toolchain-funcs +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +USE_RUBY="ruby20 ruby21 ruby22" + +inherit eutils multiprocessing python-any-r1 ruby-single toolchain-funcs MY_P="${P}DrO_o" @@ -14,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ppc x86" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss @@ -25,7 +28,7 @@ RDEPEND="server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) - airplay? ( dev-libs/openssl ) + airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) @@ -49,14 +52,14 @@ RDEPEND="server? ( musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) pulseaudio? ( media-sound/pulseaudio ) - samba? ( net-fs/samba[smbclient] ) + samba? ( net-fs/samba[smbclient(+)] ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) - vocoder? ( sci-libs/fftw media-libs/libsamplerate ) + vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) ) @@ -64,18 +67,20 @@ RDEPEND="server? (
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 45fc303a416aa252542c49b9383ad148f9022974 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Apr 2 10:43:39 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 2 10:43:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45fc303a media-sound/xmms2: support stable API for libav, bug #540890 Latest stable media-video/ffmpeg-2.8.6 provides both functions: avcodec_decode_audio3 avcodec_decode_audio4 While latest stable media-video/libav-11.3 provides only avcodec_decode_audio4 Pulled large patchset from upstream to support audio4 API. Builds fine on both stable virtual/ffmpeg implementations and unstable libav. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/540890 Package-Manager: portage-2.2.28 media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch | 123 +++ media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch | 171 ++ media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch | 388 ++ media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch | 296 + media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch | 154 + media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch | 106 ++ media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch | 147 media-sound/xmms2/xmms2-0.8-r2.ebuild | 7 + 8 files changed, 1392 insertions(+) diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch new file mode 100644 index 000..21ed649 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch @@ -0,0 +1,123 @@ +commit 8831bc77d705c03b3f8081de0520dd10afa85c69 +Author: Uli Franke+Date: Tue Jan 17 23:23:46 2012 +0100 + +BUG(2509): Avoid unaligned reads in avcodec xform. + +diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c +index fe58fc5..1b4a659 100644 +--- a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c +@@ -36,6 +36,9 @@ typedef struct { + guint buffer_size; + gboolean no_demuxer; + ++ gchar *read_out_buffer; ++ gint read_out_buffer_size; ++ + guint channels; + guint samplerate; + xmms_sample_format_t sampleformat; +@@ -107,6 +110,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform) + + avcodec_close (data->codecctx); + av_free (data->codecctx); ++ av_free (data->read_out_buffer); + + g_string_free (data->outbuf, TRUE); + g_free (data->buffer); +@@ -132,6 +136,9 @@ xmms_avcodec_init (xmms_xform_t *xform) + data->buffer_size = AVCODEC_BUFFER_SIZE; + data->codecctx = NULL; + ++ data->read_out_buffer = av_malloc (AVCODEC_MAX_AUDIO_FRAME_SIZE); ++ data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ + xmms_xform_private_data_set (xform, data); + + avcodec_init (); +@@ -196,7 +203,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + } else { + /* A demuxer plugin forgot to give decoder config? */ + xmms_log_error ("Decoder config data not found!"); +- return FALSE; ++ goto err; + } + } + +@@ -220,7 +227,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + + /* some codecs need to have something read before they set +* the samplerate and channels correctly, unfortunately... */ +- if ((ret = xmms_avcodec_read (xform, buf, 42, )) > 0) { ++ if ((ret = xmms_avcodec_read (xform, buf, sizeof (buf), )) > 0) { + g_string_insert_len (data->outbuf, 0, buf, ret); + } else { + XMMS_DBG ("First read failed, codec is not working..."); +@@ -251,6 +258,9 @@ err: + if (data->codecctx) { + av_free (data->codecctx); + } ++ if (data->read_out_buffer) { ++ av_free (data->read_out_buffer); ++ } + g_string_free (data->outbuf, TRUE); + g_free (data->extradata); + g_free (data); +@@ -263,8 +273,7 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len, +xmms_error_t *error) + { + xmms_avcodec_data_t *data; +- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE]; +- gint outbufsize, bytes_read = 0; ++ gint bytes_read = 0; + guint size; + + data = xmms_xform_private_data_get (xform); +@@ -330,9 +339,9 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len, + packet.data = data->buffer; + packet.size = data->buffer_length; + +- outbufsize = sizeof (outbuf); +- bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) outbuf, +- , ); ++ data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ bytes_read = avcodec_decode_audio3 (data->codecctx, (short *)
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 54c5cda4372004c31c5b91cb3f5cbc77da776512 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Apr 2 09:04:11 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 2 09:06:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c5cda4 media-sound/xmms2: tweak ExtUtils detection against perl-5.22, bug #578778 Reported-by: Scott McClung Bug: https://bugs.gentoo.org/578778 Package-Manager: portage-2.2.28 media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch | 5 +++-- media-sound/xmms2/xmms2-0.8-r2.ebuild| 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch index d4c10b9..220e91e 100644 --- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch +++ b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch @@ -9,6 +9,7 @@ Use xsubpp from @INC instead of bundled one with perl. Original bug: https://bugs.gentoo.org/380469 Related: https://bugs.gentoo.org/378783 +Updated for perl-5.20.2: https://bugs.gentoo.org/578778 diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py index 2c69fe5..a75b069 100644 --- a/waflib/Tools/perl.py @@ -19,8 +20,8 @@ index 2c69fe5..a75b069 100644 env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'") - env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'") - env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'") -+ env["XSUBPP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'") -+ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'") ++ env["XSUBPP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'") ++ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'") if not getattr(Options.options,'perlarchdir',None): env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'") else: diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild index f424d49..4db6118 100644 --- a/media-sound/xmms2/xmms2-0.8-r2.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild @@ -70,7 +70,8 @@ RDEPEND="server? ( DEPEND="${RDEPEND} dev-lang/python python? ( dev-python/pyrex ) - perl? ( dev-perl/Module-Build ) + perl? ( dev-perl/Module-Build + virtual/perl-Module-Metadata ) virtual/pkgconfig test? ( dev-util/cunit ) " @@ -105,7 +106,7 @@ pkg_setup() { src_prepare() { ./waf # inflate waf cd .waf* || die - epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch + epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778 cd "${S}" epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256 epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256
[gentoo-commits] repo/gentoo:master commit in: media-sound/xmms2/files/, media-sound/xmms2/
commit: 1a9735ddd22e0658540b17f7f6b87b1e85857765 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Nov 27 23:15:13 2015 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Nov 27 23:15:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9735dd media-sound/xmms2: fix build failure against stable libmodplug, bug #536046 Reported-by: Anthony Parsons Bug: https://bugs.gentoo.org/536046 Package-Manager: portage-2.2.25 media-sound/xmms2/files/xmms2-0.8-cpython.patch | 9 + media-sound/xmms2/files/xmms2-0.8-modpug.patch | 11 +++ media-sound/xmms2/xmms2-0.8-r2.ebuild | 2 ++ 3 files changed, 22 insertions(+) diff --git a/media-sound/xmms2/files/xmms2-0.8-cpython.patch b/media-sound/xmms2/files/xmms2-0.8-cpython.patch new file mode 100644 index 000..58227ba --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8-cpython.patch @@ -0,0 +1,9 @@ +diff --git a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd +index 66390a7..629bc7f 100644 +--- a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd +@@ -30,3 +30,3 @@ cdef extern from "xmmsc/xmmsc_idnumbers.h": + +- ctypedef enum xmmsc_collection_changed_actions_t: ++ ctypedef enum xmms_collection_changed_actions_t: + XMMS_COLLECTION_CHANGED_ADD diff --git a/media-sound/xmms2/files/xmms2-0.8-modpug.patch b/media-sound/xmms2/files/xmms2-0.8-modpug.patch new file mode 100644 index 000..ce40127 --- /dev/null +++ b/media-sound/xmms2/files/xmms2-0.8-modpug.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/modplug/modplug.c 2011-10-20 20:26:08.0 + b/src/plugins/modplug/modplug.c 2015-01-08 19:52:43.889787624 + +@@ -9,7 +9,7 @@ + #include "xmms/xmms_sample.h" + #include "xmms/xmms_medialib.h" + #include "xmms/xmms_log.h" +-#include ++#include + + #include + #include diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild index 18e8dec..f424d49 100644 --- a/media-sound/xmms2/xmms2-0.8-r2.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild @@ -113,6 +113,8 @@ src_prepare() { epatch "${FILESDIR}/${P}"-cython-0.19.1.patch epatch "${FILESDIR}/${P}"-memset.patch epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232 + epatch "${FILESDIR}/${P}"-cpython.patch + epatch "${FILESDIR}/${P}"-modpug.patch #536046 if has_version dev-libs/libcdio-paranoia; then sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die