From be492ed108ca4ed11ec6334fb001e089d4bef116 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 28 Nov 2014 20:16:33 +0100
Subject: android: update libFLAC to 1.3.1

Due to security vulnerabilities.
---
 android/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'android')

diff --git a/android/build.py b/android/build.py
index 634d9bffb..c9430b356 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',
-- 
cgit v1.2.3


From 8780e23ed32b7bd90663f62fb6a2b68e00983bcb Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 28 Nov 2014 20:24:53 +0100
Subject: android/build.py: update ffmpeg 2.4.3, curl 7.39

---
 android/build.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'android')

diff --git a/android/build.py b/android/build.py
index c9430b356..67f8bcb3b 100755
--- a/android/build.py
+++ b/android/build.py
@@ -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.4.3.tar.bz2',
+        '8da635baff57d7ab704b1daca5a99b47',
         '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',
-- 
cgit v1.2.3


From 4acbf7b90d9fbca42328f682cdb8ac8cacc13759 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 8 Dec 2014 15:05:49 +0100
Subject: android/build.py: update FFmpeg to 2.5

---
 android/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'android')

diff --git a/android/build.py b/android/build.py
index 67f8bcb3b..8455dd6a9 100755
--- a/android/build.py
+++ b/android/build.py
@@ -341,8 +341,8 @@ thirdparty_libs = [
     ),
 
     FfmpegProject(
-        'http://ffmpeg.org/releases/ffmpeg-2.4.3.tar.bz2',
-        '8da635baff57d7ab704b1daca5a99b47',
+        'http://ffmpeg.org/releases/ffmpeg-2.5.tar.bz2',
+        '4346fe710cc6bdd981f6534d2420d1ab',
         'lib/libavcodec.a',
         [
             '--disable-shared', '--enable-static',
-- 
cgit v1.2.3


From c46f48abec9b55f322070bb3c6e625abb3308dc9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 8 Dec 2014 15:12:41 +0100
Subject: release v0.19.6

---
 android/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'android')

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"/>
 
-- 
cgit v1.2.3