vars/build.vars:native_packages_deps: adds sdl2 v2.0.8 (via Redfoxmoon.)

patches/sdl2-2.0.8.local.patch: via Redfoxmoon.

2 files changed, 63 insertions, 1 deletions

diff --git a/patches/sdl2-2.0.8.local.patch b/patches/sdl2-2.0.8.local.patch
new file mode 100644
index 00000000..cd91a960
--- /dev/null
+++ b/patches/sdl2-2.0.8.local.patch
@@ -0,0 +1,57 @@
+diff -ru SDL2-2.0.8.orig/configure SDL2-2.0.8/configure
+--- SDL2-2.0.8.orig/configure	2018-03-01 17:34:41.000000000 +0100
++++ SDL2-2.0.8/configure	2018-03-26 21:34:16.065368148 +0200
+@@ -23829,7 +23829,7 @@
+ CheckWarnAll
+ 
+ case "$host" in
+-    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*|*-*-nto*)
++    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*|*-*-nto*|*-*-midipix*)
+         case "$host" in
+             *-*-android*)
+                 # Android
+@@ -23854,6 +23854,7 @@
+             *-*-knetbsd*-gnu)   ARCH=knetbsd-gnu ;;
+             *-*-kopenbsd*-gnu)  ARCH=kopenbsd-gnu ;;
+             *-*-gnu*)           ARCH=gnu ;; # must be last of the gnu variants
++            *-*-midipix*)       ARCH=gnu ;;
+             *-*-bsdi*)          ARCH=bsdi ;;
+             *-*-freebsd*)       ARCH=freebsd ;;
+             *-*-dragonfly*)     ARCH=freebsd ;;
+diff -ru SDL2-2.0.8.orig/Makefile.in SDL2-2.0.8/Makefile.in
+--- SDL2-2.0.8.orig/Makefile.in	2018-03-01 17:34:41.000000000 +0100
++++ SDL2-2.0.8/Makefile.in	2018-03-26 22:59:44.238745288 +0200
+@@ -124,7 +124,7 @@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
++all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ 
+ $(srcdir)/configure: $(srcdir)/configure.in
+ 	@echo "Warning, configure is out of date, please re-run autogen.sh"
+@@ -167,11 +167,10 @@
+ 	    $(INSTALL) -m 644 $(srcdir)/include/SDL_revision.h $(DESTDIR)$(includedir)/SDL2/SDL_revision.h; \
+ 	fi
+ 
+-install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
++install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+-	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
+ install-data:
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
+ 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
+diff -ru SDL2-2.0.8.orig/src/dynapi/SDL_dynapi.c SDL2-2.0.8/src/dynapi/SDL_dynapi.c
+--- SDL2-2.0.8.orig/src/dynapi/SDL_dynapi.c	2018-03-01 17:34:42.000000000 +0100
++++ SDL2-2.0.8/src/dynapi/SDL_dynapi.c	2018-03-26 22:05:52.162381490 +0200
+@@ -222,7 +222,7 @@
+     return retval;
+ }
+ 
+-#elif defined(unix) || defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__QNX__)
++#elif defined(unix) || defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__QNX__) || defined(__midipix__)
+ #include <dlfcn.h>
+ static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
+ {
diff --git a/vars/build.vars b/vars/build.vars
index 904301ef..ca7ff247 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -549,7 +549,7 @@ NATIVE_PACKAGES_DEPS_X11_PACKAGES="
 inputproto kbproto xcb_proto xproto fixesproto recordproto libXau libpthread_stubs xcb
 xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender
 libXft libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile
-harfbuzz pixman cairo dbus pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2 gtk3 imlib2 libcaca";
+harfbuzz pixman cairo dbus sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2 gtk3 imlib2 libcaca";
 NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
@@ -659,6 +659,11 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz};
 : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
 : ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:=--disable-tests};
+: ${PKG_SDL2_VERSION:=2.0.8};
+: ${PKG_SDL2_SHA256SUM:=edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec};
+: ${PKG_SDL2_URL:=https://www.libsdl.org/release/SDL2-${PKG_SDL2_VERSION}.tar.gz};
+: ${PKG_SDL2_CONFIGURE_ARGS_EXTRA:="--disable-video-vulkan --disable-video-opengles2 --disable-alsa --disable-static"};
+: ${PKG_SDL2_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_PANGO_VERSION:=1.40.11};
 : ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e};
 : ${PKG_PANGO_URL:=http://ftp.gnome.org/pub/GNOME/sources/pango/${PKG_PANGO_VERSION%.*}/pango-${PKG_PANGO_VERSION}.tar.xz};