sdl2: Update to 2.0.18

x11-packages/sdl2/build.sh

@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="A library for portable low-level access to a video frame
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_LICENSE_FILE="COPYING.txt"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.0.10
-TERMUX_PKG_REVISION=25
+TERMUX_PKG_VERSION=2.0.18
 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL2-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57
+TERMUX_PKG_SHA256=94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c
 TERMUX_PKG_DEPENDS="libandroid-glob, libflac, libogg, libsndfile, libvorbis, libx11, libxau, libxcb, libxcursor, libxdmcp, libxext, libxfixes, libxi, libxinerama, libxrandr, libxrender, libxss, libxxf86vm, pulseaudio"
 TERMUX_PKG_CONFLICTS="libsdl2"
 TERMUX_PKG_REPLACES="libsdl2"
@@ -21,7 +20,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-alsa
 --disable-esd
 --disable-video-wayland
---disable-video-mir
 --disable-video-rpi
 --enable-video-x11-xcursor
 --enable-video-x11-xinerama
@@ -42,10 +40,16 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-ime
 --disable-ibus
 --disable-fcitx
---disable-input-tslib
 --enable-pthreads
 --disable-pthread-sem
 --disable-directx
---disable-sdl-dlopen
 --disable-render-d3d
 "
+
+termux_step_pre_configure() {
+	rm -rf "$TERMUX_PKG_SRCDIR"/Xcode-iOS
+	find "$TERMUX_PKG_SRCDIR" -type f | \
+		xargs -n 1 sed -i \
+		-e 's/\([^A-Za-z0-9_]__ANDROID\)\(__[^A-Za-z0-9_]\)/\1_NO_TERMUX\2/g' \
+		-e 's/\([^A-Za-z0-9_]__ANDROID\)__$/\1_NO_TERMUX__/g'
+}

x11-packages/sdl2/configure.patch

@@ -1,7 +1,6 @@
-diff -uNr SDL2-2.0.9/configure SDL2-2.0.9.mod/configure
---- SDL2-2.0.9/configure	2018-10-31 17:07:22.000000000 +0200
-+++ SDL2-2.0.9.mod/configure	2018-11-09 16:53:56.444723538 +0200
-@@ -23990,23 +23990,6 @@
+--- a/configure
++++ b/configure
+@@ -25041,23 +25041,6 @@
  case "$host" in
      *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*|*-*-nto*)
          case "$host" in
@@ -14,11 +13,11 @@ diff -uNr SDL2-2.0.9/configure SDL2-2.0.9.mod/configure
 -                EXTRA_CFLAGS="$EXTRA_CFLAGS $ANDROID_CFLAGS"
 -                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl -lGLESv1_CM -lGLESv2 -llog -landroid"
 -                SDLMAIN_SOURCES="$srcdir/src/main/android/*.c"
--
 -                if test x$enable_video = xyes; then
 -                    SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
--                    # FIXME: confdefs? Not AC_DEFINE?
--                    $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
+-
+-$as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
+-
 -                    SUMMARY_video="${SUMMARY_video} android"
 -                fi
 -                ;;