Merge branch 'png-mainline' of https://github.com/opacam/python-for-android into matplotlib_recipe

Author: inclement

pythonforandroid/recipes/Pillow/__init__.py

@@ -21,8 +21,8 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         ndk_include_dir = join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include')
 
         png = self.get_recipe('png', self.ctx)
-        png_lib_dir = png.get_lib_dir(arch)
-        png_jni_dir = png.get_jni_dir(arch)
+        png_lib_dir = join(png.get_build_dir(arch.arch), '.libs')
+        png_inc_dir = png.get_build_dir(arch)
 
         jpeg = self.get_recipe('jpeg', self.ctx)
         jpeg_inc_dir = jpeg_lib_dir = jpeg.get_build_dir(arch.arch)
@@ -41,7 +41,7 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         env['FREETYPE_ROOT'] = '{}|{}'.format(free_lib_dir, free_inc_dir)
         env['ZLIB_ROOT'] = '{}|{}'.format(ndk_lib_dir, ndk_include_dir)
 
-        cflags = ' -I{}'.format(png_jni_dir)
+        cflags = ' -I{}'.format(png_inc_dir)
         cflags += ' -I{} -I{}'.format(harf_inc_dir, join(harf_inc_dir, 'src'))
         cflags += ' -I{}'.format(free_inc_dir)
         cflags += ' -I{}'.format(jpeg_inc_dir)

pythonforandroid/recipes/android/src/android/permissions.py

@@ -11,6 +11,7 @@ def autoclass(item):
 class Permission:
     ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER"
     ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION"
+    ACCESS_FINE_LOCATION = "android.permisssion.ACCESS_FINE_LOCATION"
     ACCESS_LOCATION_EXTRA_COMMANDS = (
         "android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"
         )

pythonforandroid/recipes/png/__init__.py

@@ -1,42 +1,52 @@
-from pythonforandroid.recipe import NDKRecipe
-from pythonforandroid.util import current_directory
+from pythonforandroid.recipe import Recipe
 from pythonforandroid.logger import shprint
-
+from pythonforandroid.util import current_directory
+from multiprocessing import cpu_count
+from os.path import join, exists
 import sh
 
-from os.path import join
 
-
-class PngRecipe(NDKRecipe):
+class PngRecipe(Recipe):
     name = 'png'
-    # This version is the last `sha commit` published in the repo (it's more
-    # than one year old...) and it's for libpng version `1.6.29`. We set a
-    # commit for a version because the author of the github's repo never
-    # released/tagged it, despite He performed the necessary changes in
-    # master branch.
-    version = 'b43b4c6'
-
-    # TODO: Try to move the repo to mainline
-    url = 'https://github.com/julienr/libpng-android/archive/{version}.zip'
-
-    patches = ['build_shared_library.patch']
-
-    generated_libraries = ['libpng.so']
+    version = 'v1.6.37'
+    url = 'https://github.com/glennrp/libpng/archive/{version}.zip'
+
+    def should_build(self, arch):
+        return not exists(
+            join(self.get_build_dir(arch.arch), '.libs', 'libpng16.so')
+        )
+
+    def get_recipe_env(self, arch=None):
+        env = super(PngRecipe, self).get_recipe_env(arch)
+        ndk_lib_dir = join(self.ctx.ndk_platform, 'usr', 'lib')
+        ndk_include_dir = join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include')
+        env['CFLAGS'] += ' -I{}'.format(ndk_include_dir)
+        env['LDFLAGS'] += ' -L{}'.format(ndk_lib_dir)
+        env['LDFLAGS'] += ' --sysroot={}'.format(self.ctx.ndk_platform)
+        return env
 
     def build_arch(self, arch):
         super(PngRecipe, self).build_arch(arch)
-
-        with current_directory(self.get_build_dir(arch.arch)):
+        build_dir = self.get_build_dir(arch.arch)
+        with current_directory(build_dir):
+            env = self.get_recipe_env(arch)
+            build_arch = (
+                shprint(sh.gcc, '-dumpmachine')
+                .stdout.decode('utf-8')
+                .split('\n')[0]
+            )
             shprint(
-                sh.cp,
-                join(
-                    self.get_build_dir(arch.arch),
-                    'libs',
-                    arch.arch,
-                    'libpng.so'),
-                join(self.ctx.get_libs_dir(arch.arch), 'libpng16.so'))
-                    
-                                
-            pass
+                sh.Command('./configure'),
+                '--build=' + build_arch,
+                '--host=' + arch.command_prefix,
+                '--target=' + arch.command_prefix,
+                '--disable-static',
+                '--enable-shared',
+                '--prefix={}/install'.format(self.get_build_dir(arch.arch)),
+                _env=env,
+            )
+            shprint(sh.make, '-j', str(cpu_count()), _env=env)
+            self.install_libs(arch, join(build_dir, '.libs', 'libpng16.so'))
+
 
 recipe = PngRecipe()

testapps/setup_testapp_python3_pillow.py

@@ -0,0 +1,27 @@
+
+from distutils.core import setup
+from setuptools import find_packages
+
+options = {'apk': {'requirements': 'harfbuzz,sdl2,pillow,kivy,python3',
+                   'blacklist-requirements': 'sqlite3',
+                   'android-api': 27,
+                   'ndk-api': 21,
+                   'dist-name': 'pillow_testapp',
+                   'arch': 'armeabi-v7a',
+                   'permissions': ['VIBRATE'],
+                   }}
+
+package_data = {'': ['*.py',
+                     '*.png']
+                }
+
+setup(
+    name='testapp_pillow',
+    version='1.0',
+    description='p4a setup.py test',
+    author='Pol Canelles',
+    author_email='[email protected]',
+    packages=find_packages(),
+    options=options,
+    package_data={'testapp_pillow': ['*.py', '*.png', '*.ttf']}
+)