Merge branch 'kivy:develop' into firebase

Author: kengoon

doc/source/buildoptions.rst

@@ -36,7 +36,7 @@ sdl2
 Use this with ``--bootstrap=sdl2``, or just include the
 ``sdl2`` recipe, e.g. ``--requirements=sdl2,python3``.
 
-SDL2 is a popular cross-platform depelopment library, particularly for
+SDL2 is a popular cross-platform development library, particularly for
 games. It has its own Android project support, which
 python-for-android uses as a bootstrap, and to which it adds the
 Python build and JNI code to start it.

pythonforandroid/recipes/grpcio/__init__.py

@@ -0,0 +1,33 @@
+from pythonforandroid.recipe import PyProjectRecipe, Recipe
+
+
+class GrpcioRecipe(PyProjectRecipe):
+    version = '1.64.0'
+    url = 'https://files.pythonhosted.org/packages/source/g/grpcio/grpcio-{version}.tar.gz'
+    depends = ["setuptools", "librt", "libpthread"]
+    patches = [
+        "comment-getserverbyport-r-args.patch",
+        "remove-android-log-write.patch",
+        "use-ndk-zlib-and-openssl-recipe-include.patch"
+    ]
+
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
+        env["NDKPLATFORM"] = "NOTNONE"
+        env["GRPC_PYTHON_BUILD_SYSTEM_OPENSSL"] = "1"
+        env["GRPC_PYTHON_BUILD_SYSTEM_ZLIB"] = "1"
+        env["ZLIB_INCLUDE"] = self.ctx.ndk.sysroot_include_dir
+        # replace -I with a space
+        openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
+        env["SSL_INCLUDE"] = openssl_recipe.include_flags(arch).strip().replace("-I", "")
+        env["CFLAGS"] += " -U__ANDROID_API__"
+        env["CFLAGS"] += " -D__ANDROID_API__={}".format(self.ctx.ndk_api)
+        # turn off c++11 warning error of "invalid suffix on literal"
+        env["CFLAGS"] += " -Wno-reserved-user-defined-literal"
+        env["PLATFORM"] = "android"
+        env["LDFLAGS"] += " -llog -landroid"
+        env["LDFLAGS"] += openssl_recipe.link_flags(arch)
+        return env
+
+
+recipe = GrpcioRecipe()

pythonforandroid/recipes/grpcio/comment-getserverbyport-r-args.patch

@@ -0,0 +1,33 @@
+diff --git a/third_party/cares/config_darwin/ares_config.h b/third_party/cares/config_darwin/ares_config.h
+--- a/third_party/cares/config_darwin/ares_config.h	2024-07-16 20:46:22.000000000 +0100
++++ b/third_party/cares/config_darwin/ares_config.h	2024-07-29 00:18:30.096755745 +0100
+@@ -43,7 +43,7 @@
+ #define GETNAMEINFO_TYPE_ARG7 int
+ 
+ /* Specifies the number of arguments to getservbyport_r */
+-#define GETSERVBYPORT_R_ARGS 
++/* #define GETSERVBYPORT_R_ARGS */
+ 
+ /* Define to 1 if you have AF_INET6. */
+ #define HAVE_AF_INET6
+diff --git a/third_party/cares/config_linux/ares_config.h b/third_party/cares/config_linux/ares_config.h
+--- a/third_party/cares/config_linux/ares_config.h	2024-07-16 20:46:22.000000000 +0100
++++ b/third_party/cares/config_linux/ares_config.h	2024-07-29 00:19:39.479166654 +0100
+@@ -43,7 +43,7 @@
+ #define GETNAMEINFO_TYPE_ARG7 int
+ 
+ /* Specifies the number of arguments to getservbyport_r */
+-#define GETSERVBYPORT_R_ARGS 6
++/* #define GETSERVBYPORT_R_ARGS 6 */
+ 
+ /* Define to 1 if you have AF_INET6. */
+ #define HAVE_AF_INET6
+@@ -121,7 +121,7 @@
+ #define HAVE_GETNAMEINFO
+ 
+ /* Define to 1 if you have the getservbyport_r function. */
+-#define HAVE_GETSERVBYPORT_R
++/* #define HAVE_GETSERVBYPORT_R */
+ 
+ /* Define to 1 if you have the `gettimeofday' function. */
+ #define HAVE_GETTIMEOFDAY

