From f0740c40d1d26e38bfc8dc6345cfc51e398ff821 Mon Sep 17 00:00:00 2001
From: Mathieu Virbel <mat@kivy.org>
Date: Wed, 12 Nov 2014 21:17:31 +0100
Subject: [PATCH] Fixes for #297

---
 distribute.sh                 | 8 ++++++--
 recipes/audiostream/recipe.sh | 4 ++--
 recipes/cymunk/recipe.sh      | 2 +-
 recipes/ffmpeg/recipe.sh      | 4 ++--
 recipes/kivy/recipe.sh        | 2 +-
 recipes/plyer/recipe.sh       | 2 +-
 recipes/pyjnius/recipe.sh     | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/distribute.sh b/distribute.sh
index bddff2c2cb..99f8e2d942 100755
--- a/distribute.sh
+++ b/distribute.sh
@@ -552,6 +552,10 @@ function run_get_packages() {
 			try mkdir -p $BUILD_PATH/$module
 		fi
 
+		if [ ! -d "$PACKAGES_PATH/$module" ]; then
+			try mkdir -p "$PACKAGES_PATH/$module"
+		fi
+
 		if [ "X$url" == "X" ]; then
 			debug "No package for $module"
 			continue
@@ -561,7 +565,7 @@ function run_get_packages() {
 		marker_filename=".mark-$filename"
 		do_download=1
 
-		cd $PACKAGES_PATH
+		cd "$PACKAGES_PATH/$module"
 
 		# check if the file is already present
 		if [ -f $filename ]; then
@@ -631,7 +635,7 @@ function run_get_packages() {
 		fi
 
 		# decompress
-		pfilename=$PACKAGES_PATH/$filename
+		pfilename=$PACKAGES_PATH/$module/$filename
 		info "Extract $pfilename"
 		case $pfilename in
 			*.tar.gz|*.tgz )
diff --git a/recipes/audiostream/recipe.sh b/recipes/audiostream/recipe.sh
index 31601da643..15cd9019a4 100644
--- a/recipes/audiostream/recipe.sh
+++ b/recipes/audiostream/recipe.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 VERSION_audiostream=${VERSION_audiostream:-master}
-URL_audiostream=https://github.com/kivy/audiostream/zipball/$VERSION_audiostream/audiostream.zip
+URL_audiostream=https://github.com/kivy/audiostream/archive/$VERSION_audiostream.zip
 DEPS_audiostream=(python sdl pyjnius)
 MD5_audiostream=
-BUILD_audiostream=$BUILD_PATH/audiostream/audiostream
+BUILD_audiostream=$BUILD_PATH/audiostream/$(get_directory $URL_audiostream)
 RECIPE_audiostream=$RECIPES_PATH/audiostream
 
 function prebuild_audiostream() {
diff --git a/recipes/cymunk/recipe.sh b/recipes/cymunk/recipe.sh
index 2254d16df7..e8940ce6fc 100644
--- a/recipes/cymunk/recipe.sh
+++ b/recipes/cymunk/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_cymunk=${VERSION_cymunk:-master}
-URL_cymunk=http://github.com/tito/cymunk/zipball/$VERSION_cymunk/cymunk.zip
+URL_cymunk=http://github.com/tito/cymunk/archive/$VERSION_cymunk.zip
 DEPS_cymunk=(python)
 MD5_cymunk=
 BUILD_cymunk=$BUILD_PATH/cymunk/$(get_directory $URL_cymunk)
diff --git a/recipes/ffmpeg/recipe.sh b/recipes/ffmpeg/recipe.sh
index 4278274033..7df248c35a 100644
--- a/recipes/ffmpeg/recipe.sh
+++ b/recipes/ffmpeg/recipe.sh
@@ -3,10 +3,10 @@
 # Only h264+aac build are working.
 
 VERSION_ffmpeg=${VERSION_ffmpeg:-master}
-URL_ffmpeg=https://github.com/tito/ffmpeg-android/zipball/$VERSION_ffmpeg/ffmpeg-android.zip
+URL_ffmpeg=https://github.com/tito/ffmpeg-android/archive/$VERSION_ffmpeg.zip
 DEPS_ffmpeg=(python sdl)
 MD5_ffmpeg=
-BUILD_ffmpeg=$BUILD_PATH/ffmpeg/ffmpeg-android
+BUILD_ffmpeg=$BUILD_PATH/ffmpeg/$(get_directory $URL_ffmpeg)
 RECIPE_ffmpeg=$RECIPES_PATH/ffmpeg
 
 function prebuild_ffmpeg() {
diff --git a/recipes/kivy/recipe.sh b/recipes/kivy/recipe.sh
index 5d8b3638c3..0272e026c4 100644
--- a/recipes/kivy/recipe.sh
+++ b/recipes/kivy/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_kivy=${VERSION_kivy:-stable}
-URL_kivy=https://github.com/kivy/kivy/zipball/$VERSION_kivy/kivy-$VERSION_kivy.zip
+URL_kivy=https://github.com/kivy/kivy/archive/$VERSION_kivy.zip
 DEPS_kivy=(pygame pyjnius android)
 MD5_kivy=
 BUILD_kivy=$BUILD_PATH/kivy/$(get_directory $URL_kivy)
diff --git a/recipes/plyer/recipe.sh b/recipes/plyer/recipe.sh
index 5d47356cb7..09f49ead89 100644
--- a/recipes/plyer/recipe.sh
+++ b/recipes/plyer/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_plyer=${VERSION_plyer:-master}
-URL_plyer=https://github.com/kivy/plyer/zipball/$VERSION_plyer/plyer-$VERSION_plyer.zip
+URL_plyer=https://github.com/kivy/plyer/archive/$VERSION_plyer.zip
 DEPS_plyer=(pyjnius android)
 MD5_plyer=
 BUILD_plyer=$BUILD_PATH/plyer/$(get_directory $URL_plyer)
diff --git a/recipes/pyjnius/recipe.sh b/recipes/pyjnius/recipe.sh
index b64fa0cbfe..7616ffc155 100755
--- a/recipes/pyjnius/recipe.sh
+++ b/recipes/pyjnius/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION_pyjnius=${VERSION_pyjnius:-master}
-URL_pyjnius=https://github.com/kivy/pyjnius/zipball/$VERSION_pyjnius/pyjnius-$VERSION_pyjnius.zip
+URL_pyjnius=https://github.com/kivy/pyjnius/archive/$VERSION_pyjnius.zip
 DEPS_pyjnius=(python sdl)
 MD5_pyjnius=
 BUILD_pyjnius=$BUILD_PATH/pyjnius/$(get_directory $URL_pyjnius)