Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann 2017-06-15 22:51:07 +02:00
commit 5ed5d7fe60
3 changed files with 10 additions and 7 deletions

2
NEWS
View File

@ -9,6 +9,8 @@ ver 0.21 (not yet released)
* output * output
- alsa: non-blocking mode - alsa: non-blocking mode
ver 0.20.10 (not yet released)
ver 0.20.9 (2017/06/04) ver 0.20.9 (2017/06/04)
* decoder * decoder
- ffmpeg: support *.adx - ffmpeg: support *.adx

View File

@ -113,7 +113,7 @@ cd mpd-version</programlisting>
<para> <para>
For example, the following installs a fairly complete list of For example, the following installs a fairly complete list of
build dependencies on Debian Wheezy: build dependencies on Debian Jessie:
</para> </para>
<programlisting> <programlisting>
@ -125,19 +125,20 @@ apt-get install g++ \
libmpcdec-dev libwavpack-dev libwildmidi-dev \ libmpcdec-dev libwavpack-dev libwildmidi-dev \
libsidplay2-dev libsidutils-dev libresid-builder-dev \ libsidplay2-dev libsidutils-dev libresid-builder-dev \
libavcodec-dev libavformat-dev \ libavcodec-dev libavformat-dev \
libmp3lame-dev \ libmp3lame-dev libtwolame-dev libshine-dev \
libsamplerate0-dev libsoxr-dev \ libsamplerate0-dev libsoxr-dev \
libbz2-dev libcdio-paranoia-dev libiso9660-dev libmms-dev \ libbz2-dev libcdio-paranoia-dev libiso9660-dev libmms-dev \
libzzip-dev \ libzzip-dev \
libcurl4-gnutls-dev libyajl-dev libexpat-dev \ libcurl4-gnutls-dev libyajl-dev libexpat-dev \
libasound2-dev libao-dev libjack-jackd2-dev libopenal-dev \ libasound2-dev libao-dev libjack-jackd2-dev libopenal-dev \
libpulse-dev libroar-dev libshout3-dev \ libpulse-dev libroar-dev libshout3-dev \
libsndio-dev \
libmpdclient-dev \ libmpdclient-dev \
libnfs-dev libsmbclient-dev \ libnfs-dev libsmbclient-dev \
libupnp-dev \ libupnp-dev \
libavahi-client-dev \ libavahi-client-dev \
libsqlite3-dev \ libsqlite3-dev \
libsystemd-daemon-dev libwrap0-dev \ libsystemd-dev libwrap0-dev \
libcppunit-dev xmlto \ libcppunit-dev xmlto \
libboost-dev \ libboost-dev \
libicu-dev libicu-dev

View File

@ -58,8 +58,8 @@ libmad = AutotoolsProject(
) )
ffmpeg = FfmpegProject( ffmpeg = FfmpegProject(
'http://ffmpeg.org/releases/ffmpeg-3.3.1.tar.xz', 'http://ffmpeg.org/releases/ffmpeg-3.3.2.tar.xz',
'b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f', '1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785',
'lib/libavcodec.a', 'lib/libavcodec.a',
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',
@ -82,8 +82,8 @@ ffmpeg = FfmpegProject(
) )
curl = AutotoolsProject( curl = AutotoolsProject(
'http://curl.haxx.se/download/curl-7.54.0.tar.lzma', 'http://curl.haxx.se/download/curl-7.54.1.tar.lzma',
'cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a', '2b7af34d4900887e0b4e0a9f545b9511ff774d07151ae4976485060d3e1bdb6e',
'lib/libcurl.a', 'lib/libcurl.a',
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',