[Pkg-mpd-commits] [pkg-mpd] 01/04: Imported Upstream version 0.19.1
Florian Schlichting
fsfs at moszumanska.debian.org
Sun Oct 19 19:27:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit 6dc30fc06e6e404737f2896828cd5add6157f352
Author: Florian Schlichting <fsfs at debian.org>
Date: Sun Oct 19 20:58:27 2014 +0200
Imported Upstream version 0.19.1
---
Makefile.am | 1 +
Makefile.in | 3 ++-
NEWS | 9 +++++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/doxygen.conf | 2 +-
src/input/TextInputStream.cxx | 2 ++
src/input/ThreadInputStream.cxx | 10 +++++++++-
src/playlist/plugins/ExtM3uPlaylistPlugin.cxx | 8 ++++++--
src/util/DynamicFifoBuffer.hxx | 1 +
src/util/StaticFifoBuffer.hxx | 2 --
systemd/mpd.socket | 9 +++++++++
12 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 96c387f..2f3ab90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2194,4 +2194,5 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
test/test_archive_zzip.sh \
$(wildcard scripts/*.sh) \
$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
+ systemd/mpd.socket \
src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico
diff --git a/Makefile.in b/Makefile.in
index 88c5cb2..a7fa0f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4320,6 +4320,7 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
test/test_archive_zzip.sh \
$(wildcard scripts/*.sh) \
$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
+ systemd/mpd.socket \
src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico
all: config.h
@@ -14041,8 +14042,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- at ANDROID_FALSE@@ENABLE_DOCUMENTATION_FALSE at clean-local:
@ENABLE_DOCUMENTATION_FALSE at install-data-local:
+ at ANDROID_FALSE@@ENABLE_DOCUMENTATION_FALSE at clean-local:
@ENABLE_DOCUMENTATION_FALSE at uninstall-local:
clean: clean-am
diff --git a/NEWS b/NEWS
index 188afe0..5a24844 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+ver 0.19.1 (2014/10/19)
+* input
+ - mms: fix deadlock bug
+* playlist
+ - extm3u: fix Extended M3U detection
+ - m3u, extm3u, cue: fix truncated lines
+* fix build failure on Mac OS X
+* add missing file systemd/mpd.socket to tarball
+
ver 0.19 (2014/10/10)
* protocol
- new commands "addtagid", "cleartagid", "listfiles", "listmounts",
diff --git a/configure b/configure
index 3d785fe..10cc226 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mpd 0.19.
+# Generated by GNU Autoconf 2.69 for mpd 0.19.1.
#
# Report bugs to <musicpd-dev-team at lists.sourceforge.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.19'
-PACKAGE_STRING='mpd 0.19'
+PACKAGE_VERSION='0.19.1'
+PACKAGE_STRING='mpd 0.19.1'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -1760,7 +1760,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mpd 0.19 to adapt to many kinds of systems.
+\`configure' configures mpd 0.19.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1830,7 +1830,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.19:";;
+ short | recursive ) echo "Configuration of mpd 0.19.1:";;
esac
cat <<\_ACEOF
@@ -2177,7 +2177,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.19
+mpd configure 0.19.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2630,7 +2630,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mpd $as_me 0.19, which was
+It was created by mpd $as_me 0.19.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3500,7 +3500,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.19'
+ VERSION='0.19.1'
cat >>confdefs.h <<_ACEOF
@@ -21085,7 +21085,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpd $as_me 0.19, which was
+This file was extended by mpd $as_me 0.19.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21151,7 +21151,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpd config.status 0.19
+mpd config.status 0.19.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index dfc27e9..3f90bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.19, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.19.1, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=19
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 07edcd7..e5c63fe 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -31,7 +31,7 @@ PROJECT_NAME = MPD
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.19
+PROJECT_NUMBER = 0.19.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx
index c236167..b79f64b 100644
--- a/src/input/TextInputStream.cxx
+++ b/src/input/TextInputStream.cxx
@@ -33,6 +33,8 @@ TextInputStream::ReadLine()
if (line != nullptr)
return line;
+ buffer.Shift();
+
while (true) {
auto dest = buffer.Write();
if (dest.size < 2) {
diff --git a/src/input/ThreadInputStream.cxx b/src/input/ThreadInputStream.cxx
index dc08f3b..235ed2b 100644
--- a/src/input/ThreadInputStream.cxx
+++ b/src/input/ThreadInputStream.cxx
@@ -88,7 +88,7 @@ ThreadInputStream::ThreadFunc()
Unlock();
Error error;
- size_t nbytes = Read(w.data, w.size, error);
+ size_t nbytes = ThreadRead(w.data, w.size, error);
Lock();
cond.broadcast();
@@ -118,6 +118,8 @@ ThreadInputStream::ThreadFunc(void *ctx)
bool
ThreadInputStream::Check(Error &error)
{
+ assert(!thread.IsInside());
+
if (postponed_error.IsDefined()) {
error = std::move(postponed_error);
return false;
@@ -129,12 +131,16 @@ ThreadInputStream::Check(Error &error)
bool
ThreadInputStream::IsAvailable()
{
+ assert(!thread.IsInside());
+
return !buffer->IsEmpty() || eof || postponed_error.IsDefined();
}
inline size_t
ThreadInputStream::Read(void *ptr, size_t read_size, Error &error)
{
+ assert(!thread.IsInside());
+
while (true) {
if (postponed_error.IsDefined()) {
error = std::move(postponed_error);
@@ -161,5 +167,7 @@ ThreadInputStream::Read(void *ptr, size_t read_size, Error &error)
bool
ThreadInputStream::IsEOF()
{
+ assert(!thread.IsInside());
+
return eof;
}
diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
index b459696..fdd4357 100644
--- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
@@ -39,8 +39,12 @@ public:
}
bool CheckFirstLine() {
- const char *line = tis.ReadLine();
- return line != nullptr && strcmp(line, "#EXTM3U") == 0;
+ char *line = tis.ReadLine();
+ if (line == nullptr)
+ return false;
+
+ StripRight(line);
+ return strcmp(line, "#EXTM3U") == 0;
}
virtual DetachedSong *NextSong() override;
diff --git a/src/util/DynamicFifoBuffer.hxx b/src/util/DynamicFifoBuffer.hxx
index 36384bd..c1e5d1b 100644
--- a/src/util/DynamicFifoBuffer.hxx
+++ b/src/util/DynamicFifoBuffer.hxx
@@ -43,6 +43,7 @@ public:
typedef typename ForeignFifoBuffer<T>::size_type size_type;
typedef typename ForeignFifoBuffer<T>::pointer_type pointer_type;
typedef typename ForeignFifoBuffer<T>::const_pointer_type const_pointer_type;
+ typedef typename ForeignFifoBuffer<T>::Range Range;
explicit DynamicFifoBuffer(size_type _capacity)
:ForeignFifoBuffer<T>(new T[_capacity], _capacity) {}
diff --git a/src/util/StaticFifoBuffer.hxx b/src/util/StaticFifoBuffer.hxx
index c1b64bb..40668d1 100644
--- a/src/util/StaticFifoBuffer.hxx
+++ b/src/util/StaticFifoBuffer.hxx
@@ -59,7 +59,6 @@ public:
constexpr
StaticFifoBuffer():head(0), tail(0) {}
-protected:
void Shift() {
if (head == 0)
return;
@@ -74,7 +73,6 @@ protected:
head = 0;
}
-public:
void Clear() {
head = tail = 0;
}
diff --git a/systemd/mpd.socket b/systemd/mpd.socket
new file mode 100644
index 0000000..c469259
--- /dev/null
+++ b/systemd/mpd.socket
@@ -0,0 +1,9 @@
+[Socket]
+ListenStream=/run/mpd/socket
+ListenStream=6600
+Backlog=5
+KeepAlive=true
+PassCredentials=true
+
+[Install]
+WantedBy=sockets.target
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git
More information about the Pkg-mpd-commits
mailing list