Removed some more pygame references

Author: inclement

pythonforandroid/recipes/android/__init__.py

@@ -14,8 +14,7 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
 
     src_filename = 'src'
 
-    depends = [('pygame', 'sdl2', 'genericndkbuild'),
-               'pyjnius']
+    depends = [('sdl2', 'genericndkbuild'), 'pyjnius']
 
     config_env = {}
 
@@ -39,17 +38,13 @@ def prebuild_arch(self, arch):
         bootstrap = bootstrap_name = ctx_bootstrap
 
         is_sdl2 = bootstrap_name in ('sdl2', 'sdl2python3', 'sdl2_gradle')
-        is_pygame = bootstrap_name in ('pygame',)
         is_webview = bootstrap_name in ('webview',)
 
         if is_sdl2 or is_webview:
             if is_sdl2:
                 bootstrap = 'sdl2'
             java_ns = 'org.kivy.android'
             jni_ns = 'org/kivy/android'
-        elif is_pygame:
-            java_ns = b'org.renpy.android'
-            jni_ns = b'org/renpy/android'
         else:
             logger.error((
                 'unsupported bootstrap for android recipe: {}'
@@ -60,7 +55,6 @@ def prebuild_arch(self, arch):
         config = {
             'BOOTSTRAP': bootstrap,
             'IS_SDL2': int(is_sdl2),
-            'IS_PYGAME': int(is_pygame),
             'PY2': int(will_build('python2')(self)),
             'JAVA_NAMESPACE': java_ns,
             'JNI_NAMESPACE': jni_ns,
@@ -88,8 +82,5 @@ def prebuild_arch(self, arch):
                 fh.write(
                     '#define SDL_ANDROID_GetJNIEnv SDL_AndroidGetJNIEnv\n'
                 )
-            elif is_pygame:
-                fh.write('JNIEnv *SDL_ANDROID_GetJNIEnv(void);\n')
-
 
 recipe = AndroidRecipe()

pythonforandroid/recipes/android/src/setup.py

@@ -3,16 +3,10 @@
 
 library_dirs = ['libs/' + os.environ['ARCH']]
 lib_dict = {
-    'pygame': ['sdl'],
     'sdl2': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf']
 }
 sdl_libs = lib_dict[os.environ['BOOTSTRAP']]
 
-renpy_sound = Extension('android._android_sound',
-                        ['android/_android_sound.c', 'android/_android_sound_jni.c', ],
-                        libraries=sdl_libs + ['log'],
-                        library_dirs=library_dirs)
-
 modules = [Extension('android._android',
                      ['android/_android.c', 'android/_android_jni.c'],
                      libraries=sdl_libs + ['log'],
@@ -22,10 +16,6 @@
                      libraries=['log'],
                      library_dirs=library_dirs)]
 
-if int(os.environ['IS_PYGAME']):
-    modules.append(renpy_sound)
-
-
 setup(name='android',
       version='1.0',
       packages=['android'],

pythonforandroid/recipes/genericndkbuild/__init__.py

@@ -8,7 +8,7 @@ class GenericNDKBuildRecipe(BootstrapNDKRecipe):
     url = None
 
     depends = [('python2', 'python3', 'python3crystax')]
-    conflicts = ['sdl2', 'pygame', 'sdl']
+    conflicts = ['sdl2', 'sdl']
 
     def should_build(self, arch):
         return True

pythonforandroid/recipes/sdl/__init__.py

@@ -11,7 +11,6 @@ class LibSDL2Recipe(BootstrapNDKRecipe):
     dir_name = 'SDL'
 
     depends = ['sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
-    conflicts = ['sdl', 'pygame', 'pygame_bootstrap_components']
 
     patches = ['add_nativeSetEnv.patch']
 

pythonforandroid/recipes/sdl2/__init__.py

@@ -6,9 +6,6 @@ class SixRecipe(PythonRecipe):
     version = '1.9.0'
     url = 'https://pypi.python.org/packages/source/s/six/six-{version}.tar.gz'
     depends = [('python2', 'python2legacy', 'python3', 'python3crystax')]
-    # this recipe seems to control the dependency graph in some way, because
-    # if removed the python2legacy recipe fails to solve the dependency order
-    # when using the pygame bootstrap...so be careful removing this line!!!
 
 
 recipe = SixRecipe()