recipes: add thorvg

T-Dynamos · T-Dynamos · commit 29a6e7bc98ae · 2026-03-06T13:49:01.000+05:30
diff --git a/pythonforandroid/recipes/jpeg/__init__.py b/pythonforandroid/recipes/jpeg/__init__.py
@@ -14,9 +14,7 @@ class JpegRecipe(Recipe):
     name = 'jpeg'
     version = '2.0.1'
     url = 'https://github.com/libjpeg-turbo/libjpeg-turbo/archive/{version}.tar.gz'  # noqa
-    built_libraries = {'libjpeg.a': '.', 'libturbojpeg.a': '.'}
-    # we will require this below patch to build the shared library
-    # patches = ['remove-version.patch']
+    built_libraries = {'libjpeg.so': '.', 'libturbojpeg.so': '.'}
 
     def build_arch(self, arch):
         build_dir = self.get_build_dir(arch.arch)
@@ -34,6 +32,8 @@ def build_arch(self, arch):
                     '-DCMAKE_ANDROID_ARCH_ABI={arch}'.format(arch=arch.arch),
                     '-DCMAKE_ANDROID_NDK=' + self.ctx.ndk_dir,
                     '-DCMAKE_C_COMPILER={cc}'.format(cc=arch.get_clang_exe()),
+                    f'-DCMAKE_ASM_COMPILER={arch.get_clang_exe()}',
+                    f'-DCMAKE_ASM_FLAGS=--target={arch.target}',
                     '-DCMAKE_CXX_COMPILER={cc_plus}'.format(
                         cc_plus=arch.get_clang_exe(plus_plus=True)),
                     '-DCMAKE_BUILD_TYPE=Release',
@@ -42,12 +42,11 @@ def build_arch(self, arch):
 
                     '-DANDROID_ABI={arch}'.format(arch=arch.arch),
                     '-DANDROID_ARM_NEON=ON',
-                    '-DENABLE_NEON=ON',
-                    # '-DREQUIRE_SIMD=1',
+                    '-DWITH_SIMD=1',
+                    '-DREQUIRE_SIMD=1',
 
                     # Force disable shared, with the static ones is enough
-                    '-DENABLE_SHARED=0',
-                    '-DENABLE_STATIC=1',
+                    '-DENABLE_SHARED=1',
 
                     # Fix cmake compatibility issue
                     '-DCMAKE_POLICY_VERSION_MINIMUM=3.5',