pythonforandroid/recipes/grpcio/remove-android-log-write.patch

@@ -0,0 +1,36 @@
+Index: log.cc
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/core/lib/gpr/android/log.cc b/src/core/lib/gpr/android/log.cc
+--- a/src/core/lib/gpr/android/log.cc
++++ b/src/core/lib/gpr/android/log.cc	(date 1716778822204)
+@@ -30,18 +30,6 @@
+ 
+ #include "src/core/lib/gprpp/crash.h"
+ 
+-static android_LogPriority severity_to_log_priority(gpr_log_severity severity) {
+-  switch (severity) {
+-    case GPR_LOG_SEVERITY_DEBUG:
+-      return ANDROID_LOG_DEBUG;
+-    case GPR_LOG_SEVERITY_INFO:
+-      return ANDROID_LOG_INFO;
+-    case GPR_LOG_SEVERITY_ERROR:
+-      return ANDROID_LOG_ERROR;
+-  }
+-  return ANDROID_LOG_DEFAULT;
+-}
+-
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+   // Avoid message construction if gpr_log_message won't log
+@@ -70,8 +58,6 @@
+ 
+   asprintf(&output, "%s:%d] %s", display_file, args->line, args->message);
+ 
+-  __android_log_write(severity_to_log_priority(args->severity), "GRPC", output);
+-
+   // allocated by asprintf => use free, not gpr_free
+   free(output);
+ }

pythonforandroid/recipes/grpcio/use-ndk-zlib-and-openssl-recipe-include.patch

@@ -0,0 +1,16 @@
+--- a/setup.py	2024-05-31 11:20:56.824695569 +0100
++++ b/setup.py	2024-05-31 23:13:40.324392463 +0100
+@@ -299,11 +299,11 @@
+         lambda x: "third_party/boringssl" not in x, CORE_C_FILES
+     )
+     CORE_C_FILES = filter(lambda x: "src/boringssl" not in x, CORE_C_FILES)
+-    SSL_INCLUDE = (os.path.join("/usr", "include", "openssl"),)
++    SSL_INCLUDE = tuple(os.environ["SSL_INCLUDE"].split(" "))
+ 
+ if BUILD_WITH_SYSTEM_ZLIB:
+     CORE_C_FILES = filter(lambda x: "third_party/zlib" not in x, CORE_C_FILES)
+-    ZLIB_INCLUDE = (os.path.join("/usr", "include"),)
++    ZLIB_INCLUDE = tuple(os.environ["ZLIB_INCLUDE"].split(" "))
+ 
+ if BUILD_WITH_SYSTEM_CARES:
+     CORE_C_FILES = filter(lambda x: "third_party/cares" not in x, CORE_C_FILES)

pythonforandroid/recipes/libsodium/__init__.py

@@ -3,15 +3,24 @@
 from pythonforandroid.logger import shprint
 from multiprocessing import cpu_count
 import sh
+from packaging import version as packaging_version
 
 
 class LibsodiumRecipe(Recipe):
     version = '1.0.16'
-    url = 'https://github.com/jedisct1/libsodium/releases/download/{version}/libsodium-{version}.tar.gz'
+    url = 'https://github.com/jedisct1/libsodium/releases/download/{}/libsodium-{}.tar.gz'
     depends = []
     patches = ['size_max_fix.patch']
     built_libraries = {'libsodium.so': 'src/libsodium/.libs'}
 
+    @property
+    def versioned_url(self):
+        asked_version = packaging_version.parse(self.version)
+        if asked_version > packaging_version.parse('1.0.16'):
+            return self._url.format(self.version + '-RELEASE', self.version)
+        else:
+            return self._url.format(self.version, self.version)
+
     def build_arch(self, arch):
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):

pythonforandroid/recipes/moderngl/__init__.py

@@ -0,0 +1,17 @@
+from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
+
+
+class ModernGLRecipe(CppCompiledComponentsPythonRecipe):
+    version = '5.10.0'
+    url = 'https://github.com/moderngl/moderngl/archive/refs/tags/{version}.tar.gz'
+
+    site_packages_name = 'moderngl'
+    name = 'moderngl'
+
+    def get_recipe_env(self, arch):
+        env = super().get_recipe_env(arch)
+        env['LDFLAGS'] += ' -lstdc++'
+        return env
+
+
+recipe = ModernGLRecipe()