diff --git a/GCC9-buildfix.patch b/GCC9-buildfix.patch deleted file mode 100644 index 03024ad..0000000 --- a/GCC9-buildfix.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 37b54179d882fef38ca6735b53e322027414b62e -Author: Max Kellermann -Date: Wed Apr 3 16:59:53 2019 +0200 - - net/IPv[46]Address: add cast to void* to fix GCC9 build failure - - Fixes: - - src/net/IPv4Address.hxx: In member function 'constexpr IPv4Address::operator SocketAddress() const': - src/net/IPv4Address.hxx:171:24: error: a reinterpret_cast is not a constant expression - 171 | return SocketAddress((const struct sockaddr *)&address, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - src/net/IPv6Address.hxx: In member function 'constexpr IPv6Address::operator SocketAddress() const': - src/net/IPv6Address.hxx:138:24: error: a reinterpret_cast is not a constant expression - 138 | return SocketAddress((const struct sockaddr *)&address, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Closes https://github.com/MusicPlayerDaemon/MPD/issues/522 - -diff --git a/src/net/IPv4Address.hxx b/src/net/IPv4Address.hxx -index d8be8e5..c8fead1 100644 ---- a/src/net/IPv4Address.hxx -+++ b/src/net/IPv4Address.hxx -@@ -163,7 +163,7 @@ public: - } - - constexpr operator SocketAddress() const noexcept { -- return SocketAddress((const struct sockaddr *)&address, -+ return SocketAddress((const struct sockaddr *)(const void *)&address, - sizeof(address)); - } - -diff --git a/src/net/IPv6Address.hxx b/src/net/IPv6Address.hxx -index 6f21777..0439c0e 100644 ---- a/src/net/IPv6Address.hxx -+++ b/src/net/IPv6Address.hxx -@@ -127,7 +127,7 @@ public: - } - - constexpr operator SocketAddress() const noexcept { -- return SocketAddress((const struct sockaddr *)&address, -+ return SocketAddress((const struct sockaddr *)(const void *)&address, - sizeof(address)); - } - diff --git a/mpd-0.21.2.tar.xz b/mpd-0.21.2.tar.xz deleted file mode 100644 index 78ed9fa..0000000 --- a/mpd-0.21.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6ff74ff521aa2b390bdeac299954da21b9d0a66216abdd500ae590d97ab514a -size 664408 diff --git a/mpd-0.21.9.tar.xz b/mpd-0.21.9.tar.xz new file mode 100644 index 0000000..9f8bc0a --- /dev/null +++ b/mpd-0.21.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39e25376ac2f4db26c3d074eba2ebeba10879a29c71abab33571019c1e520d3e +size 671092 diff --git a/mpd-mpdconf_suse.patch b/mpd-mpdconf_suse.patch index 222b9c6..570c967 100644 --- a/mpd-mpdconf_suse.patch +++ b/mpd-mpdconf_suse.patch @@ -1,5 +1,7 @@ ---- a/doc/mpdconf.example 2017-02-01 21:58:30.000000000 +0100 -+++ b/doc/mpdconf.example 2017-08-10 12:26:41.316129281 +0200 +Index: mpd-0.21.9/doc/mpdconf.example +=================================================================== +--- mpd-0.21.9.orig/doc/mpdconf.example ++++ mpd-0.21.9/doc/mpdconf.example @@ -17,7 +17,7 @@ # playlist files not created by the server but only if they are in the MPD # format. This setting defaults to playlist saving being disabled. @@ -20,7 +22,7 @@ # These logs are great for troubleshooting, depending on your log_level @@ -34,25 +34,25 @@ # The special value "syslog" makes MPD use the local syslog daemon. This - # setting defaults to logging to syslog, otherwise logging is disabled. + # setting defaults to logging to syslog. # -#log_file "~/.mpd/log" +#log_file "syslog" @@ -65,7 +67,7 @@ # # This setting sets the address for the daemon to listen on. Careful attention # should be paid if this is assigned to anything other then the default, any. -@@ -275,12 +275,12 @@ +@@ -275,12 +275,12 @@ input { # # An example of a pulseaudio output (streaming to a remote pulseaudio server) # @@ -82,7 +84,7 @@ # # An example of a winmm output (Windows multimedia API). # -@@ -389,6 +389,6 @@ +@@ -385,6 +385,6 @@ input { # If file or directory names do not display correctly for your locale then you # may need to modify this setting. # diff --git a/mpd.changes b/mpd.changes index 83e1cf7..3547c30 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Fri May 31 10:49:14 UTC 2019 - Tomas Cech + +- Update to version 0.21.9 + * input + - buffer: fix deadlock bug + - smbclient: download to buffer instead of throttling transfer + - qobuz/tidal: scan tags when loading a playlist + - cdio_paranoia: fix build failure due to missing #include + - buffer: fix crash bug when playing remote WAV file + * output + - httpd: add missing mutex lock + - httpd: fix use-after-free bug + - pulse: work around error with unusual channel count + - osx: fix build failure + - shout: add support for TLS + - httpd: declare protocol "HTTP/1.1" instead of "ICY" + - alsa: fix crash bug + - alsa: fix stuttering at start of playback + - alsa: fix discarded samples at end of song + - alsa: clear error after reopening device + * playlist + - soundcloud: fix "Unsupported URI scheme" (0.21.6 regression) + - flac: fix use-after-free bug + * protocol + - allow loading playlists specified as absolute filesystem paths + - fix negated filter expressions with multiple tag values + - fix "list" with filter expression + - omit empty playlist names in "listplaylists" + - fix deadlock in "albumart" command + - fix "tagtypes disable" command + * decoder + - opus: fix replay gain when there are no other tags + - opus: fix seeking to beginning of song + - vorbis: fix Tremor conflict resulting in crash + * database + - simple: fix assertion failure + - fix assertion failures with mount points + - inotify: fix crash bug "terminate called after throwing ..." + - upnp: implement "list ... group" + * storage + - udisks: fix "AlreadyMounted" error + - udisks: use relative path from mount URI + - fix memory leak + * tags + - ape: map "Album Artist" + * mixer + - pulse: add "scale_volume" setting + * fix spurious "single" mode bug + * fix Bonjour bug + * fix build failure with GCC 9 + * fix build failure with -Ddatabase=false + * systemd: add user socket unit + * doc: "list file" is deprecated + * require Meson 0.49.0 for native libgcrypt-config support + * fix build failure with -Dlocal_socket=false + * support abstract sockets on Linux + * remove libwrap support + * log: default to journal if MPD was started as systemd service +- drop GCC9-buildfix.patch + ------------------------------------------------------------------- Tue May 28 12:09:16 UTC 2019 - Christophe Giboudeaux diff --git a/mpd.spec b/mpd.spec index d161106..0e1b065 100644 --- a/mpd.spec +++ b/mpd.spec @@ -25,7 +25,7 @@ %endif %define mver 0.21 Name: mpd -Version: 0.21.2 +Version: 0.21.9 Release: 0 Summary: Music Player Daemon License: GPL-3.0-or-later @@ -40,8 +40,6 @@ Patch0: %{name}-mpdconf_suse.patch Patch3: mpd-docs.patch # PATCH-FIX-OPENSUSE mpd-sndfile.patch Patch4: mpd-sndfile.patch -# PATCH-FIX-UPSTREAM GCC9-buildfix.patch -Patch5: GCC9-buildfix.patch %if 0%{?suse_version} >= 1500 BuildRequires: libboost_headers-devel >= 1.58 %else @@ -225,6 +223,7 @@ test -x "$(type -p g++-7)" && export CXX=g++-7 -Djack=enabled \ -Dao=enabled \ -Dpulse=enabled \ + -Dtremor=disabled \ -Dsystemd_system_unit_dir=%{_unitdir} \ -Dsystemd_user_unit_dir=%{_userunitdir} %meson_build @@ -239,6 +238,8 @@ install -d \ install -m 0644 %{SOURCE2} README.mpd cp -a "%{SOURCE3}" "%{buildroot}%{_docdir}/%{name}/" ln -s service %{buildroot}%{_sbindir}/rcmpd +rm %{buildroot}%{_libexecdir}/systemd/user/mpd.socket +ln -s ../system/mpd.socket %{buildroot}%{_libexecdir}/systemd/user/mpd.socket %pre # add mpd user only when installing first time @@ -268,6 +269,7 @@ getent passwd mpd >/dev/null || useradd -r -g audio -d %{_localstatedir}/lib/mpd %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_unitdir}/mpd.service %{_unitdir}/mpd.socket +%{_libexecdir}/systemd/user/mpd.socket %{_userunitdir}/mpd.service %changelog