Merge branch 'kivy:develop' into firebase

Author: kengoon

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2010-2023 Kivy Team and other contributors
+Copyright (c) 2010-2025 Kivy Team and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

doc/source/quickstart.rst

@@ -57,7 +57,7 @@ You can also test the master branch from Github using::
     pip install git+https://github.com/kivy/python-for-android.git
 
 Installing Prerequisites
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 p4a requires a few dependencies to be installed on your system to work
 properly. While we're working on a way to automate pre-requisites checks,

doc/source/recipes.rst

@@ -73,9 +73,10 @@ For example, when downloading from a private github repository, you can specify
 ```
 
 (For the DOWNLOAD_HEADERS_my-package-name environment variable - specify as a JSON formatted set of values)
-```
+.. code-block:: bash
+
     [["Authorization","token <your personal access token>"],["Accept", "application/vnd.github+json"]]
-```
+
 The actual build process takes place via three core methods::
 
       def prebuild_arch(self, arch):

pythonforandroid/recipe.py

@@ -128,6 +128,7 @@ class Recipe(metaclass=RecipeMeta):
     keys should be the generated libraries and the values the relative path of
     the library inside his build folder. This dict will be used to perform
     different operations:
+
         - copy the library into the right location, depending on if it's shared
           or static)
         - check if we have to rebuild the library
@@ -571,7 +572,6 @@ def should_build(self, arch):
         '''Should perform any necessary test and return True only if it needs
         building again. Per default we implement a library test, in case that
         we detect so.
-
         '''
         if self.built_libraries:
             return not all(
@@ -591,7 +591,7 @@ def install_libraries(self, arch):
         '''This method is always called after `build_arch`. In case that we
         detect a library recipe, defined by the class attribute
         `built_libraries`, we will copy all defined libraries into the
-         right location.
+        right location.
         '''
         if not self.built_libraries:
             return

pythonforandroid/recipes/ffmpeg/__init__.py

@@ -28,6 +28,12 @@ def build_arch(self, arch):
             cflags = []
             ldflags = []
 
+            # enable hardware acceleration codecs
+            flags = [
+                '--enable-jni',
+                '--enable-mediacodec'
+            ]
+
             if 'openssl' in self.ctx.recipe_build_order:
                 flags += [
                     '--enable-openssl',

pythonforandroid/recipes/httpx/__init__.py

@@ -0,0 +1,13 @@
+from pythonforandroid.recipe import PyProjectRecipe
+
+
+class HttpxRecipe(PyProjectRecipe):
+    name = "httpx"
+    version = "0.28.1"
+    url = (
+        "https://pypi.python.org/packages/source/h/httpx/httpx-{version}.tar.gz"
+    )
+    depends = ["httpcore", "h11", "certifi", "idna", "sniffio"]
+
+
+recipe = HttpxRecipe()

pythonforandroid/recipes/jpeg/__init__.py

@@ -27,7 +27,7 @@ def build_arch(self, arch):
             toolchain_file = join(self.ctx.ndk_dir,
                                   'build/cmake/android.toolchain.cmake')
 
-            shprint(sh.rm, '-f', 'CMakeCache.txt', 'CMakeFiles/')
+            shprint(sh.rm, '-rf', 'CMakeCache.txt', 'CMakeFiles/')
             shprint(sh.cmake, '-G', 'Unix Makefiles',
                     '-DCMAKE_SYSTEM_NAME=Android',
                     '-DCMAKE_POSITION_INDEPENDENT_CODE=1',

pythonforandroid/recipes/kivy/__init__.py

@@ -22,12 +22,12 @@ def is_kivy_affected_by_deadlock_issue(recipe=None, arch=None):
 
 
 class KivyRecipe(CythonRecipe):
-    version = '2.3.0'
+    version = '2.3.1'
     url = 'https://github.com/kivy/kivy/archive/{version}.zip'
     name = 'kivy'
 
     depends = ['sdl2', 'pyjnius', 'setuptools']
-    python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3']
+    python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3', 'filetype']
 
     # sdl-gl-swapwindow-nogil.patch is needed to avoid a deadlock.
     # See: https://github.com/kivy/kivy/pull/8025

pythonforandroid/recipes/sdl2_ttf/__init__.py

@@ -2,7 +2,7 @@
 
 
 class LibSDL2TTF(BootstrapNDKRecipe):
-    version = '2.20.2'
+    version = '2.22.0'
     url = 'https://github.com/libsdl-org/SDL_ttf/releases/download/release-{version}/SDL2_ttf-{version}.tar.gz'
     dir_name = 'SDL2_ttf'
 

pythonforandroid/toolchain.py

@@ -750,6 +750,7 @@ def recipes(self, args):
         """
         Prints recipes basic info, e.g.
         .. code-block:: bash
+
             python3      3.7.1
                 depends: ['hostpython3', 'sqlite3', 'openssl', 'libffi']
                 conflicts: []