Reverse some (now) unwanted changes, and set conflicts appropriately

Author: misl6

pythonforandroid/bootstraps/common/build/build.py

@@ -78,7 +78,7 @@ def get_bootstrap_name():
     _bootstrap_name = get_bootstrap_name()
 else:
     PYTHON = "python3"
-    _bootstrap_name = "sdl3"
+    _bootstrap_name = "sdl2"
 
 if PYTHON is not None and not exists(PYTHON):
     PYTHON = None

pythonforandroid/bootstraps/sdl3/__init__.py

@@ -10,6 +10,8 @@
 class SDL3GradleBootstrap(Bootstrap):
     name = 'sdl3'
 
+    conflicts = ['sdl2']
+
     recipe_depends = list(
         set(Bootstrap.recipe_depends).union({'sdl3'})
     )

pythonforandroid/recipes/android/__init__.py

@@ -12,7 +12,7 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
 
     src_filename = 'src'
 
-    depends = [('sdl3',  'genericndkbuild'), 'pyjnius']
+    depends = [('sdl3', 'sdl2', 'genericndkbuild'), 'pyjnius']
 
     config_env = {}
 

pythonforandroid/recipes/ffmpeg/__init__.py

@@ -7,7 +7,7 @@ class FFMpegRecipe(Recipe):
     version = 'n6.1.2'
     # Moved to github.com instead of ffmpeg.org to improve download speed
     url = 'https://github.com/FFmpeg/FFmpeg/archive/{version}.zip'
-    depends = ['sdlx']  # Need this to build correct recipe order
+    depends = ['sdl2']  # Need this to build correct recipe order
     opts_depends = ['openssl', 'ffpyplayer_codecs', 'av_codecs']
     patches = ['patches/configure.patch']
 

pythonforandroid/recipes/ffpyplayer/__init__.py

@@ -5,7 +5,7 @@
 class FFPyPlayerRecipe(PyProjectRecipe):
     version = 'v4.5.1'
     url = 'https://github.com/matham/ffpyplayer/archive/{version}.zip'
-    depends = ['python3', 'sdlx', 'ffmpeg']
+    depends = ['python3', 'sdl2', 'ffmpeg']
     patches = ["setup.py.patch"]
     opt_depends = ['openssl', 'ffpyplayer_codecs']
 

pythonforandroid/recipes/kivy/__init__.py

@@ -27,7 +27,7 @@ class KivyRecipe(CythonRecipe):
     url = 'https://github.com/misl6/kivy/archive/refs/heads/feat/sdl2-to-sdl3.zip'
     name = 'kivy'
 
-    depends = ['sdl3', 'pyjnius', 'setuptools']
+    depends = [('sdl2', 'sdl3'), 'pyjnius', 'setuptools']
     python_depends = ['certifi', 'chardet', 'idna', 'requests', 'urllib3', 'filetype']
     hostpython_prerequisites = []
 

pythonforandroid/recipes/pyjnius/__init__.py

@@ -9,7 +9,7 @@ class PyjniusRecipe(CythonRecipe):
     version = '1.6.1'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('genericndkbuild', 'sdl3'), 'six']
+    depends = [('genericndkbuild', 'sdl2', 'sdl3'), 'six']
     site_packages_name = 'jnius'
 
     patches = [

pythonforandroid/recipes/sdl2/__init__.py

@@ -10,6 +10,8 @@ class LibSDL2Recipe(BootstrapNDKRecipe):
     url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL2-{version}.tar.gz"
     md5sum = 'a344eb827a03045c9b399e99af4af13d'
 
+    conflicts = ['sdl3']
+
     dir_name = 'SDL'
 
     depends = ['sdl2_image', 'sdl2_mixer', 'sdl2_ttf']