Update MPD to 0.17.6, refresh patches, add myself as pkg maintainer, pkg update copyright

Add some new options and fix BUILD_NLS (full language support) failures

Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
thess
2014-07-16 13:05:52 -04:00
committed by Ted Hess
parent b495ccc053
commit 13aa784f69
4 changed files with 62 additions and 24 deletions
+5 -5
View File
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -8803,6 +8803,7 @@ fi
@@ -9821,6 +9821,7 @@ fi
# Check whether --with-faad was given.
if test "${with_faad+set}" = set; then :
withval=$with_faad;
@@ -10,8 +10,8 @@
fi
--- a/src/input/file_input_plugin.c
+++ b/src/input/file_input_plugin.c
@@ -79,10 +79,6 @@ input_file_open(const char *filename, GE
return false;
@@ -82,10 +82,6 @@ input_file_open(const char *filename,
return NULL;
}
-#ifdef POSIX_FADV_SEQUENTIAL
@@ -19,5 +19,5 @@
-#endif
-
fis = g_new(struct file_input_stream, 1);
input_stream_init(&fis->base, &input_plugin_file, filename);
input_stream_init(&fis->base, &input_plugin_file, filename,
mutex, cond);
@@ -0,0 +1,16 @@
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -370,6 +370,13 @@
#endif
return SAMPLE_FORMAT_S32;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1)
+ case AV_SAMPLE_FMT_FLT:
+#else
+ case SAMPLE_FMT_FLOAT:
+#endif
+ return SAMPLE_FORMAT_FLOAT;
+
default:
g_warning("Unsupported libavcodec SampleFormat value: %d",
codec_context->sample_fmt);
@@ -0,0 +1,24 @@
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -387,6 +387,13 @@ ffmpeg_probe(struct decoder *decoder, st
unsigned char *buffer = g_malloc(BUFFER_SIZE);
size_t nbytes = decoder_read(decoder, is, buffer, BUFFER_SIZE);
+
+ if ((nbytes > 0) && (nbytes < 1024))
+ {
+ // Gobble some more data if header is small
+ nbytes += decoder_read(decoder, is, buffer + nbytes, BUFFER_SIZE - nbytes);
+ }
+
if (nbytes <= PADDING ||
!input_stream_lock_seek(is, 0, SEEK_SET, NULL)) {
g_free(buffer);
@@ -683,6 +690,7 @@ static const char *const ffmpeg_mime_typ
"audio/qcelp",
"audio/vorbis",
"audio/vorbis+ogg",
+ "audio/wav",
"audio/x-8svx",
"audio/x-16sv",
"audio/x-aac",