From a1281e1e3b4190a9213f01255e2ef0415315c98a Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Mon, 7 May 2018 20:08:42 +0200 Subject: [PATCH] MPD: bump (#2489) --- ...{mpd-0.20.18.recipe => mpd-0.20.19.recipe} | 4 +- ...-0.20.18.patchset => mpd-0.20.19.patchset} | 131 ++++++++++++++++-- 2 files changed, 119 insertions(+), 16 deletions(-) rename media-sound/mpd/{mpd-0.20.18.recipe => mpd-0.20.19.recipe} (98%) rename media-sound/mpd/patches/{mpd-0.20.18.patchset => mpd-0.20.19.patchset} (67%) diff --git a/media-sound/mpd/mpd-0.20.18.recipe b/media-sound/mpd/mpd-0.20.19.recipe similarity index 98% rename from media-sound/mpd/mpd-0.20.18.recipe rename to media-sound/mpd/mpd-0.20.19.recipe index c0a19df79..f9aa04750 100644 --- a/media-sound/mpd/mpd-0.20.18.recipe +++ b/media-sound/mpd/mpd-0.20.19.recipe @@ -5,9 +5,9 @@ variety of sound files while being controlled by its network protocol." HOMEPAGE="https://www.musicpd.org/" COPYRIGHT="2003-2018 The Music Player Daemon Project" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="http://www.musicpd.org/download/mpd/0.20/mpd-$portVersion.tar.xz" -CHECKSUM_SHA256="6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434" +CHECKSUM_SHA256="01cdef1b9217588a8fa64dc2cba900c138e1363a787837b4c8327c652b7956c3" PATCHES="mpd-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/media-sound/mpd/patches/mpd-0.20.18.patchset b/media-sound/mpd/patches/mpd-0.20.19.patchset similarity index 67% rename from media-sound/mpd/patches/mpd-0.20.18.patchset rename to media-sound/mpd/patches/mpd-0.20.19.patchset index 5d6b3a348..47ec0240b 100644 --- a/media-sound/mpd/patches/mpd-0.20.18.patchset +++ b/media-sound/mpd/patches/mpd-0.20.19.patchset @@ -1,4 +1,4 @@ -From 6f251f3e33a06b2b22585afd82da64dc6d9da65a Mon Sep 17 00:00:00 2001 +From 6671de43c2a2001325b6ec52f8ed7a13a1879ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 31 Jul 2014 23:09:29 +0200 Subject: Haiku: add icon as resource definition file @@ -75,10 +75,10 @@ index 0000000..30fcfe4 + $"2204" +}; -- -2.2.2 +2.16.2 -From 31267ac24c9f074af7fe11d90648ff227950e6ef Mon Sep 17 00:00:00 2001 +From 7b454b7df7ceed55057c44b8431bf81eff09a0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 31 Jul 2014 23:12:56 +0200 Subject: Haiku: add resources: application signature and flags @@ -100,17 +100,15 @@ index 30fcfe4..6f1aca2 100644 resource vector_icon { $"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6" -- -2.2.2 +2.16.2 -From 1603fa73da3c8821fd9c5f93dc8078330b7e9d54 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Tue, 21 Feb 2017 08:13:22 +0100 -Subject: [PATCH] MPD: fix build (from mmu_man, already upstreamed) ---- - src/mixer/plugins/HaikuMixerPlugin.cxx | 20 ++++++++++---------- - src/output/plugins/HaikuOutputPlugin.cxx | 1 + - 2 files changed, 11 insertions(+), 10 deletions(-) +From 7123627d41e0f8c7b6bc36deeb14b10b55711707 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Mon, 20 Feb 2017 00:45:46 +0100 +Subject: haiku: fix build + +Some missing bits when converted to C++ exceptions... diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx index d66e765..07da755 100644 @@ -171,7 +169,7 @@ index d66e765..07da755 100644 const MixerPlugin haiku_mixer_plugin = { diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx -index 5d0371e..6a637e5 100644 +index 2487ace..3891d19 100644 --- a/src/output/plugins/HaikuOutputPlugin.cxx +++ b/src/output/plugins/HaikuOutputPlugin.cxx @@ -24,6 +24,7 @@ @@ -183,5 +181,110 @@ index 5d0371e..6a637e5 100644 #include -- -2.11.0 +2.16.2 + + +From bca289702e151dcd8269d69ebdf8e68f2b44d7e6 Mon Sep 17 00:00:00 2001 +From: Max Kellermann +Date: Tue, 2 Jan 2018 17:45:14 +0100 +Subject: output/haiku: remove size==0 check from Play() + +By API contract, this parameter must not be zero. + +diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx +index 3891d19..51fb6e8 100644 +--- a/src/output/plugins/HaikuOutputPlugin.cxx ++++ b/src/output/plugins/HaikuOutputPlugin.cxx +@@ -269,11 +269,6 @@ HaikuOutput::Play(const void *chunk, size_t size) + BSoundPlayer* const soundPlayer = sound_player; + const uint8 *data = (const uint8 *)chunk; + +- if (size == 0) { +- soundPlayer->SetHasData(false); +- return 0; +- } +- + if (!soundPlayer->HasData()) + soundPlayer->SetHasData(true); + acquire_sem(new_buffer); +-- +2.16.2 + + +From 9e4ae4ec10176c602b1dd5970134cae54e8838ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Fri, 5 Jan 2018 23:07:18 +0100 +Subject: Haiku: fix build + +Convert the fill_buffer to a class method, to allow accessing the private method. + +Also remove the leftover Wrapper stuff. + +diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx +index 51fb6e8..f8d9b0d 100644 +--- a/src/output/plugins/HaikuOutputPlugin.cxx ++++ b/src/output/plugins/HaikuOutputPlugin.cxx +@@ -81,6 +81,8 @@ public: + + std::chrono::steady_clock::duration Delay() noexcept; + ++ static void _FillBuffer(void* cookie, void* _buffer, size_t size, ++ gcc_unused const media_raw_audio_format& _format); + void FillBuffer(void* _buffer, size_t size, + gcc_unused const media_raw_audio_format& _format); + +@@ -147,8 +149,8 @@ HaikuOutput::~HaikuOutput() + finalize_application(); + } + +-static void +-fill_buffer(void* cookie, void* buffer, size_t size, ++void ++HaikuOutput::_FillBuffer(void* cookie, void* buffer, size_t size, + const media_raw_audio_format& format) + { + HaikuOutput *ad = (HaikuOutput *)cookie; +@@ -235,7 +237,7 @@ HaikuOutput::Open(AudioFormat &audio_format) + format.format, (int)format.buffer_size); + + sound_player = new BSoundPlayer(&format, "MPD Output", +- fill_buffer, NULL, this); ++ HaikuOutput::_FillBuffer, NULL, this); + + err = sound_player->InitCheck(); + if (err != B_OK) { +@@ -455,8 +457,6 @@ haiku_output_set_volume(HaikuOutput &haiku, unsigned volume) + return true; + } + +-typedef AudioOutputWrapper Wrapper; +- + const struct AudioOutputPlugin haiku_output_plugin = { + "haiku", + haiku_test_default_device, +-- +2.16.2 + + +From cd3d75b3c333ecdd108ec8ee2138572e8b40089d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 28 Apr 2018 09:02:50 +0200 +Subject: Build fix + + +diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx +index f8d9b0d..360ecd0 100644 +--- a/src/output/plugins/HaikuOutputPlugin.cxx ++++ b/src/output/plugins/HaikuOutputPlugin.cxx +@@ -457,6 +457,8 @@ haiku_output_set_volume(HaikuOutput &haiku, unsigned volume) + return true; + } + ++typedef AudioOutputWrapper Wrapper; ++ + const struct AudioOutputPlugin haiku_output_plugin = { + "haiku", + haiku_test_default_device, +-- +2.16.2