Added matplotlib recipe (and unnecessary png changes)

Author: inclement

pythonforandroid/recipes/matplotlib/__init__.py

@@ -0,0 +1,57 @@
+
+from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe, warning, Recipe
+
+from os.path import join
+import shutil
+
+class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
+    
+    version = '3.0.3'
+    url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'
+
+    depends = ['numpy', 'setuptools', 'freetype', 'kiwisolver']
+
+    python_depends = ['pyparsing', 'cycler', 'python-dateutil']
+
+    # We need to patch to:
+    # - make mpl build against the same numpy version as the numpy recipe
+    #   (this could be done better by setting the target version dynamically)
+    # - prevent mpl trying to build TkAgg, which wouldn't work on Android anyway but has build issues
+    patches = ['mpl_android_fixes.patch']
+
+    call_hostpython_via_targetpython = False
+
+    def get_recipe_env(self, arch):
+        env = super(MatplotlibRecipe, self).get_recipe_env(arch)
+
+        numpy_recipe = Recipe.get_recipe('numpy', self.ctx)
+        
+        env['NUMPY_INCLUDE_DIR'] = join(
+            numpy_recipe.get_build_container_dir(arch.arch),
+            'numpy', 'core', 'include')
+
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/freetype/include'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+
+        freetype_so_dir = join(
+            Recipe.get_recipe('freetype', self.ctx).get_build_dir(arch),
+            'objs', '.libs'
+        )
+        env['CFLAGS'] += ' -L{}'.format(freetype_so_dir)
+        env['LDFLAGS'] += ' -L{}'.format(freetype_so_dir)
+
+        env['CFLAGS'] += ' -L/home/sandy/kivytest'
+        env['LDFLAGS'] += ' -L/home/sandy/kivytest'
+
+        return env
+
+    def prebuild_arch(self, arch):
+        with open(join(self.get_recipe_dir(), 'setup.cfg.template')) as fileh:
+            setup_cfg = fileh.read()
+
+        with open(join(self.get_build_dir(arch), 'setup.cfg'), 'w') as fileh:
+            fileh.write(setup_cfg.format(
+                ndk_sysroot_usr=join(self.ctx.ndk_dir, 'sysroot', 'usr')))
+
+
+recipe = MatplotlibRecipe()

pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch

@@ -0,0 +1,29 @@
+diff --git a/setupext.py b/setupext.py
+index fc82d5d..2067db0 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -1004,10 +1004,10 @@ class Numpy(SetupPackage):
+         ext.define_macros.append(('__STDC_FORMAT_MACROS', 1))
+ 
+     def get_setup_requires(self):
+-        return ['numpy>=1.10.0']
++        return ['numpy==1.15.1']  # to match p4a's target version
+ 
+     def get_install_requires(self):
+-        return ['numpy>=1.10.0']
++        return ['numpy==1.15.1']  # to match p4a's target version
+ 
+ 
+ class LibAgg(SetupPackage):
+@@ -1443,9 +1443,10 @@ class BackendAgg(OptionalBackendPackage):
+ 
+ class BackendTkAgg(OptionalBackendPackage):
+     name = "tkagg"
+-    force = True
++    force = False
+ 
+     def check(self):
++        raise CheckFailed("Disabled by patching during Android build")  # tk doesn't work on Android but causes build problems
+         return "installing; run-time loading from Python Tcl / Tk"
+ 
+     def get_extension(self):

pythonforandroid/recipes/matplotlib/setup.cfg.template

@@ -0,0 +1,93 @@
+# Rename this file to setup.cfg to modify Matplotlib's
+# build options.
+
+[egg_info]
+
+[directories]
+# Uncomment to override the default basedir in setupext.py.
+# This can be a single directory or a comma-delimited list of directories.
+basedirlist = {ndk_sysroot_usr}
+
+[test]
+# If you plan to develop Matplotlib and run or add to the test suite,
+# set this to True.  It will download and build a specific version of
+# FreeType, and then use that to build the ft2font extension.  This
+# ensures that test images are exactly reproducible.
+# local_freetype = True
+
+[status]
+# To suppress display of the dependencies and their versions
+# at the top of the build log, uncomment the following line:
+#suppress = True 
+
+[packages]
+# There are a number of subpackages of Matplotlib that are considered
+# optional. All except tests are installed by default, but that can
+# be changed here.
+#
+tests = False
+sample_data = False
+#toolkits = True
+# Tests for the toolkits are only automatically installed
+# if the tests and toolkits packages are also getting installed.
+toolkits_tests = False
+
+[gui_support]
+# Matplotlib supports multiple GUI toolkits, including
+# GTK3, MacOSX, Qt4, Qt5, Tk, and WX. Support for many of
+# these toolkits requires AGG, the Anti-Grain Geometry library,
+# which is provided by Matplotlib and built by default.
+#
+# Some backends are written in pure Python, and others require
+# extension code to be compiled. By default, Matplotlib checks for
+# these GUI toolkits during installation and, if present, compiles the
+# required extensions to support the toolkit.
+#
+# - Tk support requires Tk development headers and Tkinter.
+# - Mac OSX backend requires the Cocoa headers included with XCode.
+# - Windowing is MS-Windows specific, and requires the "windows.h"
+#   header.
+#
+# The other GUI toolkits do not require any extension code, and can be
+# used as long as the libraries are installed on your system --
+# therefore they are installed unconditionally.
+#
+# You can uncomment any the following lines to change this
+# behavior. Acceptable values are:
+#
+#     True: build the extension. Exits with a warning if the
+#           required dependencies are not available
+#     False: do not build the extension
+#     auto: build if the required dependencies are available,
+#           otherwise skip silently. This is the default
+#           behavior
+#
+agg = True
+cairo = False
+gtk3agg = False
+gtk3cairo = False
+macosx = False
+pyside = False
+qt4agg = False
+tkagg = False
+windowing = False
+wxagg = False
+
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, GTK3Agg, GTK3Cairo, MacOSX, Pdf, Ps,
+# Qt4Agg, Qt5Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external dependencies. Do
+# not choose MacOSX, or TkAgg if you have disabled the relevant extension
+# modules.  Agg will be used by default.
+#
+backend = Agg
+#
+
+[package_data]
+# Package additional files found in the lib/matplotlib directories.
+#
+# On Windows, package DLL files.
+#dlls = True

pythonforandroid/recipes/png/__init__.py

@@ -13,7 +13,7 @@ class PngRecipe(NDKRecipe):
     # TODO: Try to move the repo to mainline
     url = 'https://github.com/julienr/libpng-android/archive/{version}.zip'
 
-    generated_libraries = ['libpng.a']
+    patches = ['build_shared_library.patch']
 
 
 recipe = PngRecipe()

pythonforandroid/recipes/png/build_shared_library.patch

@@ -0,0 +1,17 @@
+diff --git a/jni/Android.mk b/jni/Android.mk
+index df2ff1a..2f70985 100644
+--- a/jni/Android.mk
++++ b/jni/Android.mk
+@@ -26,8 +26,9 @@ LOCAL_SRC_FILES :=\
+ 	arm/filter_neon_intrinsics.c
+ 
+ #LOCAL_SHARED_LIBRARIES := -lz
+-LOCAL_EXPORT_LDLIBS := -lz
++# LOCAL_EXPORT_LDLIBS := -lz
++LOCAL_LDLIBS := -lz
+ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.
+ 
+-#include $(BUILD_SHARED_LIBRARY)
+-include $(BUILD_STATIC_LIBRARY)
++include $(BUILD_SHARED_LIBRARY)
++# include $(BUILD_STATIC_LIBRARY)