diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-08 15:22:44 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-08 15:22:44 +0100 |
| commit | de43bddc1a5c1b66175265428fc84c5c13e4200c (patch) | |
| tree | 0a2a6f2ff8883a03130fe6c89885885f159fce90 /android | |
| parent | 6edfc56c9df7b212c65a5a40e9d0f132429578ea (diff) | |
| parent | c46f48abec9b55f322070bb3c6e625abb3308dc9 (diff) | |
| download | mpd-de43bddc1a5c1b66175265428fc84c5c13e4200c.tar.gz mpd-de43bddc1a5c1b66175265428fc84c5c13e4200c.tar.xz mpd-de43bddc1a5c1b66175265428fc84c5c13e4200c.zip | |
Merge tag 'v0.19.6'
Diffstat (limited to 'android')
| -rw-r--r-- | android/AndroidManifest.xml | 4 | ||||
| -rwxr-xr-x | android/build.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 8625bd76e..616536ab7 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.musicpd" android:installLocation="auto" - android:versionCode="9" - android:versionName="0.19.5"> + android:versionCode="10" + android:versionName="0.19.6"> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/> diff --git a/android/build.py b/android/build.py index 020ba7fd1..ef201c5de 100755 --- a/android/build.py +++ b/android/build.py @@ -314,8 +314,8 @@ thirdparty_libs = [ ), AutotoolsProject( - 'https://svn.xiph.org/releases/flac/flac-1.3.0.tar.xz', - '13b5c214cee8373464d3d65dee362cdd', + 'http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz', + 'b9922c9a0378c88d3e901b234f852698', 'lib/libFLAC.a', [ '--disable-shared', '--enable-static', @@ -341,8 +341,8 @@ thirdparty_libs = [ ), FfmpegProject( - 'http://www.ffmpeg.org/releases/ffmpeg-2.2.3.tar.bz2', - 'dbb5b6b69bd010916f17df0ae596e0b1', + 'http://ffmpeg.org/releases/ffmpeg-2.5.tar.bz2', + '4346fe710cc6bdd981f6534d2420d1ab', 'lib/libavcodec.a', [ '--disable-shared', '--enable-static', @@ -366,8 +366,8 @@ thirdparty_libs = [ ), AutotoolsProject( - 'http://curl.haxx.se/download/curl-7.37.0.tar.lzma', - '54bfd1eb5214f604186d6f5ac61c7781', + 'http://curl.haxx.se/download/curl-7.39.0.tar.lzma', + 'e9aa6dec29920eba8ef706ea5823bad7', 'lib/libcurl.a', [ '--disable-shared', '--enable-static', |