[Pkg-mpd-commits] [pkg-mpd] 01/04: Imported Upstream version 0.19.12
Florian Schlichting
fsfs at moszumanska.debian.org
Mon Dec 21 16:03:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit f3ea6c5cbbb78e68f43b8b23032b184e9df1a549
Author: Florian Schlichting <fsfs at debian.org>
Date: Mon Dec 21 16:22:18 2015 +0100
Imported Upstream version 0.19.12
---
Makefile.am | 1 +
Makefile.in | 6 ++++--
NEWS | 5 +++++
configure | 22 +++++++++++-----------
configure.ac | 4 ++--
doc/doxygen.conf | 2 +-
doc/user.xml | 3 ++-
src/Main.cxx | 2 +-
src/tag/TagString.cxx | 2 +-
systemd/mpd.service.in | 2 +-
10 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 89819de..307fcba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1219,6 +1219,7 @@ liboutput_plugins_a_SOURCES = \
MIXER_LIBS = \
libmixer_plugins.a \
+ $(ALSA_LIBS) \
$(PULSE_LIBS)
MIXER_API_SRC = \
diff --git a/Makefile.in b/Makefile.in
index 6a8fd03..fbc5504 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1820,7 +1820,8 @@ am__DEPENDENCIES_18 = libfilter_plugins.a $(am__DEPENDENCIES_17)
@ENABLE_ENCODER_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_ENCODER_TRUE@ $(am__DEPENDENCIES_1) \
@ENABLE_ENCODER_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_20 = libmixer_plugins.a $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_20 = libmixer_plugins.a $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am__DEPENDENCIES_21 = libicu.a $(am__DEPENDENCIES_1)
@HAVE_ZLIB_TRUE at am__DEPENDENCIES_22 = $(am__DEPENDENCIES_1)
am__DEPENDENCIES_23 = libfs.a $(am__DEPENDENCIES_22)
@@ -3625,6 +3626,7 @@ liboutput_plugins_a_SOURCES = src/output/Timer.cxx \
$(am__append_91) $(am__append_92) $(am__append_93)
MIXER_LIBS = \
libmixer_plugins.a \
+ $(ALSA_LIBS) \
$(PULSE_LIBS)
MIXER_API_SRC = \
@@ -13900,9 +13902,9 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- at ANDROID_FALSE@@ENABLE_DOCUMENTATION_FALSE at clean-local:
@ENABLE_DOCUMENTATION_FALSE at uninstall-local:
@ENABLE_DOCUMENTATION_FALSE at install-data-local:
+ at ANDROID_FALSE@@ENABLE_DOCUMENTATION_FALSE at clean-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-local \
diff --git a/NEWS b/NEWS
index 94a676b..4da2a85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+ver 0.19.12 (2015/12/15)
+* fix assertion failure on malformed UTF-8 tag
+* fix build failure on non-Linux systems
+* fix LimitRTTIME in systemd unit file
+
ver 0.19.11 (2015/10/27)
* tags
- ape: fix buffer overflow
diff --git a/configure b/configure
index 0e58f24..793d68d 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.11.
+# Generated by GNU Autoconf 2.69 for mpd 0.19.12.
#
# 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.11'
-PACKAGE_STRING='mpd 0.19.11'
+PACKAGE_VERSION='0.19.12'
+PACKAGE_STRING='mpd 0.19.12'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -1757,7 +1757,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.11 to adapt to many kinds of systems.
+\`configure' configures mpd 0.19.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1828,7 +1828,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.19.11:";;
+ short | recursive ) echo "Configuration of mpd 0.19.12:";;
esac
cat <<\_ACEOF
@@ -2169,7 +2169,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.19.11
+mpd configure 0.19.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2622,7 +2622,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.11, which was
+It was created by mpd $as_me 0.19.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2973,7 +2973,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION_MAJOR=0
VERSION_MINOR=19
-VERSION_REVISION=11
+VERSION_REVISION=12
VERSION_EXTRA=0
@@ -3492,7 +3492,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.19.11'
+ VERSION='0.19.12'
cat >>confdefs.h <<_ACEOF
@@ -20890,7 +20890,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.11, which was
+This file was extended by mpd $as_me 0.19.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20956,7 +20956,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.11
+mpd config.status 0.19.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 3d29e72..107b45a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.19.11, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.19.12, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=19
-VERSION_REVISION=11
+VERSION_REVISION=12
VERSION_EXTRA=0
AC_CONFIG_SRCDIR([src/Main.cxx])
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 993f4d0..81d5310 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.11
+PROJECT_NUMBER = 0.19.12
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/doc/user.xml b/doc/user.xml
index 010d2f9..5a60dc6 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -2647,7 +2647,8 @@ buffer_size: 16384</programlisting>
/ <ulink
url="http://icecast.org/"><application>IceCast</application></ulink>.
HTTP streaming clients like
- <application>mplayer</application> can connect to it.
+ <application>mplayer</application>, <application>VLC</application>,
+ and <application>mpv</application> can connect to it.
</para>
<para>
diff --git a/src/Main.cxx b/src/Main.cxx
index a3a1b00..d646573 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -630,7 +630,7 @@ static int mpd_main_after_fork(struct options options)
config_get_unsigned(CONF_AUTO_UPDATE_DEPTH,
INT_MAX));
#else
- FormatWarning(main_domain,
+ FormatWarning(config_domain,
"inotify: auto_update was disabled. enable during compilation phase");
#endif
}
diff --git a/src/tag/TagString.cxx b/src/tag/TagString.cxx
index 4f07cd6..aab9bce 100644
--- a/src/tag/TagString.cxx
+++ b/src/tag/TagString.cxx
@@ -40,9 +40,9 @@ FindInvalidUTF8(const char *p, const char *const end)
/* now call the other SequenceLengthUTF8() overload
which also validates the continuations */
const size_t t = SequenceLengthUTF8(p);
- assert(s == t);
if (t == 0)
return p;
+ assert(s == t);
p += s;
}
diff --git a/systemd/mpd.service.in b/systemd/mpd.service.in
index de91eb4..0e8eb84 100644
--- a/systemd/mpd.service.in
+++ b/systemd/mpd.service.in
@@ -7,7 +7,7 @@ ExecStart=@prefix@/bin/mpd --no-daemon
# allow MPD to use real-time priority 50
LimitRTPRIO=50
-LimitRTTIME=-1
+LimitRTTIME=infinity
[Install]
WantedBy=multi-user.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