From abe4c5766371f458b902fe92a61d7d6d11badf38 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 2 Aug 2014 08:45:44 +0200 Subject: [PATCH 1/4] configure.ac: prepare for 0.18.13 --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8cc6cdd81..8d0ddc1ff 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.18.13 (not yet released) + ver 0.18.12 (2014/07/30) * database - proxy: fix build failure with libmpdclient 2.2 diff --git a/configure.ac b/configure.ac index 36f785f4d..bcaec1a85 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.18.12, mpd-devel@musicpd.org) +AC_INIT(mpd, 0.18.13, mpd-devel@musicpd.org) VERSION_MAJOR=0 VERSION_MINOR=18 From 14c538c9c73b23b807e5327399db6bb991c808bb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 16:14:05 +0100 Subject: [PATCH 2/4] Win32Main: move to win32/ --- .gitignore | 2 +- Makefile.am | 12 ++++++------ configure.ac | 2 +- src/{ => win32}/Win32Main.cxx | 0 src/{win => win32}/mpd.ico | Bin src/{win => win32}/mpd_win32_rc.rc.in | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/{ => win32}/Win32Main.cxx (100%) rename src/{win => win32}/mpd.ico (100%) rename src/{win => win32}/mpd_win32_rc.rc.in (94%) diff --git a/.gitignore b/.gitignore index 3c8552099..9b052a29f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ tags .#* .stgit* src/dsd2pcm/dsd2pcm -src/win/mpd_win32_rc.rc +src/win32/mpd_win32_rc.rc doc/doxygen.conf doc/protocol.html doc/protocol diff --git a/Makefile.am b/Makefile.am index 25352e362..6ef21ee23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,7 +151,7 @@ src_mpd_SOURCES = \ src/IOThread.cxx src/IOThread.hxx \ src/Main.cxx src/Main.hxx \ src/Instance.cxx src/Instance.hxx \ - src/Win32Main.cxx \ + src/win32/Win32Main.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ src/Daemon.cxx src/Daemon.hxx \ src/AudioCompress/compress.c \ @@ -211,14 +211,14 @@ src_mpd_SOURCES = \ # Windows resource file # -src/win/mpd_win32_rc.$(OBJEXT): src/win/mpd_win32_rc.rc +src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc $(WINDRES) -i $< -o $@ if HAVE_WINDOWS -noinst_DATA = src/win/mpd_win32_rc.rc +noinst_DATA = src/win32/mpd_win32_rc.rc -src_mpd_DEPENDENCIES = src/win/mpd_win32_rc.$(OBJEXT) -src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT) +src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) +src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) endif if ENABLE_DESPOTIFY @@ -1633,4 +1633,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ test/test_archive_zzip.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ - src/win/mpd_win32_rc.rc.in src/win/mpd.ico + src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico diff --git a/configure.ac b/configure.ac index bcaec1a85..526b4c7f5 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,7 @@ host_is_darwin=no case "$host_os" in mingw32* | windows*) AC_CONFIG_FILES([ - src/win/mpd_win32_rc.rc + src/win32/mpd_win32_rc.rc ]) AC_CHECK_TOOL(WINDRES, windres) AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN" diff --git a/src/Win32Main.cxx b/src/win32/Win32Main.cxx similarity index 100% rename from src/Win32Main.cxx rename to src/win32/Win32Main.cxx diff --git a/src/win/mpd.ico b/src/win32/mpd.ico similarity index 100% rename from src/win/mpd.ico rename to src/win32/mpd.ico diff --git a/src/win/mpd_win32_rc.rc.in b/src/win32/mpd_win32_rc.rc.in similarity index 94% rename from src/win/mpd_win32_rc.rc.in rename to src/win32/mpd_win32_rc.rc.in index a31118a0c..e5312dc78 100644 --- a/src/win/mpd_win32_rc.rc.in +++ b/src/win32/mpd_win32_rc.rc.in @@ -3,7 +3,7 @@ #define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@ #define VERSION_NUMBER_STR "@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@" -MPD_ICON ICON "@top_srcdir@/src/win/mpd.ico" +MPD_ICON ICON "@top_srcdir@/src/win32/mpd.ico" 1 VERSIONINFO FILETYPE VFT_APP From 250318329f9e662bd7ee5f07af14f175a0b12eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 1 Aug 2014 22:07:33 +0200 Subject: [PATCH 3/4] Makefile.am: fix dependencies for win32 It happened to me when doing the Haiku port, src/mpd failed to be relinked properly when editing source files, and likely also happens on win32, although I didn't try this change. When building for windows, src_mpd_DEPENDENCIES is overriden. Automake then disables the default version which contains all the static libraries. In Makefile.in: @HAVE_WINDOWS_FALSE@src_mpd_DEPENDENCIES = libmpd.a \ Instead we use EXTRA_src_mpd_DEPENDENCIES which is meant for this. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6ef21ee23..6a5e9fb27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -217,7 +217,7 @@ src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc if HAVE_WINDOWS noinst_DATA = src/win32/mpd_win32_rc.rc -src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) +EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) endif From c3f111a56ceacd77574af021d23b481b74bc66d4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 7 Aug 2014 16:03:44 +0200 Subject: [PATCH 4/4] event/BufferedSocket: fix inversed buffer check This was broken by commit 84d20d9e, which deleted the "!" from the check. --- src/event/BufferedSocket.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event/BufferedSocket.cxx b/src/event/BufferedSocket.cxx index 92e350e85..c93ea34c5 100644 --- a/src/event/BufferedSocket.cxx +++ b/src/event/BufferedSocket.cxx @@ -118,7 +118,7 @@ BufferedSocket::OnSocketReady(unsigned flags) if (!ReadToBuffer() || !ResumeInput()) return false; - if (input.IsFull()) + if (!input.IsFull()) ScheduleRead(); }