Merge remote-tracking branch 'upstream/develop' into develop

Author: broccoliboy

.dockerignore

@@ -6,3 +6,4 @@ bin/
 *.pyc
 **/__pycache__
 *.egg-info/
+docker-data/

.github/workflows/push.yml

@@ -98,7 +98,7 @@ jobs:
     - name: Maximize build space
       uses: easimon/maximize-build-space@v10
       with:
-        root-reserve-mb: 30720
+        root-reserve-mb: 4096
         swap-size-mb: 1024
         remove-dotnet: 'true'
         remove-android: 'true'
@@ -107,6 +107,13 @@ jobs:
         remove-docker-images: 'true'
     - name: Checkout python-for-android
       uses: actions/checkout@v5
+    - name: Relocate Docker data directory
+      run: |
+        sudo systemctl stop docker
+        sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data"
+        echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json
+        sudo systemctl start docker
+        docker info | grep "Docker Root Dir"
     - name: Build python-for-android docker image
       run: |
         docker build --tag=kivy/python-for-android .
@@ -224,7 +231,7 @@ jobs:
     - name: Maximize build space
       uses: easimon/maximize-build-space@v10
       with:
-        root-reserve-mb: 30720
+        root-reserve-mb: 4096
         swap-size-mb: 1024
         remove-dotnet: 'true'
         remove-android: 'true'
@@ -235,6 +242,13 @@ jobs:
       uses: actions/checkout@v5
       with:
         fetch-depth: 0
+    - name: Relocate Docker data directory
+      run: |
+        sudo systemctl stop docker
+        sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data"
+        echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json
+        sudo systemctl start docker
+        docker info | grep "Docker Root Dir"
     - name: Pull docker image
       run: |
         make docker/pull

ci/rebuild_updated_recipes.py

@@ -18,7 +18,6 @@
   the list of recipes was huge and result was:
   [ERROR]:   Didn't find any valid dependency graphs.
   [ERROR]:   This means that some of your requirements pull in conflicting dependencies.
