[Pkg-mpd-commits] [pkg-mpd] 01/08: Imported Upstream version 0.18.4
Florian Schlichting
fsfs at moszumanska.debian.org
Wed Nov 20 21:59:25 UTC 2013
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit 83298e34b01a13f5654caee79680a98c9097c33c
Author: Florian Schlichting <fsfs at debian.org>
Date: Thu Nov 14 21:16:20 2013 +0100
Imported Upstream version 0.18.4
---
NEWS | 6 ++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/doxygen.conf | 2 +-
doc/mpdconf.example | 8 --------
src/DecoderAPI.cxx | 1 +
src/DecoderThread.cxx | 2 ++
src/DespotifyUtils.cxx | 2 ++
src/SongSave.cxx | 1 +
src/decoder/DsdLib.hxx | 11 +++++++++++
src/decoder/DsdiffDecoderPlugin.cxx | 4 ++--
src/encoder/OpusEncoderPlugin.cxx | 1 +
src/filter/RouteFilterPlugin.cxx | 1 +
src/output/HttpdInternal.hxx | 5 +++++
src/util/LazyRandomEngine.hxx | 8 ++++----
src/util/RefCount.hxx | 7 ++++++-
test/run_convert.cxx | 1 +
17 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/NEWS b/NEWS
index be1cd78..86ab1a2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+ver 0.18.4 (2013/11/13)
+* decoder
+ - dsdiff: fix byte order bug
+* fix build failures due to missing includes
+* libc++ compatibility
+
ver 0.18.3 (2013/11/08)
* fix stuck MPD after song change (0.18.2 regression)
diff --git a/configure b/configure
index 70664ad..5dbd635 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.18.3.
+# Generated by GNU Autoconf 2.69 for mpd 0.18.4.
#
# 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.18.3'
-PACKAGE_STRING='mpd 0.18.3'
+PACKAGE_VERSION='0.18.4'
+PACKAGE_STRING='mpd 0.18.4'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -1673,7 +1673,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.18.3 to adapt to many kinds of systems.
+\`configure' configures mpd 0.18.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1743,7 +1743,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.18.3:";;
+ short | recursive ) echo "Configuration of mpd 0.18.4:";;
esac
cat <<\_ACEOF
@@ -2039,7 +2039,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.18.3
+mpd configure 0.18.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2492,7 +2492,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.18.3, which was
+It was created by mpd $as_me 0.18.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3314,7 +3314,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.18.3'
+ VERSION='0.18.4'
cat >>confdefs.h <<_ACEOF
@@ -18227,7 +18227,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.18.3, which was
+This file was extended by mpd $as_me 0.18.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18293,7 +18293,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.18.3
+mpd config.status 0.18.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ff00b8f..6805a5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.18.3, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.18.4, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=18
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index b3728f3..f9bd1d1 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.18.3
+PROJECT_NUMBER = 0.18.4
# 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/mpdconf.example b/doc/mpdconf.example
index 0881de1..470a5c9 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -210,7 +210,6 @@ input {
# type "alsa"
# name "My ALSA Device"
## device "hw:0,0" # optional
-## format "44100:16:2" # optional
## mixer_type "hardware" # optional
## mixer_device "default" # optional
## mixer_control "PCM" # optional
@@ -223,7 +222,6 @@ input {
# type "oss"
# name "My OSS Device"
## device "/dev/dsp" # optional
-## format "44100:16:2" # optional
## mixer_type "hardware" # optional
## mixer_device "/dev/mixer" # optional
## mixer_control "PCM" # optional
@@ -327,12 +325,6 @@ input {
# mixer_type "none" # optional
#}
#
-# This setting will change all decoded audio to be converted to the specified
-# format before being passed to the audio outputs. By default, this setting is
-# disabled.
-#
-#audio_output_format "44100:16:2"
-#
# If MPD has been compiled with libsamplerate support, this setting specifies
# the sample rate converter to use. Possible values can be found in the
# mpd.conf man page or the libsamplerate documentation. By default, this is
diff --git a/src/DecoderAPI.cxx b/src/DecoderAPI.cxx
index 87d1044..4fea02b 100644
--- a/src/DecoderAPI.cxx
+++ b/src/DecoderAPI.cxx
@@ -35,6 +35,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
void
decoder_initialized(Decoder &decoder,
diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx
index 0ea859e..72fc3cf 100644
--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -38,6 +38,8 @@
#include "tag/ApeReplayGain.hxx"
#include "Log.hxx"
+#include <functional>
+
static constexpr Domain decoder_thread_domain("decoder_thread");
/**
diff --git a/src/DespotifyUtils.cxx b/src/DespotifyUtils.cxx
index 769a4e8..e91587a 100644
--- a/src/DespotifyUtils.cxx
+++ b/src/DespotifyUtils.cxx
@@ -28,6 +28,8 @@ extern "C" {
#include <despotify.h>
}
+#include <stdio.h>
+
const Domain despotify_domain("despotify");
static struct despotify_session *g_session;
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index ae05572..63e279a 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -30,6 +30,7 @@
#include "util/Domain.hxx"
#include <string.h>
+#include <stdlib.h>
#define SONG_MTIME "mtime"
#define SONG_END "song_end"
diff --git a/src/decoder/DsdLib.hxx b/src/decoder/DsdLib.hxx
index 25329e6..53160cf 100644
--- a/src/decoder/DsdLib.hxx
+++ b/src/decoder/DsdLib.hxx
@@ -47,6 +47,17 @@ public:
}
};
+class DffDsdUint64 {
+ uint32_t hi;
+ uint32_t lo;
+
+public:
+ constexpr uint64_t Read() const {
+ return (uint64_t(FromBE32(hi)) << 32) |
+ uint64_t(FromBE32(lo));
+ }
+};
+
bool
dsdlib_read(Decoder *decoder, InputStream &is,
void *data, size_t length);
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx
index 1dc7c7c..347f5b5 100644
--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -43,13 +43,13 @@
struct DsdiffHeader {
DsdId id;
- DsdUint64 size;
+ DffDsdUint64 size;
DsdId format;
};
struct DsdiffChunkHeader {
DsdId id;
- DsdUint64 size;
+ DffDsdUint64 size;
/**
* Read the "size" attribute from the specified header, converting it
diff --git a/src/encoder/OpusEncoderPlugin.cxx b/src/encoder/OpusEncoderPlugin.cxx
index 29f7df7..243dc08 100644
--- a/src/encoder/OpusEncoderPlugin.cxx
+++ b/src/encoder/OpusEncoderPlugin.cxx
@@ -34,6 +34,7 @@
#include <glib.h>
#include <assert.h>
+#include <stdlib.h>
struct opus_encoder {
/** the base class */
diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx
index c0b0be2..d9042c2 100644
--- a/src/filter/RouteFilterPlugin.cxx
+++ b/src/filter/RouteFilterPlugin.cxx
@@ -56,6 +56,7 @@
#include <assert.h>
#include <string.h>
#include <stdint.h>
+#include <stdlib.h>
class RouteFilter final : public Filter {
/**
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx
index cacabd0..b76493a 100644
--- a/src/output/HttpdInternal.hxx
+++ b/src/output/HttpdInternal.hxx
@@ -30,6 +30,11 @@
#include "thread/Mutex.hxx"
#include "event/ServerSocket.hxx"
+#ifdef _LIBCPP_VERSION
+/* can't use incomplete template arguments with libc++ */
+#include "HttpdClient.hxx"
+#endif
+
#include <forward_list>
struct config_param;
diff --git a/src/util/LazyRandomEngine.hxx b/src/util/LazyRandomEngine.hxx
index 8afe1d1..bfe4bb6 100644
--- a/src/util/LazyRandomEngine.hxx
+++ b/src/util/LazyRandomEngine.hxx
@@ -49,12 +49,12 @@ public:
*/
void AutoCreate();
- result_type min() const {
- return engine->min();
+ static constexpr result_type min() {
+ return std::mt19937::min();
}
- result_type max() const {
- return engine->max();
+ static constexpr result_type max() {
+ return std::mt19937::max();
}
result_type operator()() {
diff --git a/src/util/RefCount.hxx b/src/util/RefCount.hxx
index 9a45a58..dff8500 100644
--- a/src/util/RefCount.hxx
+++ b/src/util/RefCount.hxx
@@ -42,7 +42,12 @@ class RefCount {
std::atomic_uint n;
public:
- constexpr RefCount():n(1) {}
+#ifndef _LIBCPP_VERSION
+ /* the "constexpr" is missing in libc++'s "atomic"
+ implementation */
+ constexpr
+#endif
+ RefCount():n(1) {}
void Increment() {
++n;
diff --git a/test/run_convert.cxx b/test/run_convert.cxx
index ca55bcc..0e873a3 100644
--- a/test/run_convert.cxx
+++ b/test/run_convert.cxx
@@ -36,6 +36,7 @@
#include <assert.h>
#include <stddef.h>
+#include <stdlib.h>
#include <unistd.h>
static void
--
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