Merge branch 'develop' into prebuilt-artifacts

Author: T-Dynamos

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/prerequisites.py

@@ -262,7 +262,7 @@ def darwin_installer(self):
 
 class OpenSSLPrerequisite(Prerequisite):
     name = "openssl"
-    homebrew_formula_name = "openssl@1.1"
+    homebrew_formula_name = "openssl@3"
     mandatory = dict(linux=False, darwin=True)
     installer_is_supported = dict(linux=False, darwin=True)
 

pythonforandroid/recipe.py

@@ -132,6 +132,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
@@ -579,7 +580,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(
@@ -600,7 +600,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/bitarray/__init__.py

@@ -0,0 +1,11 @@
+from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
+
+
+class BitarrayRecipe(CppCompiledComponentsPythonRecipe):
+    stl_lib_name = "c++_shared"
+    version = "3.0.0"
+    url = "https://github.com/ilanschnell/bitarray/archive/refs/tags/{version}.tar.gz"
+    depends = ["setuptools"]
+
+
+recipe = BitarrayRecipe()

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/pyopenssl/__init__.py

@@ -3,9 +3,9 @@
 
 
 class PyOpenSSLRecipe(PythonRecipe):
-    version = '19.0.0'
+    version = '24.1.0'
     url = 'https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-{version}.tar.gz'
-    depends = ['openssl', 'setuptools']
+    depends = ['cffi', 'openssl', 'setuptools']
     site_packages_name = 'OpenSSL'
 
     call_hostpython_via_targetpython = False