[Pkg-mpd-commits] [pkg-mpd] 01/07: Imported Upstream version 0.19.13
Florian Schlichting
fsfs at moszumanska.debian.org
Tue Feb 23 22:56:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit 4ff360595b198ce692a84ea12c3392785a4f8586
Author: Florian Schlichting <fsfs at debian.org>
Date: Tue Feb 23 22:49:30 2016 +0100
Imported Upstream version 0.19.13
---
Makefile.in | 2 +-
NEWS | 8 +++++++
config.h.in | 3 +++
configure | 33 +++++++++++++++++++----------
configure.ac | 5 +++--
doc/doxygen.conf | 2 +-
src/DetachedSong.hxx | 8 +++++++
src/decoder/plugins/FfmpegDecoderPlugin.cxx | 2 +-
src/queue/Playlist.cxx | 2 +-
src/tag/Aiff.cxx | 8 +++----
src/tag/Riff.cxx | 8 +++----
src/tag/Tag.hxx | 10 ++++++++-
src/unix/Daemon.cxx | 2 +-
13 files changed, 66 insertions(+), 27 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index fbc5504..e24b793 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13902,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 4da2a85..96d8ec8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+ver 0.19.13 (2016/02/23)
+* tags
+ - aiff, riff: fix ID3 chunk padding
+* decoder
+ - ffmpeg: support the TAK codec
+* fix disappearing duration of remote songs during playback
+* initialize supplementary groups with glibc 2.19+
+
ver 0.19.12 (2015/12/15)
* fix assertion failure on malformed UTF-8 tag
* fix build failure on non-Linux systems
diff --git a/config.h.in b/config.h.in
index ccc87ea..1acac96 100644
--- a/config.h.in
+++ b/config.h.in
@@ -165,6 +165,9 @@
/* Define to use id3tag */
#undef HAVE_ID3TAG
+/* Define to 1 if you have the `initgroups' function. */
+#undef HAVE_INITGROUPS
+
/* Define to 1 if you have the `inotify_init' function. */
#undef HAVE_INOTIFY_INIT
diff --git a/configure b/configure
index 793d68d..f1e85b1 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.12.
+# Generated by GNU Autoconf 2.69 for mpd 0.19.13.
#
# 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.12'
-PACKAGE_STRING='mpd 0.19.12'
+PACKAGE_VERSION='0.19.13'
+PACKAGE_STRING='mpd 0.19.13'
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.12 to adapt to many kinds of systems.
+\`configure' configures mpd 0.19.13 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.12:";;
+ short | recursive ) echo "Configuration of mpd 0.19.13:";;
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.12
+mpd configure 0.19.13
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.12, which was
+It was created by mpd $as_me 0.19.13, 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=12
+VERSION_REVISION=13
VERSION_EXTRA=0
@@ -3492,7 +3492,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.19.12'
+ VERSION='0.19.13'
cat >>confdefs.h <<_ACEOF
@@ -6355,6 +6355,17 @@ _ACEOF
fi
done
+for ac_func in initgroups
+do :
+ ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups"
+if test "x$ac_cv_func_initgroups" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_INITGROUPS 1
+_ACEOF
+
+fi
+done
+
for ac_func in strndup
do :
ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
@@ -20890,7 +20901,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.12, which was
+This file was extended by mpd $as_me 0.19.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20956,7 +20967,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.12
+mpd config.status 0.19.13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 107b45a..39f2aaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.19.12, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.19.13, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=19
-VERSION_REVISION=12
+VERSION_REVISION=13
VERSION_EXTRA=0
AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -206,6 +206,7 @@ if test x$host_is_linux = xyes; then
fi
AC_CHECK_FUNCS(getpwnam_r getpwuid_r)
+AC_CHECK_FUNCS(initgroups)
AC_CHECK_FUNCS(strndup)
if test x$host_is_linux = xyes; then
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 81d5310..0dbf465 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.12
+PROJECT_NUMBER = 0.19.13
# 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/DetachedSong.hxx b/src/DetachedSong.hxx
index 021b5de..0d1393f 100644
--- a/src/DetachedSong.hxx
+++ b/src/DetachedSong.hxx
@@ -188,6 +188,14 @@ public:
tag = std::move(other.tag);
}
+ /**
+ * Similar to the MoveTagFrom(), but move only the #TagItem
+ * array.
+ */
+ void MoveTagItemsFrom(DetachedSong &&other) {
+ tag.MoveItemsFrom(std::move(other.tag));
+ }
+
time_t GetLastModified() const {
return mtime;
}
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 6890891..95525b6 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -738,7 +738,7 @@ static const char *const ffmpeg_suffixes[] = {
"mve", "mvi", "mxf", "nc", "nsv", "nut", "nuv", "oga", "ogm", "ogv",
"ogx", "oma", "ogg", "omg", "opus", "psp", "pva", "qcp", "qt", "r3d", "ra",
"ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd",
- "sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts",
+ "sol", "son", "spx", "str", "swf", "tak", "tgi", "tgq", "tgv", "thp", "ts",
"tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc",
"vp6", "vmd", "wav", "webm", "wma", "wmv", "wsaud", "wsvga", "wv",
"wve",
diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx
index b2fd673..a9e8f52 100644
--- a/src/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
@@ -37,7 +37,7 @@ playlist::TagModified(DetachedSong &&song)
DetachedSong ¤t_song = queue.GetOrder(current);
if (song.IsSame(current_song))
- current_song.MoveTagFrom(std::move(song));
+ current_song.MoveTagItemsFrom(std::move(song));
queue.ModifyAtOrder(current);
queue.IncrementVersion();
diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx
index c2498c9..3c0d138 100644
--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -84,14 +84,14 @@ aiff_seek_id3(FILE *file)
underflow when casting to off_t */
return 0;
- if (size % 2 != 0)
- /* pad byte */
- ++size;
-
if (memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */
return size;
+ if (size % 2 != 0)
+ /* pad byte */
+ ++size;
+
if (fseek(file, size, SEEK_CUR) != 0)
return 0;
}
diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx
index c630f08..19bc3b8 100644
--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -82,15 +82,15 @@ riff_seek_id3(FILE *file)
underflow when casting to off_t */
return 0;
- if (size % 2 != 0)
- /* pad byte */
- ++size;
-
if (memcmp(chunk.id, "id3 ", 4) == 0 ||
memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */
return size;
+ if (size % 2 != 0)
+ /* pad byte */
+ ++size;
+
if (fseek(file, size, SEEK_CUR) != 0)
return 0;
}
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx
index f1d3d57..8f0856b 100644
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
@@ -80,9 +80,17 @@ struct Tag {
Tag &operator=(Tag &&other) {
duration = other.duration;
has_playlist = other.has_playlist;
+ MoveItemsFrom(std::move(other));
+ return *this;
+ }
+
+ /**
+ * Similar to the move operator, but move only the #TagItem
+ * array.
+ */
+ void MoveItemsFrom(Tag &&other) {
std::swap(items, other.items);
std::swap(num_items, other.num_items);
- return *this;
}
/**
diff --git a/src/unix/Daemon.cxx b/src/unix/Daemon.cxx
index d283108..67704a9 100644
--- a/src/unix/Daemon.cxx
+++ b/src/unix/Daemon.cxx
@@ -110,7 +110,7 @@ daemonize_set_user(void)
(int)user_gid);
}
-#ifdef _BSD_SOURCE
+#ifdef HAVE_INITGROUPS
/* init supplementary groups
* (must be done before we change our uid)
*/
--
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