From 33182c3591c07ea90c157da419ab0488aa4e123e Mon Sep 17 00:00:00 2001
From: Le Philousophe <lephilousophe@users.noreply.github.com>
Date: Sat, 16 Oct 2021 11:12:24 +0000
Subject: [PATCH] ANDROID: Remove SDL2

We don't use it and it fails to build with newer Debian because source
package doesn't contain everything
---
 .../android-common/packages/libsdl2/build.sh  | 38 -------------------
 toolchains/m4/android/packages_list.m4        |  6 +--
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100755 toolchains/android-common/packages/libsdl2/build.sh

diff --git a/toolchains/android-common/packages/libsdl2/build.sh b/toolchains/android-common/packages/libsdl2/build.sh
deleted file mode 100755
index 5d8d386..0000000
--- a/toolchains/android-common/packages/libsdl2/build.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-HELPERS_DIR=$PACKAGE_DIR/../..
-. $HELPERS_DIR/functions.sh
-
-do_make_bdir
-
-do_pkg_fetch libsdl2
-do_configure
-
-do_make
-do_make install
-
-# SDL uses SDL_config.h to enable features but they depend on architecture being cross-compiled.
-# As we use a unified include directory we must trick, so we move SDL_config.h to an arch
-# dependent name andwe create a toplevel file which selects the good file to include
-mv $PREFIX/include/SDL2/SDL_config.h $PREFIX/include/SDL2/SDL_config_$TARGET.h
-
-cat > $PREFIX/include/SDL2/SDL_config.h <<END
-/*
- * This file is a placeholder put in place to allow SDL install in Android unified toolchain
- * This file is NOT part of SDL but generated by build scripts
-*/
-#if defined(__arm__)
-  #include "SDL_config_arm-linux-androideabi.h"
-#elif defined(__aarch64__)
-  #include "SDL_config_aarch64-linux-android.h"
-#elif defined(__i386__)
-  #include "SDL_config_i686-linux-android.h"
-#elif defined(__x86_64__)
-  #include "SDL_config_x86_64-linux-android.h"
-#else
-  #error "Can't determine target to use, check toolchain build scripts"
-#endif
-END
-
-do_clean_bdir
diff --git a/toolchains/m4/android/packages_list.m4 b/toolchains/m4/android/packages_list.m4
index 1adc2aa..acbe634 100644
--- a/toolchains/m4/android/packages_list.m4
+++ b/toolchains/m4/android/packages_list.m4
@@ -38,12 +38,8 @@ helpers_package(freetype)
 
 helpers_package(fribidi)
 
-# Specific android patched version
-android_package(libsdl2)
-
 # Platform patch provided in android-common
-# Don't depend on SDL2 (paradoxical)
-# We have installed it but it depends on OpenGL so try to avoid these dependencies
+# Don't depend on SDL2
 COPY --from=android-helpers /lib-helpers/packages/libsdl2-net lib-helpers/packages/libsdl2-net
 helpers_package(libsdl2-net)