cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

MPD: Upgrade to 0.18.11, convert to procd, refresh patches

Browse Source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess
2014-07-30 11:40:21 -04:00
parent 911bc46f3a
commit a3255798d7
6 changed files with 46 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/mpd/patches/100-compile-fixes.patch
-23
View File
@@ -1,23 +0,0 @@
--- a/configure
+++ b/configure
@@ -9821,6 +9821,7 @@ fi
# Check whether --with-faad was given.
if test "${with_faad+set}" = set; then :
withval=$with_faad;
+ faad_prefix=$with_faad;
else
faad_prefix=""
fi
--- a/src/input/file_input_plugin.c
+++ b/src/input/file_input_plugin.c
@@ -82,10 +82,6 @@ input_file_open(const char *filename,
return NULL;
}
-#ifdef POSIX_FADV_SEQUENTIAL
- posix_fadvise(fd, (off_t)0, st.st_size, POSIX_FADV_SEQUENTIAL);
-#endif
-
fis = g_new(struct file_input_stream, 1);
input_stream_init(&fis->base, &input_plugin_file, filename,
mutex, cond);
sound/mpd/patches/200-allow-float-samples-ffmpeg.patch
-16
View File
@@ -1,16 +0,0 @@
--- 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);
sound/mpd/patches/210-support_raw_pcm_streams.patch
+3 -17
View File
@@ -1,20 +1,6 @@
--- 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
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -634,6 +634,7 @@ static const char *const ffmpeg_mime_typ
"audio/qcelp",
"audio/vorbis",
"audio/vorbis+ogg",
sound/mpd/patches/220-handle_slow_server_stream_startup.patch
+16
View File
@@ -0,0 +1,16 @@
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -373,6 +373,13 @@ ffmpeg_probe(Decoder *decoder, InputStre
unsigned char buffer[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 || !is.LockRewind(IgnoreError()))
return nullptr;