From 8d9b5da9c394c5aabc62a24d1441eb1ec576f686804a416b3fa553967ccaf4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Wed, 24 Aug 2022 06:47:19 +0000 Subject: [PATCH 1/2] Accepting request 998958 from home:polslinux:branches:multimedia:apps - Update to 0.23.9: * input + cdio_paranoia: add options "mode" and "skip" * decoder + ffmpeg: support FFmpeg 5.1 * filter + replay gain: fix delayed volume display with handler=mixer * output + pipewire: set app icon * fix bogus volume levels with multiple partitions * improve iconv detection - Remove fix-build-ffmpeg5.patch OBS-URL: https://build.opensuse.org/request/show/998958 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=98 --- fix-build-ffmpeg5.patch | 30 ------------------------------ mpd-0.23.8.tar.xz | 3 --- mpd-0.23.8.tar.xz.sig | Bin 566 -> 0 bytes mpd-0.23.9.tar.xz | 3 +++ mpd-0.23.9.tar.xz.sig | Bin 0 -> 566 bytes mpd-conf.patch | 7 ++++--- mpd.changes | 16 ++++++++++++++++ mpd.spec | 4 +--- 8 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 fix-build-ffmpeg5.patch delete mode 100644 mpd-0.23.8.tar.xz delete mode 100644 mpd-0.23.8.tar.xz.sig create mode 100644 mpd-0.23.9.tar.xz create mode 100644 mpd-0.23.9.tar.xz.sig diff --git a/fix-build-ffmpeg5.patch b/fix-build-ffmpeg5.patch deleted file mode 100644 index c4c63cd..0000000 --- a/fix-build-ffmpeg5.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 59792cb0b801854ee41be72d33db9542735df754 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Wed, 27 Jul 2022 10:59:48 +0200 -Subject: [PATCH] decoder/ffmpeg: wrap FFmpeg include in "extern C" - -Commit ebae25d175eb31 added that #include, but forgot to wrap it in -"extern C", so the linker tried to look up C++ symbols, causing linker -failure. - -Closes https://github.com/MusicPlayerDaemon/MPD/issues/1582 ---- -diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx -index 2e22d95991..5b5c8b40e3 100644 ---- a/src/decoder/plugins/FfmpegIo.cxx -+++ b/src/decoder/plugins/FfmpegIo.cxx -@@ -21,10 +21,13 @@ - #define __STDC_CONSTANT_MACROS - - #include "FfmpegIo.hxx" --#include "libavutil/mem.h" - #include "../DecoderAPI.hxx" - #include "input/InputStream.hxx" - -+extern "C" { -+#include -+} -+ - AvioStream::~AvioStream() - { - if (io != nullptr) { diff --git a/mpd-0.23.8.tar.xz b/mpd-0.23.8.tar.xz deleted file mode 100644 index c74c14a..0000000 --- a/mpd-0.23.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86bb569bf3b519821f36f6bb5564e484e85d2564411b34b200fe2cd3a04e78cf -size 773280 diff --git a/mpd-0.23.8.tar.xz.sig b/mpd-0.23.8.tar.xz.sig deleted file mode 100644 index e3c84a2f290c4f323d1fa1a0eb7c82b83262e2c79a59b3326fe94cb0ceec3221..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j)!k~3O(2so6aFdRc8Zi-mO+eH!u0%FLxRsaeK5F>7i zSjO8$5`-EM0G%XWF$k%5xNW){$d-v?K#2?D@2qjW=)U^h9f5LOW_@UAKD(py)p%f;9^e*4+Gg zSS2W?ZMW*78WoDmqy;D?tRMkHaMo#rJ?pY?UeZ&`zP=GuKef?!{$#i=B8oOa=i5;YM<_LA}h7YU8O9q**Dz);<9VN3tAJ#<$+ z|0U^Kl<^tQF~L$0IieO#*S^YY&KcpHtn_+IkhVhbF^5J%5v%9i8EyFw)tmwAc=*Kd za_qp#3Dc7!eOc%~FJ7{KqbvEq+chi#7Y$+9Z|QEn9-l*i_6ae2I9&%U3NEx>^+n1{ z_(pnM`>b}belf0i^Er{&%(T3sYJvb4iuapPHJU`}V%_pB=uaerFv%=+z4sfVG(BcB ES)bGohyVZp diff --git a/mpd-0.23.9.tar.xz b/mpd-0.23.9.tar.xz new file mode 100644 index 0000000..67ecf2b --- /dev/null +++ b/mpd-0.23.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2becaba980402e8dc7972ccc3476e493b7ae2eeb720d31fa6712472ed48e9f2d +size 774156 diff --git a/mpd-0.23.9.tar.xz.sig b/mpd-0.23.9.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..cc20ed553653947bcfdfdda8b2dfcd18a694f918ef8d1285f4749ccf79278475 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j)!k~3O(2so6aFdRc8Zi-mO+eH!u0%HDV`2Y$D5F>7i zSjO8$5P9Rj^CV=j?M_nv) zX-dZL(1m*N31xE{8$#x=Y;YOgLn)d%x;E8BN7gWzo|p{_w5%szOPzLjIWb9P&}^NkB5pDe-6)a+$DB? zugLB!&;YMb<&q;AM&kNRW!!R(6}dTh*(cKQ(2-*r7A@aFfpY87w61afE~%vxx>3}t zhu-z0@Q%0LZT%Q-isR9r9K~~1e=n%W0Z#-`jcXgZQps + +- Update to 0.23.9: + * input + + cdio_paranoia: add options "mode" and "skip" + * decoder + + ffmpeg: support FFmpeg 5.1 + * filter + + replay gain: fix delayed volume display with handler=mixer + * output + + pipewire: set app icon + * fix bogus volume levels with multiple partitions + * improve iconv detection +- Remove fix-build-ffmpeg5.patch + ------------------------------------------------------------------- Mon Aug 8 08:19:19 UTC 2022 - Cor Blom diff --git a/mpd.spec b/mpd.spec index c84ceee..2edd3cf 100644 --- a/mpd.spec +++ b/mpd.spec @@ -20,7 +20,7 @@ %bcond_with faad %bcond_without mpd_iso9660 Name: mpd -Version: 0.23.8 +Version: 0.23.9 Release: 0 Summary: Music Player Daemon License: GPL-2.0-or-later @@ -33,8 +33,6 @@ Source4: %{name}.firewalld Source5: %{name}.tmpfiles.d Patch0: %{name}-conf.patch Patch1: %{name}-sndfile.patch -# PATCH-FIX-UPSTREAM - support ffmpeg 5.1 -Patch2: fix-build-ffmpeg5.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ From 9ccc69292c4fa510ad19c104f4a9118e1bd2bc1bb241c97566b5b3558ef3a8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Wed, 24 Aug 2022 06:55:20 +0000 Subject: [PATCH 2/2] Accepting request 998960 from home:13ilya:branches:multimedia:apps - Updated to 0.23.9 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.9/NEWS * input: cdio_paranoia: added options "mode" and "skip" * decoder: ffmpeg: added support FFmpeg 5.1 * filter: replay gain: fixed delayed volume display with handler=mixer * output: pipewire: set app icon * fixed bogus volume levels with multiple partitions * improved iconv detection - Removed fix-build-ffmpeg5.patch. OBS-URL: https://build.opensuse.org/request/show/998960 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=99 --- mpd.changes | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/mpd.changes b/mpd.changes index 76db160..1a7525e 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,23 +1,20 @@ ------------------------------------------------------------------- Wed Aug 24 06:10:55 UTC 2022 - Paolo Stivanin -- Update to 0.23.9: - * input - + cdio_paranoia: add options "mode" and "skip" - * decoder - + ffmpeg: support FFmpeg 5.1 - * filter - + replay gain: fix delayed volume display with handler=mixer - * output - + pipewire: set app icon - * fix bogus volume levels with multiple partitions - * improve iconv detection -- Remove fix-build-ffmpeg5.patch +- Updated to 0.23.9 + * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.9/NEWS + * input: cdio_paranoia: added options "mode" and "skip" + * decoder: ffmpeg: added support FFmpeg 5.1 + * filter: replay gain: fixed delayed volume display with handler=mixer + * output: pipewire: set app icon + * fixed bogus volume levels with multiple partitions + * improved iconv detection +- Removed fix-build-ffmpeg5.patch. ------------------------------------------------------------------- Mon Aug 8 08:19:19 UTC 2022 - Cor Blom -- Add fix-build-ffmpeg5.patch to fix build with ffmpeg 5.1 +- Added fix-build-ffmpeg5.patch to fix build with ffmpeg 5.1 ------------------------------------------------------------------- Mon Aug 1 16:04:57 UTC 2022 - Илья Индиго