[libraries] Move png to mainline

opacam · opacam · commit 164c227c46f8 · 2019-05-30T02:18:32.000+02:00
Also modify Pillow recipe because depends on png
diff --git a/pythonforandroid/recipes/Pillow/__init__.py b/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)
diff --git a/pythonforandroid/recipes/png/__init__.py b/pythonforandroid/recipes/png/__init__.py
@@ -1,19 +1,52 @@
-from pythonforandroid.recipe import NDKRecipe
+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
 
 
-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'
+    version = 'v1.6.37'
+    url = 'https://github.com/glennrp/libpng/archive/{version}.zip'
 
-    # TODO: Try to move the repo to mainline
-    url = 'https://github.com/julienr/libpng-android/archive/{version}.zip'
+    def should_build(self, arch):
+        return not exists(
+            join(self.get_build_dir(arch.arch), '.libs', 'libpng16.so')
+        )
 
-    generated_libraries = ['libpng.a']
+    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)
+        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.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()