-- only rebuilds on sdl2 bootstrap
 """
 import sh
 import os
@@ -57,14 +56,29 @@ def build(target_python, requirements, archs):
     android_sdk_home = os.environ['ANDROID_SDK_HOME']
     android_ndk_home = os.environ['ANDROID_NDK_HOME']
     requirements.add(target_python.name)
-    requirements = ','.join(requirements)
-    logger.info('requirements: {}'.format(requirements))
+    requirements_str = ','.join(requirements)
+    logger.info('requirements: {}'.format(requirements_str))
+
+    # Detect bootstrap based on requirements
+    # SDL3 recipes conflict with SDL2, so we need the sdl3 bootstrap
+    # when any SDL3-related recipe (sdl3, sdl3_image, sdl3_mixer, sdl3_ttf) is present
+    bootstrap = None
+    if any(r.startswith('sdl3') for r in requirements):
+        bootstrap = 'sdl3'
+        logger.info('Detected sdl3 recipe in requirements, using sdl3 bootstrap')
+
     build_command = [
         'setup.py', 'apk',
         '--sdk-dir', android_sdk_home,
         '--ndk-dir', android_ndk_home,
-        '--requirements', requirements
-    ] + [f"--arch={arch}" for arch in archs]
+        '--requirements', requirements_str
+    ]
+
+    if bootstrap:
+        build_command.extend(['--bootstrap', bootstrap])
+
+    build_command.extend([f"--arch={arch}" for arch in archs])
+
     build_command_str = " ".join(build_command)
     logger.info(f"Build command: {build_command_str}")
 

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonUtil.java

@@ -59,8 +59,8 @@ protected static ArrayList<String> getLibraries(File libsDir) {
             addLibraryIfExists(libsList, name, libsDir);
         }
 
-        for (int v = 14; v >= 5; v--) {
-            libsList.add("python3." + v + (v <= 7 ? "m" : ""));
+        for (int v = 14; v >= 8; v--) {
+            libsList.add("python3." + v);
         }
 
         libsList.add("main");
@@ -85,7 +85,7 @@ public static void loadLibraries(File filesDir, File libsDir) {
                 // load, and it has failed, give a more
                 // general error
                 Log.v(TAG, "Library loading error: " + e.getMessage());
-                if (lib.startsWith("python3.14") && !foundPython) {
+                if (lib.startsWith("python3.8") && !foundPython) {
                     throw new RuntimeException("Could not load any libpythonXXX.so");
                 } else if (lib.startsWith("python")) {
                     continue;

pythonforandroid/recipes/kivy/__init__.py

@@ -7,17 +7,25 @@
 from pythonforandroid.toolchain import current_directory, shprint
 
 
-def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
+def get_kivy_version(recipe, arch):
     with current_directory(join(recipe.get_build_dir(arch.arch), "kivy")):
-        kivy_version = shprint(
+        return shprint(
             sh.Command(sys.executable),
             "-c",
             "import _version; print(_version.__version__)",
         )
 
-        return packaging.version.parse(
-            str(kivy_version)
-        ) < packaging.version.Version("2.2.0.dev0")
+
+def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
+    return packaging.version.parse(
+        str(get_kivy_version(recipe, arch))
+    ) < packaging.version.Version("2.2.0.dev0")
+
+
+def is_kivy_less_than_3(recipe=None, arch=None):
+    return packaging.version.parse(
+        str(get_kivy_version(recipe, arch))
+    ) < packaging.version.Version("3.0.0")
 
 
 class KivyRecipe(PyProjectRecipe):
@@ -34,7 +42,7 @@ class KivyRecipe(PyProjectRecipe):
     # WARNING: Remove this patch when a new Kivy version is released.
     patches = [
         ("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue),
-        "use_cython.patch",
+        ("use_cython.patch", is_kivy_less_than_3),
         "no-ast-str.patch"
     ]
 
@@ -59,6 +67,9 @@ def get_recipe_env(self, arch, **kwargs):
 
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
         env['NDKPLATFORM'] = "NOTNONE"
+        if not is_kivy_less_than_3(self, arch):
+            env['KIVY_CROSS_PLATFORM'] = 'android'
+
         if 'sdl2' in self.ctx.recipe_build_order:
             env['USE_SDL2'] = '1'
             env['KIVY_SPLIT_EXAMPLES'] = '1'

pythonforandroid/recipes/python3/__init__.py

@@ -55,7 +55,6 @@ class Python3Recipe(TargetPythonRecipe):
     '''
 
     version = '3.14.2'
-    _p_version = Version(version)
     url = 'https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz'
     name = 'python3'
 
@@ -64,28 +63,6 @@ class Python3Recipe(TargetPythonRecipe):
         'patches/reproducible-buildinfo.diff',
     ]
 
-    if _p_version.major == 3 and _p_version.minor == 7:
-        patches += [
-            'patches/py3.7.1_fix-ctypes-util-find-library.patch',
-            'patches/py3.7.1_fix-zlib-version.patch',
-        ]
-
-    if 8 <= _p_version.minor <= 10:
-        patches.append('patches/py3.8.1.patch')
-
-    if _p_version.minor >= 11:
-        patches.append('patches/cpython-311-ctypes-find-library.patch')
-
-    if _p_version.minor >= 14:
-        patches.append('patches/3.14_armv7l_fix.patch')
-        patches.append('patches/3.14_fix_remote_debug.patch')
-
-    if shutil.which('lld') is not None:
-        if _p_version.minor == 7:
-            patches.append("patches/py3.7.1_fix_cortex_a8.patch")
-        elif _p_version.minor >= 8:
-            patches.append("patches/py3.8.1_fix_cortex_a8.patch")
-
     depends = ['hostpython3', 'sqlite3', 'openssl', 'libffi']
     # those optional depends allow us to build python compression modules:
     #   - _bz2.so
@@ -116,11 +93,6 @@ class Python3Recipe(TargetPythonRecipe):
         'ac_cv_header_bzlib_h=no',
     ]
 
-    if _p_version.minor >= 11:
-        configure_args.extend([
-            '--with-build-python={python_host_bin}',
-        ])
-
     '''The configure arguments needed to build the python recipe. Those are
     used in method :meth:`build_arch` (if not overwritten like python3's
     recipe does).
@@ -210,6 +182,34 @@ def link_version(self):
             flags=flags
         )
 
+    def apply_patches(self, arch, build_dir=None):
+
+        _p_version = Version(self.version)
+        if _p_version.major == 3 and _p_version.minor == 7:
+            self.patches += [
+                'patches/py3.7.1_fix-ctypes-util-find-library.patch',
+                'patches/py3.7.1_fix-zlib-version.patch',
+            ]
+
+        if 8 <= _p_version.minor <= 10:
+            self.patches.append('patches/py3.8.1.patch')
+
+        if _p_version.minor >= 11:
+            self.patches.append('patches/cpython-311-ctypes-find-library.patch')
+
+        if _p_version.minor >= 14:
+            self.patches.append('patches/3.14_armv7l_fix.patch')
+            self.patches.append('patches/3.14_fix_remote_debug.patch')
+
+        if shutil.which('lld') is not None:
+            if _p_version.minor == 7:
+                self.patches.append("patches/py3.7.1_fix_cortex_a8.patch")
+            elif _p_version.minor >= 8:
+                self.patches.append("patches/py3.8.1_fix_cortex_a8.patch")
+
+        self.patches = list(set(self.patches))
+        super().apply_patches(arch, build_dir)
+
     def include_root(self, arch_name):
         return join(self.get_build_dir(arch_name), 'Include')
 
@@ -317,9 +317,15 @@ def add_flags(include_flags, link_dirs, link_libs):
         env['ZLIB_VERSION'] = line.replace('#define ZLIB_VERSION ', '')
         add_flags(' -I' + zlib_includes, ' -L' + zlib_lib_path, ' -lz')
 
-        if self._p_version.minor >= 13 and self.disable_gil:
+        _p_version = Version(self.version)
+        if _p_version.minor >= 11:
+            self.configure_args.append('--with-build-python={python_host_bin}')
+
+        if _p_version.minor >= 13 and self.disable_gil:
             self.configure_args.append("--disable-gil")
 
+        self.configure_args = list(set(self.configure_args))
+
         return env
 
     def build_arch(self, arch):

pythonforandroid/recipes/sdl3/__init__.py

@@ -6,9 +6,9 @@
 
 
 class LibSDL3Recipe(BootstrapNDKRecipe):
-    version = "3.2.18"
+    version = "3.4.2"
     url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL3-{version}.tar.gz"
-    md5sum = "c7808ef624b74e2ac69cf531e78e0c6e"
+    md5sum = "b488ea1ede947c06855588314effe905"
 
     conflicts = ["sdl2"]
 

pythonforandroid/recipes/sdl3_image/__init__.py

@@ -6,7 +6,7 @@
 
 
 class LibSDL3Image(BootstrapNDKRecipe):
-    version = "3.2.4"
+    version = "3.4.0"
     url = "https://github.com/libsdl-org/SDL_image/releases/download/release-{version}/SDL3_image-{version}.tar.gz"
     dir_name = "SDL3_image"
 

pythonforandroid/recipes/sdl3_image/enable-webp.patch

@@ -1,12 +1,22 @@
-diff -Naur SDL2_image.orig/Android.mk SDL2_image/Android.mk
---- SDL2_image.orig/Android.mk	2022-10-03 20:51:52.000000000 +0200
-+++ SDL2_image/Android.mk	2022-10-03 20:52:48.000000000 +0200
-@@ -32,7 +32,7 @@
+--- a/Android.mk
++++ b/Android.mk
+@@ -33,8 +33,8 @@
 
  # Enable this if you want to support loading WebP images
  # The library path should be a relative path to this directory.
 -SUPPORT_WEBP ?= false
+-SUPPORT_SAVE_WEBP ?= true
 +SUPPORT_WEBP := true
++SUPPORT_SAVE_WEBP := true
  WEBP_LIBRARY_PATH := external/libwebp
 
 
+@@ -160,7 +160,7 @@
+ ifeq ($(SUPPORT_WEBP),true)
+     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/src
+     LOCAL_CFLAGS += -DLOAD_WEBP
+-    LOCAL_STATIC_LIBRARIES += webpdemux
++    LOCAL_STATIC_LIBRARIES += webpmux webpdemux
+     LOCAL_STATIC_LIBRARIES += webp
+ ifeq ($(SUPPORT_SAVE_WEBP),true)
+     LOCAL_CFLAGS += -DSAVE_WEBP=1

pythonforandroid/recipes/sdl3_mixer/__init__.py

@@ -7,7 +7,6 @@
 
 class LibSDL3Mixer(BootstrapNDKRecipe):
     version = "72a73339731a12c1002f9caca64f1ab924938102"
-    # url = "https://github.com/libsdl-org/SDL_ttf/releases/download/release-{version}/SDL3_ttf-{version}.tar.gz"
     url = "https://github.com/libsdl-org/SDL_mixer/archive/{version}.tar.gz"
     dir_name = "SDL3_mixer"