[Pkg-mpd-commits] [pkg-mpd] 01/03: Imported Upstream version 0.19.16
Florian Schlichting
fsfs at moszumanska.debian.org
Thu Jun 16 22:12:45 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 cc107f63150ebfe2162c762c856190910c805e46
Author: Florian Schlichting <fsfs at debian.org>
Date: Thu Jun 16 23:57:03 2016 +0200
Imported Upstream version 0.19.16
---
Makefile.am | 3 +-
Makefile.in | 5 +-
NEWS | 5 ++
configure | 28 +++----
configure.ac | 10 +--
doc/doxygen.conf | 2 +-
doc/include/tags.xml | 154 +++++++++++++++++++++++++++++++++++
scripts/check_config_h.rb | 47 +++++++++++
src/PlayerThread.cxx | 4 +-
src/decoder/plugins/FlacIOHandle.cxx | 9 +-
10 files changed, 235 insertions(+), 32 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 00b425d..91f0f32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2152,8 +2152,9 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
test/test_archive_bzip2.sh \
test/test_archive_iso9660.sh \
test/test_archive_zzip.sh \
- $(wildcard scripts/*.sh) \
+ $(wildcard $(srcdir)/scripts/*.rb) \
$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
+ $(wildcard $(srcdir)/doc/include/*.xml) \
systemd/mpd.socket \
android/AndroidManifest.xml \
android/build.py \
diff --git a/Makefile.in b/Makefile.in
index 5a3916a..9ed3a1c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4282,8 +4282,9 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \
test/test_archive_bzip2.sh \
test/test_archive_iso9660.sh \
test/test_archive_zzip.sh \
- $(wildcard scripts/*.sh) \
+ $(wildcard $(srcdir)/scripts/*.rb) \
$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
+ $(wildcard $(srcdir)/doc/include/*.xml) \
systemd/mpd.socket \
android/AndroidManifest.xml \
android/build.py \
@@ -13903,8 +13904,8 @@ 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 ENABLE_DOCUMENTATION_FALSE@uninstall-local:
@ANDROID_FALSE@@ENABLE_DOCUMENTATION_FALSE at clean-local:
+ at ENABLE_DOCUMENTATION_FALSE@uninstall-local:
@ENABLE_DOCUMENTATION_FALSE at install-data-local:
clean: clean-am
diff --git a/NEWS b/NEWS
index 051f808..73d2244 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+ver 0.19.16 (2016/06/13)
+* faster seeking
+* fix system include path order
+* add missing DocBook file to tarball
+
ver 0.19.15 (2016/04/30)
* decoder
- ffmpeg: support FFmpeg 3.0
diff --git a/configure b/configure
index b7ad43b..c674402 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.15.
+# Generated by GNU Autoconf 2.69 for mpd 0.19.16.
#
# 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.15'
-PACKAGE_STRING='mpd 0.19.15'
+PACKAGE_VERSION='0.19.16'
+PACKAGE_STRING='mpd 0.19.16'
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.15 to adapt to many kinds of systems.
+\`configure' configures mpd 0.19.16 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.15:";;
+ short | recursive ) echo "Configuration of mpd 0.19.16:";;
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.15
+mpd configure 0.19.16
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.15, which was
+It was created by mpd $as_me 0.19.16, 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=15
+VERSION_REVISION=16
VERSION_EXTRA=0
@@ -3492,7 +3492,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.19.15'
+ VERSION='0.19.16'
cat >>confdefs.h <<_ACEOF
@@ -8862,12 +8862,6 @@ $as_echo "yes" >&6; }
fi
- if test x$GCC = xyes; then
- # suppress warnings in the GLib headers
- GLIB_CFLAGS=`echo $GLIB_CFLAGS |sed -e 's,-I/,-isystem /,g'`
- fi
-
-
$as_echo "#define HAVE_GLIB 1" >>confdefs.h
fi
@@ -20901,7 +20895,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.15, which was
+This file was extended by mpd $as_me 0.19.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20967,7 +20961,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.15
+mpd config.status 0.19.16
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c94c724..35ecb7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.19.15, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.19.16, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=19
-VERSION_REVISION=15
+VERSION_REVISION=16
VERSION_EXTRA=0
AC_CONFIG_SRCDIR([src/Main.cxx])
@@ -703,12 +703,6 @@ AC_ARG_ENABLE(glib,
if test x$enable_glib = xyes; then
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28 gthread-2.0],,
[AC_MSG_ERROR([GLib 2.28 is required])])
-
- if test x$GCC = xyes; then
- # suppress warnings in the GLib headers
- GLIB_CFLAGS=`echo $GLIB_CFLAGS |sed -e 's,-I/,-isystem /,g'`
- fi
-
AC_DEFINE(HAVE_GLIB, 1, [Define if GLib is used])
fi
AM_CONDITIONAL(HAVE_GLIB, test x$enable_glib = xyes)
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 40d8ac6..483cee1 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.15
+PROJECT_NUMBER = 0.19.16
# 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/include/tags.xml b/doc/include/tags.xml
new file mode 100644
index 0000000..554b43a
--- /dev/null
+++ b/doc/include/tags.xml
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding="utf-8"?>
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<itemizedlist>
+ <listitem>
+ <para>
+ <varname>artist</varname>: the artist name. Its meaning is not
+ well-defined; see <varname>composer</varname> and
+ <varname>performer</varname> for more specific tags.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>artistsort</varname>: same as
+ <varname>artist</varname>, but for sorting. This usually omits
+ prefixes such as "The".
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>album</varname>: the album name.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>albumsort</varname>: same as <varname>album</varname>,
+ but for sorting.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>albumartist</varname>: on multi-artist albums, this is
+ the artist name which shall be used for the whole album. The
+ exact meaning of this tag is not well-defined.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>albumartistsort</varname>: same as
+ <varname>albumartist</varname>, but for sorting.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>title</varname>: the song title.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>track</varname>: the track number within the album.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>name</varname>: a name for this song. This is not the
+ song title. The exact meaning of this tag is not well-defined.
+ It is often used by badly configured internet radio stations
+ with broken tags to squeeze both the artist name and the song
+ title in one tag.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>genre</varname>: the music genre.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>date</varname>: the song's release date. This is
+ usually a 4-digit year.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>composer</varname>: the artist who composed the song.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>performer</varname>: the artist who performed the song.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>comment</varname>: a human-readable comment about this
+ song. The exact meaning of this tag is not well-defined.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>disc</varname>: the disc number in a multi-disc album.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>musicbrainz_artistid</varname>: the artist id in the
+ <ulink
+ url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>musicbrainz_albumid</varname>: the album id in the
+ <ulink
+ url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>musicbrainz_albumartistid</varname>: the album artist
+ id in the <ulink
+ url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>musicbrainz_trackid</varname>: the track id in the
+ <ulink
+ url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <varname>musicbrainz_releasetrackid</varname>: the release track
+ id in the <ulink
+ url="http://musicbrainz.org/doc/MusicBrainzTag">MusicBrainz</ulink>
+ database.
+ </para>
+ </listitem>
+</itemizedlist>
diff --git a/scripts/check_config_h.rb b/scripts/check_config_h.rb
new file mode 100755
index 0000000..2619984
--- /dev/null
+++ b/scripts/check_config_h.rb
@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+#
+# This script verifies that every source includes config.h first.
+# This is very important for consistent Large File Support.
+#
+
+def check_file(file)
+ first = true
+ file.each_line do |line|
+ if line =~ /^\#include\s+(\S+)/ then
+ if $1 == '"config.h"'
+ unless first
+ puts "#{file.path}: config.h included too late"
+ end
+ else
+ if first
+ puts "#{file.path}: config.h missing"
+ end
+ end
+ first = false
+ end
+ end
+end
+
+def check_path(path)
+ File.open(path) do |file|
+ check_file(file)
+ end
+end
+
+if ARGV.empty?
+ Dir["src/*.c"].each do |path|
+ check_path(path)
+ end
+
+ Dir["src/*/*.c"].each do |path|
+ check_path(path)
+ end
+
+ Dir["test/*.c"].each do |path|
+ check_path(path)
+ end
+else
+ ARGV.each do |path|
+ check_path(path)
+ end
+end
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx
index eeebcdb..30e509b 100644
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -518,6 +518,8 @@ Player::SeekDecoder()
{
assert(pc.next_song != nullptr);
+ pc.outputs.Cancel();
+
const SongTime start_time = pc.next_song->GetStartTime();
if (!dc.LockIsCurrentSong(*pc.next_song)) {
@@ -583,8 +585,6 @@ Player::SeekDecoder()
/* re-fill the buffer after seeking */
buffering = true;
- pc.outputs.Cancel();
-
return true;
}
diff --git a/src/decoder/plugins/FlacIOHandle.cxx b/src/decoder/plugins/FlacIOHandle.cxx
index 0dd8957..875387d 100644
--- a/src/decoder/plugins/FlacIOHandle.cxx
+++ b/src/decoder/plugins/FlacIOHandle.cxx
@@ -20,6 +20,7 @@
#include "config.h"
#include "FlacIOHandle.hxx"
#include "util/Error.hxx"
+#include "Log.hxx"
#include "Compiler.h"
#include <errno.h>
@@ -87,7 +88,13 @@ FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 _offset, int whence)
return -1;
}
- return is->LockSeek(offset, IgnoreError()) ? 0 : -1;
+ Error error;
+ if (!is->LockSeek(offset, error)) {
+ LogError(error);
+ return -1;
+ }
+
+ return 0;
}
static FLAC__int64
--
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