android: enable sound, move to PyProjectRecipe

Author: T-Dynamos

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

@@ -56,6 +56,8 @@ protected static ArrayList<String> getLibraries(File libsDir) {
         libsList.add("python3.9");
         libsList.add("python3.10");
         libsList.add("python3.11");
+        libsList.add("python3.12");
+        libsList.add("python3.13");
         libsList.add("main");
         return libsList;
     }
@@ -75,7 +77,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.11") && !foundPython) {
+                if (lib.startsWith("python3.13") && !foundPython) {
                     throw new RuntimeException("Could not load any libpythonXXX.so");
                 } else if (lib.startsWith("python")) {
                     continue;

Diff for: pythonforandroid/recipe.py

@@ -946,12 +946,14 @@ def folder_name(self):
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         env = super().get_recipe_env(arch, with_flags_in_cc)
-        env['PYTHONNOUSERSITE'] = '1'
         # Set the LANG, this isn't usually important but is a better default
         # as it occasionally matters how Python e.g. reads files
         env['LANG'] = "en_GB.UTF-8"
         # Binaries made by packages installed by pip
         env["PATH"] = self._host_recipe.site_bin + ":" + env["PATH"]
+        
+        host_env = self.get_hostrecipe_env()
+        env['PYTHONPATH'] = host_env["PYTHONPATH"]
 
         if not self.call_hostpython_via_targetpython:
             env['CFLAGS'] += ' -I{}'.format(
@@ -961,24 +963,11 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
                 self.ctx.python_recipe.link_root(arch.arch),
                 self.ctx.python_recipe.link_version,
             )
-
-            hppath = []
-            hppath.append(join(dirname(self.hostpython_location), 'Lib'))
-            hppath.append(join(hppath[0], 'site-packages'))
-            builddir = join(dirname(self.hostpython_location), 'build')
-            if exists(builddir):
-                hppath += [join(builddir, d) for d in listdir(builddir)
-                           if isdir(join(builddir, d))]
-            if len(hppath) > 0:
-                if 'PYTHONPATH' in env:
-                    env['PYTHONPATH'] = ':'.join(hppath + [env['PYTHONPATH']])
-                else:
-                    env['PYTHONPATH'] = ':'.join(hppath)
         return env
 
     def should_build(self, arch):
         name = self.folder_name
-        if self.ctx.has_package(name, arch):
+        if self.ctx.has_package(name, arch) or name in listdir(self._host_recipe.site_dir):
             info('Python package already exists in site-packages')
             return False
         info('{} apparently isn\'t already in site-packages'.format(name))
@@ -1005,22 +994,28 @@ def install_python_package(self, arch, name=None, env=None, is_dir=True):
         hostpython = sh.Command(self.hostpython_location)
         hpenv = env.copy()
         with current_directory(self.get_build_dir(arch.arch)):
-            shprint(hostpython, 'setup.py', 'install', '-O2',
-                    '--root={}'.format(self.ctx.get_python_install_dir(arch.arch)),
-                    '--install-lib=.',
-                    _env=hpenv, *self.setup_extra_args)
+            if isfile("setup.py"):
+                shprint(hostpython, 'setup.py', 'install', '-O2',
 
-            # If asked, also install in the hostpython build dir
-            if self.install_in_hostpython:
-                self.install_hostpython_package(arch)
+                        '--root={}'.format(self.ctx.get_python_install_dir(arch.arch)),
+                        '--install-lib=.',
+                        _env=hpenv, *self.setup_extra_args)
 
-    def get_hostrecipe_env(self, arch):
+                # If asked, also install in the hostpython build dir
+                if self.install_in_hostpython:
+                    self.install_hostpython_package(arch)
+            else:
+                warning("`PythonRecipe.install_python_package` called without `setup.py` file!")
+
+    def get_hostrecipe_env(self):
         env = environ.copy()
-        env['PYTHONPATH'] = self._host_recipe.site_dir
+        _python_path = self._host_recipe.get_path_to_python()
+        env['PYTHONPATH'] = self._host_recipe.site_dir + ":" + join(
+            _python_path, "Modules") + ":" + glob.glob(join(_python_path, "build", "lib*"))[0]
         return env
 
     def install_hostpython_package(self, arch):
-        env = self.get_hostrecipe_env(arch)
+        env = self.get_hostrecipe_env()
         real_hostpython = sh.Command(self.real_hostpython_location)
         shprint(real_hostpython, 'setup.py', 'install', '-O2',
                 '--root={}'.format(self._host_recipe.site_root),
@@ -1031,7 +1026,7 @@ def python_major_minor_version(self):
         parsed_version = packaging.version.parse(self.ctx.python_recipe.version)
         return f"{parsed_version.major}.{parsed_version.minor}"
 
-    def install_hostpython_prerequisites(self, packages=None, force_upgrade=True):
+    def install_hostpython_prerequisites(self, packages=None, force_upgrade=True, arch=None):
         if not packages:
             packages = self.hostpython_prerequisites
 
@@ -1049,7 +1044,7 @@ def install_hostpython_prerequisites(self, packages=None, force_upgrade=True):
         if force_upgrade:
             pip_options.append("--upgrade")
         # Use system's pip
-        shprint(sh.Command(), *pip_options)
+        shprint(sh.Command(self.real_hostpython_location), "-m", "pip", *pip_options, _env=self.get_hostrecipe_env())
 
     def restore_hostpython_prerequisites(self, packages):
         _packages = []
@@ -1088,13 +1083,12 @@ def build_compiled_components(self, arch):
                     env['STRIP'], '{}', ';', _env=env)
 
     def install_hostpython_package(self, arch):
-        env = self.get_hostrecipe_env(arch)
+        env = self.get_hostrecipe_env()
         self.rebuild_compiled_components(arch, env)
         super().install_hostpython_package(arch)
 
     def rebuild_compiled_components(self, arch, env):
         info('Rebuilding compiled components in {}'.format(self.name))
-
         hostpython = sh.Command(self.real_hostpython_location)
         shprint(hostpython, 'setup.py', 'clean', '--all', _env=env)
         shprint(hostpython, 'setup.py', self.build_cmd, '-v', _env=env,
@@ -1128,7 +1122,7 @@ def build_cython_components(self, arch):
 
         with current_directory(self.get_build_dir(arch.arch)):
             hostpython = sh.Command(self.ctx.hostpython)
-            shprint(hostpython, '-c', 'import sys; print(sys.path)', _env=env)
+            shprint(hostpython, '-c', 'import sys; print(sys.path, sys.exec_prefix, sys.prefix)', _env=env)
             debug('cwd is {}'.format(realpath(curdir)))
             info('Trying first build of {} to get cython files: this is '
                  'expected to fail'.format(self.name))

Diff for: pythonforandroid/recipes/android/__init__.py

@@ -1,23 +1,24 @@
-from pythonforandroid.recipe import CythonRecipe, IncludedFilesBehaviour
+from pythonforandroid.recipe import PyProjectRecipe, IncludedFilesBehaviour, Recipe
 from pythonforandroid.util import current_directory
 from pythonforandroid import logger
 
 from os.path import join
 
 
-class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
+class AndroidRecipe(IncludedFilesBehaviour, PyProjectRecipe):
     # name = 'android'
     version = None
     url = None
 
     src_filename = 'src'
 
     depends = [('sdl2', 'genericndkbuild'), 'pyjnius']
+    hostpython_prerequisites = ["cython"]
 
     config_env = {}
 
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         env.update(self.config_env)
         return env
 
@@ -49,6 +50,9 @@ def prebuild_arch(self, arch):
             'BOOTSTRAP': bootstrap,
             'IS_SDL2': int(is_sdl2),
             'PY2': 0,
+            'ANDROID_LIBS_DIR':join(
+                Recipe.get_recipe("sdl2", self.ctx).get_build_dir(arch.arch), "../..", "libs", arch.arch
+            ),
             'JAVA_NAMESPACE': java_ns,
             'JNI_NAMESPACE': jni_ns,
             'ACTIVITY_CLASS_NAME': self.ctx.activity_class_name,

Diff for: pythonforandroid/recipes/android/src/setup.py

@@ -1,24 +1,38 @@
 from distutils.core import setup, Extension
+from Cython.Build import cythonize
 import os
 
-library_dirs = ['libs/' + os.environ['ARCH']]
+# Define the library directories
+library_dirs = [os.environ['ANDROID_LIBS_DIR']]
 lib_dict = {
     'sdl2': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf']
 }
 sdl_libs = lib_dict.get(os.environ['BOOTSTRAP'], ['main'])
 
-modules = [Extension('android._android',
-                     ['android/_android.c', 'android/_android_jni.c'],
-                     libraries=sdl_libs + ['log'],
-                     library_dirs=library_dirs),
-           Extension('android._android_billing',
-                     ['android/_android_billing.c', 'android/_android_billing_jni.c'],
-                     libraries=['log'],
-                     library_dirs=library_dirs)]
+# Define the extensions with Cython
+modules = [
+    Extension('android._android',
+              ['android/_android.pyx', 'android/_android_jni.c'],
+              libraries=sdl_libs + ['log'],
+              library_dirs=library_dirs),
+    Extension('android._android_billing',
+              ['android/_android_billing.pyx', 'android/_android_billing_jni.c'],
+              libraries=['log'],
+              library_dirs=library_dirs),
+    Extension('android._android_sound',
+              ['android/_android_sound.pyx', 'android/_android_sound_jni.c'],
+              libraries=['log'],
+              library_dirs=library_dirs)
+]
 
+
+# Use cythonize to build the modules
+cythonized_modules = cythonize(modules, compiler_directives={'language_level': "3"})
+
+# Setup the package
 setup(name='android',
       version='1.0',
       packages=['android'],
       package_dir={'android': 'android'},
-      ext_modules=modules
+      ext_modules=cythonized_modules
       )

Diff for: pythonforandroid/recipes/hostpython3/__init__.py

@@ -47,8 +47,6 @@ class HostPython3Recipe(Recipe):
     '''The default url to download our host python recipe. This url will
     change depending on the python version set in attribute :attr:`version`.'''
 
-    patches = ['patches/pyconfig_detection.patch']
-
     @property
     def _exe_name(self):
         '''

Diff for: pythonforandroid/recipes/hostpython3/patches/pyconfig_detection.patch

@@ -1,12 +1,13 @@
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.toolchain import current_directory, shprint
+from os.path import join
 import sh
 
 
 class Libb2Recipe(Recipe):
     version = '0.98.1'
     url = 'https://github.com/BLAKE2/libb2/releases/download/v{version}/libb2-{version}.tar.gz'
-    built_libraries = {'libb2.so': './src/.libs/'}
+    built_libraries = {'libb2.so': './src/.libs/', "libomp.so": "./src/.libs"}
 
     def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
@@ -17,6 +18,8 @@ def build_arch(self, arch):
             configure = sh.Command('./configure')
             shprint(configure, *flags, _env=env)
             shprint(sh.make, _env=env)
+            arch_ = {"armeabi-v7a":"arm", "arm64-v8a": "aarch64", "x86_64":"x86_64", "x86":"i386"}[arch.arch]
+            shprint(sh.cp, join(self.ctx.ndk.llvm_prebuilt_dir, f"lib64/clang/14.0.6/lib/linux/{arch_}/libomp.so") , "./src/.libs")
 
 
 recipe = Libb2Recipe()

Diff for: pythonforandroid/recipes/libb2/__init__.py

@@ -1,21 +1,20 @@
-from pythonforandroid.recipe import CythonRecipe
+from pythonforandroid.recipe import PyProjectRecipe
 from pythonforandroid.toolchain import shprint, current_directory, info
 from pythonforandroid.patching import will_build
 import sh
 from os.path import join
 
 
-class PyjniusRecipe(CythonRecipe):
+class PyjniusRecipe(PyProjectRecipe):
     version = '1.6.1'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('genericndkbuild', 'sdl2'), 'six']
+    depends = ['six']
     site_packages_name = 'jnius'
-
     patches = [('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))]
 
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         # NDKPLATFORM is our switch for detecting Android platform, so can't be None
         env['NDKPLATFORM'] = "NOTNONE"
         return env

Diff for: pythonforandroid/recipes/pyjnius/__init__.py

@@ -194,7 +194,6 @@ def link_root(self, arch_name):
         return join(self.get_build_dir(arch_name), 'android-build')
 
     def should_build(self, arch):
-        return True
         return not Path(self.link_root(arch.arch), self._libpython).is_file()
 
     def prebuild_arch(self, arch):

Diff for: pythonforandroid/recipes/python3/__init__.py

@@ -3,9 +3,10 @@
 
 class SetuptoolsRecipe(PythonRecipe):
     version = '69.2.0'
-    url = 'https://pypi.python.org/packages/source/s/setuptools/setuptools-{version}.tar.gz'
+    url = ''
     call_hostpython_via_targetpython = False
     install_in_hostpython = True
+    hostpython_prerequisites = [f"setuptools=={version}"]
 
 
 recipe = SetuptoolsRecipe()

Diff for: pythonforandroid/recipes/setuptools/__init__.py

@@ -1034,7 +1034,7 @@ def _build_package(self, args, package_type):
                 # .../build/bootstrap_builds/sdl2-python3/gradlew
                 # if docker on windows, gradle contains CRLF
                 output = shprint(
-                    sh.Command('dos2unix'), gradlew._path.decode('utf8'),
+                    sh.Command('dos2unix'), gradlew._path,
                     _tail=20, _critical=True, _env=env
                 )
             if args.build_mode == "debug":