diff --git a/pythonforandroid/recipes/jpeg/build-static.patch b/pythonforandroid/recipes/jpeg/build-static.patch
diff --git a/pythonforandroid/recipes/jpeg/remove-version.patch b/pythonforandroid/recipes/jpeg/remove-version.patch
diff --git a/pythonforandroid/recipes/libthorvg/__init__.py b/pythonforandroid/recipes/libthorvg/__init__.py
@@ -0,0 +1,85 @@
+from pythonforandroid.recipe import Recipe, MesonRecipe
+from os.path import join
+from pythonforandroid.util import ensure_dir, current_directory
+from pythonforandroid.logger import shprint
+from multiprocessing import cpu_count
+import sh
+
+
+class LibThorVGRecipe(MesonRecipe):
+    name = "libthorvg"
+    version = "1.0.1"
+    url = "https://github.com/thorvg/thorvg/releases/download/v{version}/thorvg.tar.gz"
+    config_otps = [
+        "-Dsimd=true",
+        "-Dbindings=capi",
+        "-Dtools=all",
+        "-Dengines=sw,gl",
+        "-Dloaders=svg,png,jpg,ttf,webp",
+        "-Dextra=opengl_es,lottie_exp,openmp",
+        "--reconfigure",
+    ]
+    need_stl_shared = True
+    skip_python = True
+    depends = ["png", "libwebp", "jpeg"]
+    patches = ["meson.patch"]
+    bins = ["tvg-lottie2gif", "tvg-svg2png"]
+    built_libraries = {
+        "libthorvg-1.so": "install/lib"
+    }
+    for bin in bins:
+        built_libraries[f"lib{bin}bin.so"] = "install/bin"
+
+    def should_build(self, arch):
+        return Recipe.should_build(self, arch)
+
+    def get_include_dir(self, arch):
+        return join(self.get_build_dir(arch.arch), "install", "include")
+
+    def build_arch(self, arch):
+        super().build_arch(arch)
+        build_dir = self.get_build_dir(arch.arch)
+        install_dir = join(build_dir, "install")
+        ensure_dir(install_dir)
+        env = self.get_recipe_env(arch)
+
+        lib_dir = self.ctx.get_libs_dir(arch.arch)
+        png_include = self.get_recipe("png", self.ctx).get_build_dir(arch.arch)
+        webp_include = join(
+            self.get_recipe("libwebp", self.ctx).get_build_dir(arch.arch), "src"
+        )
+        jpg_dir = self.get_recipe("jpeg", self.ctx).get_build_dir(arch.arch)
+
+        with current_directory(build_dir):
+
+            shprint(
+                sh.meson,
+                "setup",
+                "builddir",
+                "--cross-file",
+                join("/tmp", "android.meson.cross"),
+                f"--prefix={install_dir}",
+                # config opts
+                *self.config_otps,
+                # deps
+                f"-Dpng_include_dir={png_include}",
+                f"-Dpng_lib_dir={lib_dir}",
+                f"-Dwebp_include_dir={webp_include}",
+                f"-Dwebp_lib_dir={lib_dir}",
+                f"-Djpg_include_dir={jpg_dir}",
+                f"-Djpg_lib_dir={jpg_dir}",
+                _env=env,
+            )
+
+            shprint(sh.ninja, "-C", "builddir", "-j", str(cpu_count()), _env=env)
+            shprint(sh.rm, "-rf", install_dir)
+            shprint(sh.mkdir, install_dir)
+            shprint(sh.ninja, "-C", "builddir", "install", _env=env)
+
+            # setup bins
+            bin_dir = join("install", "bin")
+            for bin in self.bins:
+                shprint(sh.cp, join(bin_dir, bin), join(bin_dir, f"lib{bin}bin.so"))
+
+
+recipe = LibThorVGRecipe()
diff --git a/pythonforandroid/recipes/libthorvg/meson.patch b/pythonforandroid/recipes/libthorvg/meson.patch
@@ -0,0 +1,77 @@
+diff '--color=auto' -uNr thorvg/meson_options.txt thorvg.mod/meson_options.txt
+--- thorvg/meson_options.txt	2026-02-12 21:02:13.000000000 +0530
++++ thorvg.mod/meson_options.txt	2026-03-06 11:11:43.111722092 +0530
+@@ -68,3 +68,11 @@
+    choices: ['', 'opengl_es', 'lottie_exp', 'openmp'],
+    value: ['lottie_exp', 'openmp'],
+    description: 'Enable support for extra options')
++
++
++option('png_include_dir', type: 'string', value: '', description: 'Path to PNG headers')
++option('png_lib_dir', type: 'string', value: '', description: 'Path to PNG library')
++option('webp_include_dir', type: 'string', value: '', description: 'Path to WEBP headers')
++option('webp_lib_dir', type: 'string', value: '', description: 'Path to WEBP library')
++option('jpg_include_dir', type: 'string', value: '', description: 'Path to JPG headers')
++option('jpg_lib_dir', type: 'string', value: '', description: 'Path to JPG library')
+diff '--color=auto' -uNr thorvg/src/loaders/external_jpg/meson.build thorvg.mod/src/loaders/external_jpg/meson.build
+--- thorvg/src/loaders/external_jpg/meson.build	2026-02-12 21:02:13.000000000 +0530
++++ thorvg.mod/src/loaders/external_jpg/meson.build	2026-03-06 11:16:26.360504907 +0530
+@@ -3,11 +3,12 @@
+    'tvgJpgLoader.cpp',
+ ]
+ 
+-jpg_dep = dependency('libturbojpeg', required: false)
+-
+-if not jpg_dep.found()
+-    jpg_dep = cc.find_library('turbojpeg', required: false)
+-endif
++jpg_inc = include_directories(get_option('jpg_include_dir'))
++jpg_lib = cc.find_library('turbojpeg', dirs: [get_option('jpg_lib_dir')], required: true)
++jpg_dep = declare_dependency(
++  include_directories: jpg_inc,
++  dependencies: [jpg_lib]
++)
+ 
+ if jpg_dep.found()
+     subloader_dep += [declare_dependency(
+diff '--color=auto' -uNr thorvg/src/loaders/external_png/meson.build thorvg.mod/src/loaders/external_png/meson.build
+--- thorvg/src/loaders/external_png/meson.build	2026-02-12 21:02:13.000000000 +0530
++++ thorvg.mod/src/loaders/external_png/meson.build	2026-03-06 10:59:38.966203768 +0530
+@@ -3,7 +3,12 @@
+    'tvgPngLoader.cpp',
+ ]
+ 
+-png_dep = dependency('libpng', required: false)
++png_inc = include_directories(get_option('png_include_dir'))
++png_lib = cc.find_library('png16', dirs: [get_option('png_lib_dir')], required: true)
++png_dep = declare_dependency(
++  include_directories: png_inc,
++  dependencies: [png_lib]
++)
+ 
+ if png_dep.found()
+     subloader_dep += [declare_dependency(
+diff '--color=auto' -uNr thorvg/src/loaders/external_webp/meson.build thorvg.mod/src/loaders/external_webp/meson.build
+--- thorvg/src/loaders/external_webp/meson.build	2026-02-12 21:02:13.000000000 +0530
++++ thorvg.mod/src/loaders/external_webp/meson.build	2026-03-06 11:03:55.626148453 +0530
+@@ -3,7 +3,12 @@
+    'tvgWebpLoader.cpp',
+ ]
+ 
+-webp_dep = dependency('libwebp', required: false)
++webp_inc = include_directories(get_option('webp_include_dir'))
++webp_lib = cc.find_library('webp', dirs: [get_option('webp_lib_dir')], required: true)
++webp_dep = declare_dependency(
++  include_directories: webp_inc,
++  dependencies: [webp_lib]
++)
+ 
+ if webp_dep.found()
+    subloader_dep += [declare_dependency(
+@@ -11,4 +16,4 @@
+       dependencies : webp_dep,
+       sources : source_file
+       )]
+-endif
+\ No newline at end of file
++endif
diff --git a/pythonforandroid/recipes/thorvg-python/__init__.py b/pythonforandroid/recipes/thorvg-python/__init__.py
@@ -0,0 +1,12 @@
+from pythonforandroid.recipe import PyProjectRecipe
+
+
+class ThorVGPythonRecipe(PyProjectRecipe):
+    site_packages_name = "thorvg_python"
+    version = "1.1.1"
+    url = "https://github.com/laggykiller/thorvg-python/archive/refs/tags/v{version}.tar.gz"
+    depends = ["libthorvg"]
+    patches = ["sharedlib.patch"]
+
+
+recipe = ThorVGPythonRecipe()
diff --git a/pythonforandroid/recipes/thorvg-python/sharedlib.patch b/pythonforandroid/recipes/thorvg-python/sharedlib.patch
@@ -0,0 +1,53 @@
+diff '--color=auto' -uNr thorvg-python-1.1.1/pyproject.toml thorvg-python-1.1.1.mod/pyproject.toml
+--- thorvg-python-1.1.1/pyproject.toml	2026-02-28 01:45:23.000000000 +0530
++++ thorvg-python-1.1.1.mod/pyproject.toml	2026-03-06 13:36:02.822762758 +0530
+@@ -34,7 +34,6 @@
+ 
+ [build-system]
+ requires = [
+-    "conan>=2.0",
+     "setuptools>=45"
+ ]
+ build-backend = "setuptools.build_meta"
+@@ -45,4 +44,4 @@
+ 
+ [tool.mypy]
+ python_version = "3.9"
+-files = ["src", "tests"]
+\ No newline at end of file
++files = ["src", "tests"]
+diff '--color=auto' -uNr thorvg-python-1.1.1/setup.py thorvg-python-1.1.1.mod/setup.py
+--- thorvg-python-1.1.1/setup.py	2026-02-28 01:45:23.000000000 +0530
++++ thorvg-python-1.1.1.mod/setup.py	2026-03-06 13:32:56.878441668 +0530
+@@ -213,10 +213,4 @@
+         packages=find_packages(where="src"),
+         package_dir={"": "src"},
+         include_package_data=True,
+-        package_data={
+-            "thorvg_python": ["*.dll", "*.dylib", "*.so"],
+-        },
+-        cmdclass={
+-            "build_py": build_py_custom,
+-        },
+     )
+diff '--color=auto' -uNr thorvg-python-1.1.1/src/thorvg_python/engine.py thorvg-python-1.1.1.mod/src/thorvg_python/engine.py
+--- thorvg-python-1.1.1/src/thorvg_python/engine.py	2026-02-28 01:45:23.000000000 +0530
++++ thorvg-python-1.1.1.mod/src/thorvg_python/engine.py	2026-03-06 13:34:47.097440103 +0530
+@@ -7,7 +7,7 @@
+ from typing import List, Optional, Tuple, Type
+ 
+ from .base import Result
+-
++from ctypes.utils import find_library
+ 
+ def _load_lib_with_prefix_suffix(
+     lib_prefix: str, lib_suffix: str
+@@ -67,7 +67,7 @@
+     return None
+ 
+ 
+-THORVG_LIB = _load_lib()
++THORVG_LIB = find_library("libthorvg-1.so")
+ 
+ 
+ class Engine:
