From b394bb3ae13f874c8e7ab01c3668ee732eb8f146 Mon Sep 17 00:00:00 2001 From: Julian Santander Date: Sun, 5 Jul 2015 20:23:48 +0200 Subject: [PATCH 01/26] Use metadata to select a fitting method for the presplash screen --- src/src/org/renpy/android/SDLSurfaceView.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java index 853b0ba077..6f14964ec6 100644 --- a/src/src/org/renpy/android/SDLSurfaceView.java +++ b/src/src/org/renpy/android/SDLSurfaceView.java @@ -812,8 +812,36 @@ private void waitForStart() { GLES20.glViewport(0, 0, mWidth, mHeight); if (bitmap != null) { - float mx = ((float)mWidth / bitmap.getWidth()) / 2.0f; - float my = ((float)mHeight / bitmap.getHeight()) / 2.0f; + String fit = (String) ai.metaData.get("presplash-fit"); + + Log.i("python","presplash-fit is "+fit); + + int bitmapWidth = bitmap.getWidth(); + int bitmapHeight = bitmap.getHeight(); + + float mx; + float my; + + if (fit != null && fit.equals("fit")) { + float bitmapMultiplier = (float) Math.sqrt(2f * mWidth * mHeight / bitmapWidth / bitmapHeight); + mx = (float) mWidth / bitmapWidth / bitmapMultiplier; + my = (float) mHeight / bitmapHeight / bitmapMultiplier; + } else if (fit != null && fit.equals("width")) { + float bitmapMultiplier = ((float) mWidth) / bitmapWidth; + mx = (float) mWidth / bitmapWidth / 2.0f /bitmapMultiplier; + my = (float) mHeight / bitmapHeight / 2.0f /bitmapMultiplier; + } else if (fit != null && fit.equals("height")) { + float bitmapMultiplier = ((float) mHeight) / bitmapHeight; + mx = (float) mWidth / bitmapWidth / 2.0f / bitmapMultiplier; + my = (float) mHeight / bitmapHeight / 2.0f / bitmapMultiplier; + } else { + // default + mx = ((float) mWidth / bitmapWidth) / 2.0f; + my = ((float) mHeight / bitmapWidth) / 2.0f; + } + + Log.i("python", String.format("presplash (fit=%s) mx=%f,my=%f", fit,mx, my)); + Matrix.orthoM(mProjMatrix, 0, -mx, mx, my, -my, 0, 10); int value = bitmap.getPixel(0, 0); Color color = new Color(); From 839930d6b45504f9c2402fc5fe8c1171014ccb66 Mon Sep 17 00:00:00 2001 From: Volker Schroer Date: Fri, 10 Jul 2015 07:43:20 +0200 Subject: [PATCH 02/26] Fixing wrong use of ar when building numpy --- recipes/numpy/patches/ar.patch | 11 +++++++++ recipes/numpy/patches/lib.patch | 44 +++++++++++++++++++++++++++++++++ recipes/numpy/recipe.sh | 4 ++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 recipes/numpy/patches/ar.patch create mode 100644 recipes/numpy/patches/lib.patch diff --git a/recipes/numpy/patches/ar.patch b/recipes/numpy/patches/ar.patch new file mode 100644 index 0000000000..3ce68831d5 --- /dev/null +++ b/recipes/numpy/patches/ar.patch @@ -0,0 +1,11 @@ +--- numpy/distutils/unixccompiler.orig.py 2015-02-01 17:38:21.000000000 +0100 ++++ numpy/distutils/unixccompiler.py 2015-07-08 17:21:05.742468485 +0200 +@@ -82,6 +82,8 @@ + pass + self.mkpath(os.path.dirname(output_filename)) + tmp_objects = objects + self.objects ++ self.archiver[0]="$AR" ++ print("#####Archiver: " + ', '.join(self.archiver) ) + while tmp_objects: + objects = tmp_objects[:50] + tmp_objects = tmp_objects[50:] diff --git a/recipes/numpy/patches/lib.patch b/recipes/numpy/patches/lib.patch new file mode 100644 index 0000000000..138063bf98 --- /dev/null +++ b/recipes/numpy/patches/lib.patch @@ -0,0 +1,44 @@ +--- numpy/linalg/setup.orig.py 2015-07-09 14:15:59.850853336 +0200 ++++ numpy/linalg/setup.py 2015-07-09 14:21:59.403889000 +0200 +@@ -37,7 +37,8 @@ + config.add_extension('lapack_lite', + sources = [get_lapack_lite_sources], + depends = ['lapack_litemodule.c'] + lapack_lite_src, +- extra_info = lapack_info ++ extra_info = lapack_info, ++ libraries = ['m'], + ) + + # umath_linalg module +@@ -46,7 +47,7 @@ + sources = [get_lapack_lite_sources], + depends = ['umath_linalg.c.src'] + lapack_lite_src, + extra_info = lapack_info, +- libraries = ['npymath'], ++ libraries = ['npymath','m'], + ) + + return config +--- numpy/fft/setup.orig.py 2015-07-09 14:35:22.299888028 +0200 ++++ numpy/fft/setup.py 2015-07-09 14:33:54.858392578 +0200 +@@ -9,7 +9,8 @@ + + # Configure fftpack_lite + config.add_extension('fftpack_lite', +- sources=['fftpack_litemodule.c', 'fftpack.c'] ++ sources=['fftpack_litemodule.c', 'fftpack.c'], ++ libraries = ['m'] + ) + + +--- numpy/random/setup.orig.py 2015-07-09 14:44:41.105174826 +0200 ++++ numpy/random/setup.py 2015-07-09 14:46:08.592679877 +0200 +@@ -38,7 +38,7 @@ + if needs_mingw_ftime_workaround(): + defs.append(("NPY_NEEDS_MINGW_TIME_WORKAROUND", None)) + +- libs = [] ++ libs = ['m'] + # Configure mtrand + config.add_extension('mtrand', + sources=[join('mtrand', x) for x in diff --git a/recipes/numpy/recipe.sh b/recipes/numpy/recipe.sh index 98ab200d79..beef3ba62e 100644 --- a/recipes/numpy/recipe.sh +++ b/recipes/numpy/recipe.sh @@ -15,6 +15,8 @@ function prebuild_numpy() { fi try patch -p1 < $RECIPE_numpy/patches/fix-numpy.patch + try patch -p0 < $RECIPE_numpy/patches/ar.patch + try patch -p0 < $RECIPE_numpy/patches/lib.patch touch .patched } @@ -29,9 +31,9 @@ function build_numpy() { cd $BUILD_numpy push_arm - try $HOSTPYTHON setup.py build_ext -v try find build/lib.* -name "*.o" -exec $STRIP {} \; + env try $HOSTPYTHON setup.py install -O2 pop_arm From 03e65cc306a2766a06ec4c932a57e3344c0c0cfe Mon Sep 17 00:00:00 2001 From: Jitendra Nair Date: Sat, 11 Jul 2015 23:33:45 +0530 Subject: [PATCH 03/26] Update recipe.sh Remove stray URL from bash script. --- recipes/greenlet/recipe.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/greenlet/recipe.sh b/recipes/greenlet/recipe.sh index 2e5059a82c..4f1cc40381 100644 --- a/recipes/greenlet/recipe.sh +++ b/recipes/greenlet/recipe.sh @@ -2,7 +2,6 @@ VERSION_greenlet=${VERSION_greenlet:-0.4.1} URL_greenlet=https://pypi.python.org/packages/source/g/greenlet/greenlet-$VERSION_greenlet.zip -https://github.com/downloads/greenlet/greenlet/greenlet-$VERSION_greenlet.tar.gz DEPS_greenlet=(python) MD5_greenlet=c2deda75bdda59c38cae12a77cc53adc BUILD_greenlet=$BUILD_PATH/greenlet/$(get_directory $URL_greenlet) From 3c77b92ace43428ca3024decd90d541f297d1fab Mon Sep 17 00:00:00 2001 From: Volker Schroer Date: Thu, 16 Jul 2015 17:54:41 +0200 Subject: [PATCH 04/26] Final numpy patch --- recipes/numpy/patches/ar.patch | 8 ++++---- recipes/numpy/patches/lib.patch | 12 ++++++------ recipes/numpy/patches/prevent_libs_check.patch | 12 ++++++++++++ recipes/numpy/recipe.sh | 5 +++-- 4 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 recipes/numpy/patches/prevent_libs_check.patch diff --git a/recipes/numpy/patches/ar.patch b/recipes/numpy/patches/ar.patch index 3ce68831d5..c579d5e91a 100644 --- a/recipes/numpy/patches/ar.patch +++ b/recipes/numpy/patches/ar.patch @@ -1,11 +1,11 @@ ---- numpy/distutils/unixccompiler.orig.py 2015-02-01 17:38:21.000000000 +0100 -+++ numpy/distutils/unixccompiler.py 2015-07-08 17:21:05.742468485 +0200 +--- a/numpy/distutils/unixccompiler.py 2015-02-01 17:38:21.000000000 +0100 ++++ b/numpy/distutils/unixccompiler.py 2015-07-08 17:21:05.742468485 +0200 @@ -82,6 +82,8 @@ pass self.mkpath(os.path.dirname(output_filename)) tmp_objects = objects + self.objects -+ self.archiver[0]="$AR" -+ print("#####Archiver: " + ', '.join(self.archiver) ) ++ from os import environ ++ self.archiver[0] = 'arm-linux-androideabi-ar' while tmp_objects: objects = tmp_objects[:50] tmp_objects = tmp_objects[50:] diff --git a/recipes/numpy/patches/lib.patch b/recipes/numpy/patches/lib.patch index 138063bf98..3087eb451d 100644 --- a/recipes/numpy/patches/lib.patch +++ b/recipes/numpy/patches/lib.patch @@ -1,5 +1,5 @@ ---- numpy/linalg/setup.orig.py 2015-07-09 14:15:59.850853336 +0200 -+++ numpy/linalg/setup.py 2015-07-09 14:21:59.403889000 +0200 +--- a/numpy/linalg/setup.py 2015-07-09 14:15:59.850853336 +0200 ++++ b/numpy/linalg/setup.py 2015-07-09 14:21:59.403889000 +0200 @@ -37,7 +37,8 @@ config.add_extension('lapack_lite', sources = [get_lapack_lite_sources], @@ -19,8 +19,8 @@ ) return config ---- numpy/fft/setup.orig.py 2015-07-09 14:35:22.299888028 +0200 -+++ numpy/fft/setup.py 2015-07-09 14:33:54.858392578 +0200 +--- a/numpy/fft/setup.py 2015-07-09 14:35:22.299888028 +0200 ++++ b/numpy/fft/setup.py 2015-07-09 14:33:54.858392578 +0200 @@ -9,7 +9,8 @@ # Configure fftpack_lite @@ -31,8 +31,8 @@ ) ---- numpy/random/setup.orig.py 2015-07-09 14:44:41.105174826 +0200 -+++ numpy/random/setup.py 2015-07-09 14:46:08.592679877 +0200 +--- a/numpy/random/setup.orig.py 2015-07-09 14:44:41.105174826 +0200 ++++ b/numpy/random/setup.py 2015-07-09 14:46:08.592679877 +0200 @@ -38,7 +38,7 @@ if needs_mingw_ftime_workaround(): defs.append(("NPY_NEEDS_MINGW_TIME_WORKAROUND", None)) diff --git a/recipes/numpy/patches/prevent_libs_check.patch b/recipes/numpy/patches/prevent_libs_check.patch new file mode 100644 index 0000000000..73f2a9275c --- /dev/null +++ b/recipes/numpy/patches/prevent_libs_check.patch @@ -0,0 +1,12 @@ +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index a050430..471e958 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -610,6 +610,7 @@ class system_info: + return self.get_paths(self.section, key) + + def get_libs(self, key, default): ++ return [] + try: + libs = self.cp.get(self.section, key) + except NoOptionError: diff --git a/recipes/numpy/recipe.sh b/recipes/numpy/recipe.sh index beef3ba62e..c2e9c67a8d 100644 --- a/recipes/numpy/recipe.sh +++ b/recipes/numpy/recipe.sh @@ -15,8 +15,9 @@ function prebuild_numpy() { fi try patch -p1 < $RECIPE_numpy/patches/fix-numpy.patch - try patch -p0 < $RECIPE_numpy/patches/ar.patch - try patch -p0 < $RECIPE_numpy/patches/lib.patch + try patch -p1 < $RECIPE_numpy/patches/ar.patch + try patch -p1 < $RECIPE_numpy/patches/lib.patch + try patch -p1 < $RECIPE_numpy/patches/prevent_libs_check.patch touch .patched } From 9f3596e8c282b45f56d2705f2fc732f12cff4f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Tue, 18 Aug 2015 11:58:08 +0200 Subject: [PATCH 05/26] Updated pylibpd thread fix patch. --- recipes/pylibpd/patches/threadfix.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/pylibpd/patches/threadfix.patch b/recipes/pylibpd/patches/threadfix.patch index f299d01c7f..6d27bda282 100644 --- a/recipes/pylibpd/patches/threadfix.patch +++ b/recipes/pylibpd/patches/threadfix.patch @@ -1,10 +1,10 @@ ---- python/setup-threadfix.py 2013-05-29 13:10:16.000000000 -0400 -+++ python/setup.py 2013-06-07 11:53:34.447298388 -0400 -@@ -22,7 +22,6 @@ +--- python/setup.py 2015-08-18 11:15:35.546257493 +0200 ++++ python/setup-threadfix.py 2015-08-18 11:32:16.784394028 +0200 +@@ -24,7 +24,6 @@ libraries = [ 'm', 'dl', -- 'pthread', +- 'pthread' ], - sources=[ + sources = [ 'pylibpd.i', From 753b7aa706456f8a879b15da48baf3424f2e70d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Wed, 19 Aug 2015 12:01:09 +0200 Subject: [PATCH 06/26] Updated pylibpd recipe. --- recipes/pylibpd/recipe.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/recipes/pylibpd/recipe.sh b/recipes/pylibpd/recipe.sh index 0e88d19981..4a6d7d5a1d 100644 --- a/recipes/pylibpd/recipe.sh +++ b/recipes/pylibpd/recipe.sh @@ -6,8 +6,12 @@ URL_pylibpd=https://github.com/libpd/libpd/archive/$VERSION_pylibpd.zip MD5_pylibpd= BUILD_pylibpd=$BUILD_PATH/pylibpd/$(get_directory $URL_pylibpd) RECIPE_pylibpd=$RECIPES_PATH/pylibpd +GIT_pylibpd=https://github.com/libpd/libpd function prebuild_pylibpd() { + # Clone recursively libpd repository + rm -rf $BUILD_pylibpd + git clone --recursive $GIT_pylibpd $BUILD_pylibpd # Apply thread removal patch cd $BUILD_pylibpd/python if [ -f .patched ]; then @@ -15,6 +19,13 @@ function prebuild_pylibpd() { fi try patch -p1 < $RECIPE_pylibpd/patches/threadfix.patch touch .patched + # Apply Makefile patch + cd $BUILD_pylibpd + if [ -f .patched ]; then + return + fi + try patch < $RECIPE_pylibpd/patches/makefilefix.patch + touch .patched } function shouldbuild_pylibpd() { @@ -24,8 +35,10 @@ function shouldbuild_pylibpd() { } function build_pylibpd() { - cd $BUILD_pylibpd/python push_arm + cd $BUILD_pylibpd + try make + cd python try $HOSTPYTHON setup.py build try $HOSTPYTHON setup.py install -O2 try $HOSTPYTHON setup.py clean From 29f5fcbe982d4abb9ebf743d85e5451ed1d5bb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Wed, 19 Aug 2015 12:03:46 +0200 Subject: [PATCH 07/26] Added libpd Makefile patch. --- recipes/pylibpd/patches/makefilefix.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes/pylibpd/patches/makefilefix.patch diff --git a/recipes/pylibpd/patches/makefilefix.patch b/recipes/pylibpd/patches/makefilefix.patch new file mode 100644 index 0000000000..64ad4420dc --- /dev/null +++ b/recipes/pylibpd/patches/makefilefix.patch @@ -0,0 +1,11 @@ +--- Makefile 2015-08-19 10:42:49.160410592 +0200 ++++ Makefile-threadfix 2015-08-19 11:08:49.458350964 +0200 +@@ -150,7 +150,7 @@ + libpd: $(LIBPD) + + $(LIBPD): ${PD_FILES:.c=.o} ${UTIL_FILES:.c=.o} ${EXTRA_FILES:.c=.o} +- $(CC) -o $(LIBPD) $^ $(LDFLAGS) -lm -lpthread ++ $(CC) -o $(LIBPD) $^ $(LDFLAGS) -lm + + javalib: $(JNIH_FILE) $(PDJAVA_JAR) + From f8c89a1acdd1de9a7d595377158e473b0c3db492 Mon Sep 17 00:00:00 2001 From: Liu Chao Date: Fri, 25 Sep 2015 14:00:34 +0800 Subject: [PATCH 08/26] add flask and flask depend packages. the `setup.py` file can not be used directly in these packages, In `from setuptools import setup`, there will be error when package building , this code need change into `from distutils.core import setup` can solve errors.. --- recipes/click/recipe.sh | 31 +++++++++++++++++++++++++++++++ recipes/flask/recipe.sh | 31 +++++++++++++++++++++++++++++++ recipes/itsdangerous/recipe.sh | 31 +++++++++++++++++++++++++++++++ recipes/jinja2/recipe.sh | 31 +++++++++++++++++++++++++++++++ recipes/libev/recipe.sh | 30 ++++++++++++++++++++++++++++++ recipes/markupsafe/recipe.sh | 31 +++++++++++++++++++++++++++++++ recipes/werkzeug/recipe.sh | 31 +++++++++++++++++++++++++++++++ 7 files changed, 216 insertions(+) create mode 100644 recipes/click/recipe.sh create mode 100644 recipes/flask/recipe.sh create mode 100644 recipes/itsdangerous/recipe.sh create mode 100644 recipes/jinja2/recipe.sh create mode 100644 recipes/libev/recipe.sh create mode 100644 recipes/markupsafe/recipe.sh create mode 100644 recipes/werkzeug/recipe.sh diff --git a/recipes/click/recipe.sh b/recipes/click/recipe.sh new file mode 100644 index 0000000000..832f06bde3 --- /dev/null +++ b/recipes/click/recipe.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +VERSION_click=${VERSION_click:-master} +DEPS_click=(python) +URL_click=https://github.com/mitsuhiko/click/archive/$VERSION_click.zip +MD5_click= +BUILD_click=$BUILD_PATH/click/$(get_directory $URL_click) +RECIPE_click=$RECIPES_PATH/click + +function prebuild_click() { + true +} + +function shouldbuild_click() { + if [ -d "$SITEPACKAGES_PATH/click" ]; then + DO_BUILD=0 + fi +} + +function build_click() { + cd $BUILD_click + + push_arm + try $HOSTPYTHON setup.py install + pop_arm +} + +function postbuild_click() { + true +} + diff --git a/recipes/flask/recipe.sh b/recipes/flask/recipe.sh new file mode 100644 index 0000000000..36d2664226 --- /dev/null +++ b/recipes/flask/recipe.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +VERSION_flask=${VERSION_flask:-master} +DEPS_flask=(python werkzeug jinja2 itsdangerous click) +URL_flask=https://github.com/mitsuhiko/flask/archive/$VERSION_flask.zip +MD5_flask= +BUILD_flask=$BUILD_PATH/flask/$(get_directory $URL_flask) +RECIPE_flask=$RECIPES_PATH/flask + +function prebuild_flask() { + true +} + +function shouldbuild_flask() { + if [ -d "$SITEPACKAGES_PATH/flask" ]; then + DO_BUILD=0 + fi +} + +function build_flask() { + cd $BUILD_flask + + push_arm + try $HOSTPYTHON setup.py install + pop_arm +} + +function postbuild_flask() { + true +} + diff --git a/recipes/itsdangerous/recipe.sh b/recipes/itsdangerous/recipe.sh new file mode 100644 index 0000000000..8ebe5b8e56 --- /dev/null +++ b/recipes/itsdangerous/recipe.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +VERSION_itsdangerous=${VERSION_itsdangerous:-master} +DEPS_itsdangerous=(python) +URL_itsdangerous=https://github.com/mitsuhiko/itsdangerous/archive/$VERSION_itsdangerous.zip +MD5_itsdangerous= +BUILD_itsdangerous=$BUILD_PATH/itsdangerous/$(get_directory $URL_itsdangerous) +RECIPE_itsdangerous=$RECIPES_PATH/itsdangerous + +function prebuild_itsdangerous() { + true +} + +function shouldbuild_itsdangerous() { + if [ -d "$SITEPACKAGES_PATH/itsdangerous" ]; then + DO_BUILD=0 + fi +} + +function build_itsdangerous() { + cd $BUILD_itsdangerous + + push_arm + try $HOSTPYTHON setup.py install + pop_arm +} + +function postbuild_itsdangerous() { + true +} + diff --git a/recipes/jinja2/recipe.sh b/recipes/jinja2/recipe.sh new file mode 100644 index 0000000000..e523ff2fb5 --- /dev/null +++ b/recipes/jinja2/recipe.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +VERSION_jinja2=${VERSION_jinja2:-master} +DEPS_jinja2=(python markupsafe) +URL_jinja2=https://github.com/mitsuhiko/jinja2/archive/$VERSION_jinja2.zip +MD5_jinja2= +BUILD_jinja2=$BUILD_PATH/jinja2/$(get_directory $URL_jinja2) +RECIPE_jinja2=$RECIPES_PATH/jinja2 + +function prebuild_jinja2() { + true +} + +function shouldbuild_jinja2() { + if [ -d "$SITEPACKAGES_PATH/jinja2" ]; then + DO_BUILD=0 + fi +} + +function build_jinja2() { + cd $BUILD_jinja2 + + push_arm + try $HOSTPYTHON setup.py install + pop_arm +} + +function postbuild_jinja2() { + true +} + diff --git a/recipes/libev/recipe.sh b/recipes/libev/recipe.sh new file mode 100644 index 0000000000..d394c0b140 --- /dev/null +++ b/recipes/libev/recipe.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +URL_libev=http://localhost:8080/packages/libev-4.20.zip +DEPS_libev=(python) +BUILD_libev=$BUILD_PATH/libev/$(get_directory $URL_libev) +RECIPE_libev=$RECIPES_PATH/libev + +function prebuild_libev() { + true +} + +function shouldbuild_libev() { + if [ -f $BUILD_libev/build/lib/libev.la ]; then + DO_BUILD=0 + fi +} + +function build_libev() { + cd $BUILD_libev + + push_arm + try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_libev/build/ + try make install + pop_arm + +} + +function postbuild_libev() { + true +} diff --git a/recipes/markupsafe/recipe.sh b/recipes/markupsafe/recipe.sh new file mode 100644 index 0000000000..f517c42c28 --- /dev/null +++ b/recipes/markupsafe/recipe.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +VERSION_markupsafe=${VERSION_markupsafe:-master} +DEPS_markupsafe=(python) +URL_markupsafe=https://github.com/mitsuhiko/markupsafe/archive/$VERSION_markupsafe.zip +MD5_markupsafe= +BUILD_markupsafe=$BUILD_PATH/markupsafe/$(get_directory $URL_markupsafe) +RECIPE_markupsafe=$RECIPES_PATH/markupsafe + +function prebuild_markupsafe() { + true +} + +function shouldbuild_markupsafe() { + if [ -d "$SITEPACKAGES_PATH/markupsafe" ]; then + DO_BUILD=0 + fi +} + +function build_markupsafe() { + cd $BUILD_markupsafe + + push_arm + try $HOSTPYTHON setup.py install + pop_arm +} + +function postbuild_markupsafe() { + true +} + diff --git a/recipes/werkzeug/recipe.sh b/recipes/werkzeug/recipe.sh new file mode 100644 index 0000000000..876b9176cc --- /dev/null +++ b/recipes/werkzeug/recipe.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +VERSION_werkzeug=${VERSION_werkzeug:-master} +DEPS_werkzeug=(python pyopenssl) +URL_werkzeug=https://github.com/mitsuhiko/werkzeug/archive/$VERSION_werkzeug.zip +MD5_werkzeug= +BUILD_werkzeug=$BUILD_PATH/werkzeug/$(get_directory $URL_werkzeug) +RECIPE_werkzeug=$RECIPES_PATH/werkzeug + +function prebuild_werkzeug() { + true +} + +function shouldbuild_werkzeug() { + if [ -d "$SITEPACKAGES_PATH/werkzeug" ]; then + DO_BUILD=0 + fi +} + +function build_werkzeug() { + cd $BUILD_werkzeug + + push_arm + try $HOSTPYTHON setup.py install + pop_arm +} + +function postbuild_werkzeug() { + true +} + From 220c7b8847851b0e14212ede7a32a60e600bb49b Mon Sep 17 00:00:00 2001 From: Liu Chao Date: Fri, 25 Sep 2015 19:54:31 +0800 Subject: [PATCH 09/26] remove libev --- recipes/libev/recipe.sh | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 recipes/libev/recipe.sh diff --git a/recipes/libev/recipe.sh b/recipes/libev/recipe.sh deleted file mode 100644 index d394c0b140..0000000000 --- a/recipes/libev/recipe.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -URL_libev=http://localhost:8080/packages/libev-4.20.zip -DEPS_libev=(python) -BUILD_libev=$BUILD_PATH/libev/$(get_directory $URL_libev) -RECIPE_libev=$RECIPES_PATH/libev - -function prebuild_libev() { - true -} - -function shouldbuild_libev() { - if [ -f $BUILD_libev/build/lib/libev.la ]; then - DO_BUILD=0 - fi -} - -function build_libev() { - cd $BUILD_libev - - push_arm - try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi --prefix=$BUILD_libev/build/ - try make install - pop_arm - -} - -function postbuild_libev() { - true -} From 7cbfaf5ce7f9d09c8bc98f153db11a23b609195c Mon Sep 17 00:00:00 2001 From: Liu Chao Date: Mon, 28 Sep 2015 09:22:43 +0800 Subject: [PATCH 10/26] add code to replace `setuptools` with ''distutils.core` Before modification, there will be the following error: ``` Leaving ARM environment Call build_click Entering in ARM environment Compiler found at /home/human/.buildozer/android/platform/android-ndk-r9c/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin//arm-linux-androideabi-gcc Traceback (most recent call last): File "setup.py", line 3, in from setuptools import setup File "/home/human/.local/lib/python2.7/site-packages/setuptools/__init__.py", line 12, in from setuptools.extension import Extension File "/home/human/.local/lib/python2.7/site-packages/setuptools/extension.py", line 8, in from .dist import _get_unpatched File "/home/human/.local/lib/python2.7/site-packages/setuptools/dist.py", line 18, in from setuptools import windows_support File "/home/human/.local/lib/python2.7/site-packages/setuptools/windows_support.py", line 2, in import ctypes File "/home/human/Work/browser/.buildozer/android/platform/python-for-android/build/python-install/lib/python2.7/ctypes/__init__.py", line 10, in from _ctypes import Union, Structure, Array ImportError: /home/human/Work/browser/.buildozer/android/platform/python-for-android/build/python-install/lib/python2.7/lib-dynload/_ctypes.so: wrong ELF class: ELFCLASS32 ``` the `setuptools` looks Could not to use, so I changed it to use `distutils.core`. --- recipes/click/recipe.sh | 1 + recipes/flask/recipe.sh | 1 + recipes/jinja2/recipe.sh | 1 + recipes/markupsafe/recipe.sh | 3 ++- recipes/werkzeug/recipe.sh | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/click/recipe.sh b/recipes/click/recipe.sh index 832f06bde3..0f3f8334db 100644 --- a/recipes/click/recipe.sh +++ b/recipes/click/recipe.sh @@ -21,6 +21,7 @@ function build_click() { cd $BUILD_click push_arm + sed -i "s/setuptools/distutils.core/g" `grep -rl "setuptools" ./setup.py` try $HOSTPYTHON setup.py install pop_arm } diff --git a/recipes/flask/recipe.sh b/recipes/flask/recipe.sh index 36d2664226..65b782f8a6 100644 --- a/recipes/flask/recipe.sh +++ b/recipes/flask/recipe.sh @@ -21,6 +21,7 @@ function build_flask() { cd $BUILD_flask push_arm + sed -i "s/setuptools/distutils.core/g" `grep -rl "setuptools" ./setup.py` try $HOSTPYTHON setup.py install pop_arm } diff --git a/recipes/jinja2/recipe.sh b/recipes/jinja2/recipe.sh index e523ff2fb5..0c4ca90a6a 100644 --- a/recipes/jinja2/recipe.sh +++ b/recipes/jinja2/recipe.sh @@ -21,6 +21,7 @@ function build_jinja2() { cd $BUILD_jinja2 push_arm + sed -i "s/setuptools/distutils.core/g" `grep -rl "setuptools" ./setup.py` try $HOSTPYTHON setup.py install pop_arm } diff --git a/recipes/markupsafe/recipe.sh b/recipes/markupsafe/recipe.sh index f517c42c28..d3cefa0e8f 100644 --- a/recipes/markupsafe/recipe.sh +++ b/recipes/markupsafe/recipe.sh @@ -20,7 +20,8 @@ function shouldbuild_markupsafe() { function build_markupsafe() { cd $BUILD_markupsafe - push_arm + push_arm + sed -i "s/setuptools/distutils.core/g" `grep -rl "setuptools" ./setup.py` try $HOSTPYTHON setup.py install pop_arm } diff --git a/recipes/werkzeug/recipe.sh b/recipes/werkzeug/recipe.sh index 876b9176cc..88730baf71 100644 --- a/recipes/werkzeug/recipe.sh +++ b/recipes/werkzeug/recipe.sh @@ -21,6 +21,7 @@ function build_werkzeug() { cd $BUILD_werkzeug push_arm + sed -i "s/setuptools/distutils.core/g" `grep -rl "setuptools" ./setup.py` try $HOSTPYTHON setup.py install pop_arm } From 70593e367715a6a6fb7b95905c6ccf5e69d6c286 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Fri, 9 Oct 2015 16:21:21 +0200 Subject: [PATCH 11/26] add filter for handling out of sync video/audio --- recipes/ffmpeg2/recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ffmpeg2/recipe.sh b/recipes/ffmpeg2/recipe.sh index 6726e8c111..a3b5c82fcb 100644 --- a/recipes/ffmpeg2/recipe.sh +++ b/recipes/ffmpeg2/recipe.sh @@ -45,7 +45,7 @@ function build_ffmpeg2() { FLAGS="--disable-everything" FLAGS="$FLAGS --enable-parser=h264,aac" FLAGS="$FLAGS --enable-decoder=h263,h264,aac" - FLAGS="$FLAGS --enable-filter=aresample,resample,crop" + FLAGS="$FLAGS --enable-filter=aresample,resample,crop,adelay" FLAGS="$FLAGS --enable-protocol=file,http,https,tls_openssl" FLAGS="$FLAGS --enable-demuxer=sdp --enable-pic" FLAGS="$FLAGS --enable-small" From 5ef91c60396f0671463dabf9ea48046924a621cf Mon Sep 17 00:00:00 2001 From: Liu Chao Date: Sat, 10 Oct 2015 14:22:44 +0800 Subject: [PATCH 12/26] change openssl version the version 1.0.2d has complie error, so, I switched to the 1.0.1p version. --- recipes/openssl/recipe.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh index 0aeb5e7455..d89264966d 100644 --- a/recipes/openssl/recipe.sh +++ b/recipes/openssl/recipe.sh @@ -1,9 +1,9 @@ #!/bin/bash -VERSION_openssl=${VERSION_openssl:-1.0.2d} +VERSION_openssl=${VERSION_openssl:-1.0.1p} URL_openssl=https://www.openssl.org/source/openssl-$VERSION_openssl.tar.gz DEPS_openssl=() -MD5_openssl=38dd619b2e77cbac69b99f52a053d25a +MD5_openssl=7563e92327199e0067ccd0f79f436976 BUILD_openssl=$BUILD_PATH/openssl/$(get_directory $URL_openssl) RECIPE_openssl=$RECIPES_PATH/openssl From 97c50d9d2375f197d09eec08b19af84348d85903 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Sun, 11 Oct 2015 16:53:39 +0200 Subject: [PATCH 13/26] android/activity: dont reimplement hashCode and equals, to prevent facing OverflowError again. Ref kivy/pyjnius#146 --- recipes/android/src/android/activity.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/recipes/android/src/android/activity.py b/recipes/android/src/android/activity.py index 94f02eb3bf..eaf7b07bdd 100644 --- a/recipes/android/src/android/activity.py +++ b/recipes/android/src/android/activity.py @@ -18,14 +18,6 @@ def __init__(self, callback, **kwargs): def onNewIntent(self, intent): self.callback(intent) - @java_method('(Ljava/lang/Object;)Z') - def equals(self, obj): - return obj.hashCode() == self.hashCode() - - @java_method('()I') - def hashCode(self): - return id(self) - class ActivityResultListener(PythonJavaClass): __javainterfaces__ = ['org/renpy/android/PythonActivity$ActivityResultListener'] @@ -39,14 +31,6 @@ def __init__(self, callback): def onActivityResult(self, requestCode, resultCode, intent): self.callback(requestCode, resultCode, intent) - @java_method('(Ljava/lang/Object;)Z') - def equals(self, obj): - return obj.hashCode() == self.hashCode() - - @java_method('()I') - def hashCode(self): - return id(self) - def bind(**kwargs): for event, callback in kwargs.items(): From bb8566707d47c9ef0ec234863a25d23d4261ec7d Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Wed, 4 Nov 2015 23:55:23 +0000 Subject: [PATCH 14/26] Added six as pyjnius dependency --- recipes/pyjnius/recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyjnius/recipe.sh b/recipes/pyjnius/recipe.sh index 7616ffc155..49018241f8 100755 --- a/recipes/pyjnius/recipe.sh +++ b/recipes/pyjnius/recipe.sh @@ -2,7 +2,7 @@ VERSION_pyjnius=${VERSION_pyjnius:-master} URL_pyjnius=https://github.com/kivy/pyjnius/archive/$VERSION_pyjnius.zip -DEPS_pyjnius=(python sdl) +DEPS_pyjnius=(python sdl six) MD5_pyjnius= BUILD_pyjnius=$BUILD_PATH/pyjnius/$(get_directory $URL_pyjnius) RECIPE_pyjnius=$RECIPES_PATH/pyjnius From 3b2397dcc8766b47f824602a69a796b8b1575e6c Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Sun, 8 Nov 2015 12:49:55 +0000 Subject: [PATCH 15/26] Added note about API stability --- src/src/org/renpy/android/SDLSurfaceView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java index 6f14964ec6..2514289c7b 100644 --- a/src/src/org/renpy/android/SDLSurfaceView.java +++ b/src/src/org/renpy/android/SDLSurfaceView.java @@ -815,6 +815,7 @@ private void waitForStart() { String fit = (String) ai.metaData.get("presplash-fit"); Log.i("python","presplash-fit is "+fit); + // WARNING: The presplash-fit api is unstable and may be changed int bitmapWidth = bitmap.getWidth(); int bitmapHeight = bitmap.getHeight(); From 67633d0735de1c6ab744e5dfa84aacd00723a397 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Tue, 10 Nov 2015 12:07:56 +0100 Subject: [PATCH 16/26] ffmpeg2: add volume filter --- recipes/ffmpeg2/recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ffmpeg2/recipe.sh b/recipes/ffmpeg2/recipe.sh index a3b5c82fcb..314f7e23cc 100644 --- a/recipes/ffmpeg2/recipe.sh +++ b/recipes/ffmpeg2/recipe.sh @@ -45,7 +45,7 @@ function build_ffmpeg2() { FLAGS="--disable-everything" FLAGS="$FLAGS --enable-parser=h264,aac" FLAGS="$FLAGS --enable-decoder=h263,h264,aac" - FLAGS="$FLAGS --enable-filter=aresample,resample,crop,adelay" + FLAGS="$FLAGS --enable-filter=aresample,resample,crop,adelay,volume" FLAGS="$FLAGS --enable-protocol=file,http,https,tls_openssl" FLAGS="$FLAGS --enable-demuxer=sdp --enable-pic" FLAGS="$FLAGS --enable-small" From 73fffaed3c5f0c3f4faeb6cbd303cf8d308cc901 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Tue, 10 Nov 2015 14:48:32 +0100 Subject: [PATCH 17/26] temporary fork to allow volume in ffpyplayer --- recipes/ffpyplayer_tito/recipe.sh | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 recipes/ffpyplayer_tito/recipe.sh diff --git a/recipes/ffpyplayer_tito/recipe.sh b/recipes/ffpyplayer_tito/recipe.sh new file mode 100644 index 0000000000..0cd2adb480 --- /dev/null +++ b/recipes/ffpyplayer_tito/recipe.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +VERSION_ffpyplayer_tito=${VERSION_ffpyplayer_tito:-master} +URL_ffpyplayer_tito=http://github.com/tito/ffpyplayer/archive/$VERSION_ffpyplayer_tito.zip +DEPS_ffpyplayer_tito=(python ffmpeg2) +MD5_ffpyplayer_tito= +BUILD_ffpyplayer_tito=$BUILD_PATH/ffpyplayer/$(get_directory $URL_ffpyplayer_tito) +RECIPE_ffpyplayer_tito=$RECIPES_PATH/ffpyplayer + +function prebuild_ffpyplayer_tito() { + true +} + +function shouldbuild_ffpyplayer_tito() { + if [ -d "$SITEPACKAGES_PATH/ffpyplayer" ]; then + DO_BUILD=0 + fi +} + +function build_ffpyplayer_tito() { + cd $BUILD_ffpyplayer_tito + + push_arm + + export FFMPEG_INCLUDE_DIR="$BUILD_ffmpeg2/build/ffmpeg/armeabi-v7a/include" + export FFMPEG_LIB_DIR="$BUILD_ffmpeg2/build/ffmpeg/armeabi-v7a/lib" + export SDL_INCLUDE_DIR="$SRC_PATH/jni/sdl/include" + export LDFLAGS="-L$LIBS_PATH" + + $HOSTPYTHON setup.py build_ext -v + try find . -iname '*.pyx' -exec $CYTHON {} \; + try $HOSTPYTHON setup.py build_ext -v + export PYTHONPATH=$BUILD_hostpython/Lib/site-packages + try $BUILD_hostpython/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages + + pop_arm +} + +function postbuild_ffpyplayer_tito() { + true +} From ba8f2698c5967e9fabcad307008c1eb44ae0b9a5 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Tue, 10 Nov 2015 15:12:36 +0100 Subject: [PATCH 18/26] fix ffpyplayer_tito recipe --- recipes/ffpyplayer_tito/recipe.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ffpyplayer_tito/recipe.sh b/recipes/ffpyplayer_tito/recipe.sh index 0cd2adb480..287b00925e 100644 --- a/recipes/ffpyplayer_tito/recipe.sh +++ b/recipes/ffpyplayer_tito/recipe.sh @@ -4,8 +4,8 @@ VERSION_ffpyplayer_tito=${VERSION_ffpyplayer_tito:-master} URL_ffpyplayer_tito=http://github.com/tito/ffpyplayer/archive/$VERSION_ffpyplayer_tito.zip DEPS_ffpyplayer_tito=(python ffmpeg2) MD5_ffpyplayer_tito= -BUILD_ffpyplayer_tito=$BUILD_PATH/ffpyplayer/$(get_directory $URL_ffpyplayer_tito) -RECIPE_ffpyplayer_tito=$RECIPES_PATH/ffpyplayer +BUILD_ffpyplayer_tito=$BUILD_PATH/ffpyplayer_tito/$(get_directory $URL_ffpyplayer_tito) +RECIPE_ffpyplayer_tito=$RECIPES_PATH/ffpyplayer_tito function prebuild_ffpyplayer_tito() { true From 3f8ca40b81a36960d95f8e1846179cd686fa91d7 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Thu, 10 Dec 2015 01:22:49 +0100 Subject: [PATCH 19/26] biglink: ensure that no empty argument will be used --- src/tools/biglink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/biglink b/src/tools/biglink index 1f82d18b48..6b86dbf841 100755 --- a/src/tools/biglink +++ b/src/tools/biglink @@ -38,7 +38,7 @@ while args: continue if a not in unique_args: unique_args.insert(0, a) - +unique_args = [x for x in unique_args if x] print('Biglink create %s library' % sys.argv[1]) print('Biglink arguments:') From 11db161e2e12da90173611c7aae9ea4aeddd671b Mon Sep 17 00:00:00 2001 From: Akshay Arora Date: Mon, 11 Jan 2016 05:12:28 +0530 Subject: [PATCH 20/26] closes #544 --- src/src/org/renpy/android/SDLSurfaceView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java index 2514289c7b..45ab161420 100644 --- a/src/src/org/renpy/android/SDLSurfaceView.java +++ b/src/src/org/renpy/android/SDLSurfaceView.java @@ -1210,6 +1210,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) { public void onGlobalLayout() { Rect rctx = new Rect(); activityRootView.getWindowVisibleDisplayFrame(rctx); + rctx.top = 0; int heightDiff = default_display.getHeight() - (rctx.bottom - rctx.top); if (heightDiff != kHeight){ Log.i("Python:", String.format("Layout Triggered, Keyboard_height: %s", heightDiff)); From 2f29b2d87d1d4090b8ad47a037fbfa6defdbd5bd Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 25 Feb 2016 01:27:16 +0000 Subject: [PATCH 21/26] Removed --download-cache pip argument --- distribute.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribute.sh b/distribute.sh index d873c3975e..05d3c63f1f 100755 --- a/distribute.sh +++ b/distribute.sh @@ -769,7 +769,7 @@ function run_pymodules_install() { done debug "Install pure-python modules via pip in venv" - try bash -c "source venv/bin/activate && env CC=/bin/false CXX=/bin/false PYTHONPATH= pip install --target '$SITEPACKAGES_PATH' --download-cache '$PACKAGES_PATH' -r requirements.txt" + try bash -c "source venv/bin/activate && env CC=/bin/false CXX=/bin/false PYTHONPATH= pip install --target '$SITEPACKAGES_PATH' -r requirements.txt" } From 447cea28b982fb0c8b4d9ea044a8977f2ca65350 Mon Sep 17 00:00:00 2001 From: Richard Larkin Date: Mon, 13 Feb 2017 19:27:32 +0200 Subject: [PATCH 22/26] Update OpenSSL version for the old_toolchain --- recipes/openssl/recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh index d89264966d..4e414cc023 100644 --- a/recipes/openssl/recipe.sh +++ b/recipes/openssl/recipe.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION_openssl=${VERSION_openssl:-1.0.1p} +VERSION_openssl=${VERSION_openssl:-1.0.2h} URL_openssl=https://www.openssl.org/source/openssl-$VERSION_openssl.tar.gz DEPS_openssl=() MD5_openssl=7563e92327199e0067ccd0f79f436976 From f9cc501d9547fadbb8c2693d638ca263914c2771 Mon Sep 17 00:00:00 2001 From: Zen-CODE Date: Wed, 15 Feb 2017 07:59:24 +0200 Subject: [PATCH 23/26] Fixed md5 checksum. references #447cea28b982fb0c8b4d9ea044a8977f2ca65350 --- recipes/openssl/recipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh index 4e414cc023..198b5ba088 100644 --- a/recipes/openssl/recipe.sh +++ b/recipes/openssl/recipe.sh @@ -3,7 +3,7 @@ VERSION_openssl=${VERSION_openssl:-1.0.2h} URL_openssl=https://www.openssl.org/source/openssl-$VERSION_openssl.tar.gz DEPS_openssl=() -MD5_openssl=7563e92327199e0067ccd0f79f436976 +MD5_openssl=9392e65072ce4b614c1392eefc1f23d0 BUILD_openssl=$BUILD_PATH/openssl/$(get_directory $URL_openssl) RECIPE_openssl=$RECIPES_PATH/openssl From 23645bdea81fbb2b7d1f19a518fed047b66889d9 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Fri, 29 Sep 2017 22:42:21 +0100 Subject: [PATCH 24/26] Added deprecation notice to README --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 79b2904309..8c6a63b6c4 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,7 @@ +.. warning:: This old python-for-android toolchain is deprecated and + no longer supported. Please move to the current toolchain, see + https://github.com/kivy/python-for-android. + Python for Android ================== From e04872f85ca4adf03060bb731edecc047cb94891 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Fri, 29 Sep 2017 22:43:12 +0100 Subject: [PATCH 25/26] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 8c6a63b6c4..5415cfabc5 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -.. warning:: This old python-for-android toolchain is deprecated and +**WARNING: This old python-for-android toolchain is deprecated and no longer supported. Please move to the current toolchain, see - https://github.com/kivy/python-for-android. + https://github.com/kivy/python-for-android.** Python for Android ================== From 550641c847de0d71b37a3fcc1492264d6b390fa2 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Fri, 29 Sep 2017 22:43:27 +0100 Subject: [PATCH 26/26] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 5415cfabc5..db8b8f9fa6 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ **WARNING: This old python-for-android toolchain is deprecated and - no longer supported. Please move to the current toolchain, see - https://github.com/kivy/python-for-android.** +no longer supported. Please move to the current toolchain, see +https://github.com/kivy/python-for-android.** Python for Android ==================