Re: update SDL2 to 2.0.8 and security update of sdl2-image to 2.0.3

I've added a README with an example use of the SDL_GAMECONTROLLERCONFIG env
var because I've got repeated questions off list.

On Sun, Mar 11, 2018 at 12:14:32PM +0000, Stuart Henderson wrote:
> On 2018/03/01 19:52, Thomas Frohwein wrote:
> > Index: src/video/SDL_egl.c
> ..
> > +
> > +++#elif defined(__OpenBSD__)
> > +++#define DEFAULT_OGL "libGL.so"
> > +++#define DEFAULT_EGL "libEGL.so"
> > +++#define DEFAULT_OGL_ES2 "libGLESv2.so"
> > +++#define DEFAULT_OGL_ES_PVR "libGLES_CM.so"
> > +++#define DEFAULT_OGL_ES "libGLESv1_CM.so"
>
> +++? There's something wrong here.

Ugh, yes. I guess this exposed that it finds the libraries even with the Linux
naming scheme '*.so.1'. It does run without the patch for this file indeed, but
I added the lines again (without the extra '+') to be consistent with how it
was set up before and with other OS in that file.

>
> > RCS file: /cvs/ports/devel/sdl2-image/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile 12 Jan 2018 19:32:54 -0000 1.8
>
> If there are two things patched in the same mail, please generate
> the diff from a common parent directory.
>

New diff from parent directory below. I tested again with megaglest, neverball,
dungeon crawl stone soup, and a few FNA games without issues.

Index: sdl2/Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- sdl2/Makefile 12 Jan 2018 19:32:54 -0000 1.20
+++ sdl2/Makefile 11 Mar 2018 20:29:52 -0000
@@ -4,14 +4,13 @@ COMMENT= cross-platform multimedia libra
BROKEN-hppa= src/atomic/SDL_spinlock.c:101:2: error: \
#error Please implement for your platform.

-V= 2.0.7
+V= 2.0.8
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES= devel
MASTER_SITES= https://www.libsdl.org/release/
-REVISION= 0

-SHARED_LIBS= SDL2 0.4 # 0.7
+SHARED_LIBS= SDL2 0.5 # 0.8

HOMEPAGE= https://www.libsdl.org/

Index: sdl2/distinfo
===================================================================
RCS file: /cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- sdl2/distinfo 7 Jan 2018 22:56:46 -0000 1.6
+++ sdl2/distinfo 11 Mar 2018 20:29:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.0.7.tar.gz) = 7jXHTEMT4u2hBLFLG4b324SgTuq5Qw1W4AHOomi/TV4=
-SIZE (SDL2-2.0.7.tar.gz) = 4432499
+SHA256 (SDL2-2.0.8.tar.gz) = 7cd8VzCGYdV26EM0TYY44CWngYv/c/j7+rCcPF/Qkuw=
+SIZE (SDL2-2.0.8.tar.gz) = 4909017
Index: sdl2/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- sdl2/patches/patch-Makefile_in 7 Jan 2018 22:56:46 -0000 1.4
+++ sdl2/patches/patch-Makefile_in 11 Mar 2018 20:29:52 -0000
@@ -1,6 +1,5 @@
$OpenBSD: patch-Makefile_in,v 1.4 2018/01/07 22:56:46 awolk Exp $

-Should make sure only libSDL2, not libSDL2-2.0 are installed
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
Index: sdl2/patches/patch-src_joystick_SDL_gamecontroller_c
===================================================================
RCS file: /cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontroller_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_joystick_SDL_gamecontroller_c
--- sdl2/patches/patch-src_joystick_SDL_gamecontroller_c 7 Jan 2018 22:56:46 -0000 1.1
+++ sdl2/patches/patch-src_joystick_SDL_gamecontroller_c 11 Mar 2018 20:29:52 -0000
@@ -1,15 +1,15 @@
$OpenBSD: patch-src_joystick_SDL_gamecontroller_c,v 1.1 2018/01/07 22:56:46 awolk Exp $

-enable GameController API the Linux way (by posing as Xbox360 controller)
+enable GameController API the Linux fallback way (by posing as Xbox360
+controller)
also disable checking string "Xbox 360 Wireless Receiver", so for now
everything will be Xbox360 controller (works with generic joysticks)
-- note: the actual Xbox360 controller has buttons and axes messed up on
- openbsd with these mappings
+map to SDL_GAMECONTROLLERCONFIG envvar if available

Index: src/joystick/SDL_gamecontroller.c
--- src/joystick/SDL_gamecontroller.c.orig
+++ src/joystick/SDL_gamecontroller.c
-@@ -884,15 +884,15 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa
+@@ -884,15 +884,21 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa
#else
(void) s_pEmscriptenMapping; /* pacify ARMCC */