SDL2: update to 2.0.6

Changes 2.0.6:

General:
* Added cross-platform Vulkan graphics support in SDL_vulkan.h
        SDL_Vulkan_LoadLibrary()
        SDL_Vulkan_GetVkGetInstanceProcAddr()
        SDL_Vulkan_GetInstanceExtensions()
        SDL_Vulkan_CreateSurface()
        SDL_Vulkan_GetDrawableSize()
        SDL_Vulkan_UnloadLibrary()
  This is all the platform-specific code you need to bring up Vulkan on all SDL platforms. You can look at an example in test/testvulkan.c
* Added SDL_ComposeCustomBlendMode() to create custom blend modes for 2D rendering
* Added SDL_HasNEON() which returns whether the CPU has NEON instruction support
* Added support for many game controllers, including the Nintendo Switch Pro Controller
* Added support for inverted axes and separate axis directions in game controller mappings
* Added functions to return information about a joystick before it's opened:
        SDL_JoystickGetDeviceVendor()
        SDL_JoystickGetDeviceProduct()
        SDL_JoystickGetDeviceProductVersion()
        SDL_JoystickGetDeviceType()
        SDL_JoystickGetDeviceInstanceID()
* Added functions to return information about an open joystick:
        SDL_JoystickGetVendor()
        SDL_JoystickGetProduct()
        SDL_JoystickGetProductVersion()
        SDL_JoystickGetType()
        SDL_JoystickGetAxisInitialState()
* Added functions to return information about an open game controller:
        SDL_GameControllerGetVendor()
        SDL_GameControllerGetProduct()
        SDL_GameControllerGetProductVersion()
* Added SDL_GameControllerNumMappings() and SDL_GameControllerMappingForIndex() to be able to enumerate the built-in game controller mappings
* Added SDL_LoadFile() and SDL_LoadFile_RW() to load a file into memory
* Added SDL_DuplicateSurface() to make a copy of a surface
* Added an experimental JACK audio driver
* Implemented non-power-of-two audio resampling, optionally using libsamplerate to perform the resampling
* Added the hint SDL_HINT_AUDIO_RESAMPLING_MODE to control the quality of resampling
* Added the hint SDL_HINT_RENDER_LOGICAL_SIZE_MODE to control the scaling policy for SDL_RenderSetLogicalSize():
        "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen (the default)
        "1" or "overscan"  - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen
* Added the hints SDL_HINT_MOUSE_NORMAL_SPEED_SCALE and SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE to scale the mouse speed when being read from raw mouse input
* Added the hint SDL_HINT_TOUCH_MOUSE_EVENTS to control whether SDL will synthesize mouse events from touch events

8 files changed, 46 insertions, 108 deletions

diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile
index 4d19aabae63..d70256494ac 100644
--- a/devel/SDL2/Makefile
+++ b/devel/SDL2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2017/09/08 02:38:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2017/09/26 13:10:56 adam Exp $
 
-DISTNAME=	SDL2-2.0.5
-PKGREVISION=	5
+DISTNAME=	SDL2-2.0.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 
@@ -10,13 +9,15 @@ HOMEPAGE=	http://www.libsdl.org/
 COMMENT=	Simple DirectMedia Layer is a cross-platform multimedia library
 LICENSE=	zlib
 
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
-USE_TOOLS+=	gmake pkg-config autoconf automake autoreconf
-
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake pkg-config autoconf automake autoreconf
+GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	sdl2.pc.in
 
+CHECK_PORTABILITY_SKIP+=build-scripts/androidbuildlibs.sh
+CHECK_PORTABILITY_SKIP+=build-scripts/iosbuild.sh
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Linux"
diff --git a/devel/SDL2/PLIST b/devel/SDL2/PLIST
index d5d892acb16..3bf67aac4e7 100644
--- a/devel/SDL2/PLIST
+++ b/devel/SDL2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/01/03 11:15:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/09/26 13:10:56 adam Exp $
 bin/sdl2-config
 include/SDL2/SDL.h
 include/SDL2/SDL_assert.h
@@ -68,11 +68,12 @@ include/SDL2/SDL_touch.h
 include/SDL2/SDL_types.h
 include/SDL2/SDL_version.h
 include/SDL2/SDL_video.h
+include/SDL2/SDL_vulkan.h
 include/SDL2/begin_code.h
 include/SDL2/close_code.h
 lib/cmake/SDL2/sdl2-config.cmake
 lib/libSDL2.la
-lib/libSDL2_test.a
-lib/libSDL2main.a
+lib/libSDL2_test.la
+lib/libSDL2main.la
 lib/pkgconfig/sdl2.pc
 share/aclocal/sdl2.m4
diff --git a/devel/SDL2/distinfo b/devel/SDL2/distinfo
index 87bcce2068a..091d41f4cb0 100644
--- a/devel/SDL2/distinfo
+++ b/devel/SDL2/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.25 2017/09/05 09:02:18 he Exp $
+$NetBSD: distinfo,v 1.26 2017/09/26 13:10:56 adam Exp $
 
-SHA1 (SDL2-2.0.5.tar.gz) = c4f87580630387796df4ac87c362b4f9a721457e
-RMD160 (SDL2-2.0.5.tar.gz) = 91283ce74bd451e83651910259cf226cae70e4bb
-SHA512 (SDL2-2.0.5.tar.gz) = 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750
-Size (SDL2-2.0.5.tar.gz) = 4209352 bytes
+SHA1 (SDL2-2.0.6.tar.gz) = 9382b0b5a88767283dca8481bfddf23c75b3db1b
+RMD160 (SDL2-2.0.6.tar.gz) = 24f69367f70a8c2c43b766f7d3fbada8f7d7a52b
+SHA512 (SDL2-2.0.6.tar.gz) = ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830
+Size (SDL2-2.0.6.tar.gz) = 4420311 bytes
 SHA1 (patch-configure) = 5637a66f8890586026034f5324829e61c94ac5be
-SHA1 (patch-src_audio_bsd_SDL__bsdaudio.c) = 2c57a04b4c0bf2f07bde782b2cbf041694539349
-SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = fc2c8f50b55ae86a1f89e2b829322231240dee7d
+SHA1 (patch-src_audio_netbsd_SDL__netbsdaudio.c) = 7a1f32ea7029f8dc99aecfaead7c68f2fd6cb230
 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 37f19752cbba8def12a210deafec66965e3ad9ac
-SHA1 (patch-src_video_SDL__blit__N.c) = 73c15497e94c94f27e1c0f7463cf711f084d0635
-SHA1 (patch-src_video_SDL__egl.c) = dc6e8044d060a134548f113602258a0155eaa4da
+SHA1 (patch-src_video_SDL__egl.c) = eea0cb838e34066cd80373c0becc9eecbc8b1570
 SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0
diff --git a/devel/SDL2/options.mk b/devel/SDL2/options.mk
index 7a93d786da6..0eaabebe8d6 100644
--- a/devel/SDL2/options.mk
+++ b/devel/SDL2/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2015/02/11 20:32:20 snj Exp $
+# $NetBSD: options.mk,v 1.6 2017/09/26 13:10:56 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.SDL2
 PKG_OPTIONS_REQUIRED_GROUPS=	gl
-PKG_SUPPORTED_OPTIONS=	alsa arts dbus esound nas oss pulseaudio x11
+PKG_SUPPORTED_OPTIONS=	alsa dbus esound nas oss pulseaudio x11
 PKG_OPTIONS_GROUP.gl=	opengl
 PKG_SUGGESTED_OPTIONS+=	oss
 
@@ -25,10 +25,6 @@ PKG_SUGGESTED_OPTIONS+=	opengl
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Marts)
-.include "../../audio/arts/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mdbus)
 .include "../../sysutils/dbus/buildlink3.mk"
 .endif
diff --git a/devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c b/devel/SDL2/patches/patch-src_audio_netbsd_SDL__netbsdaudio.c
index 94df7cbbcf0..1481765478f 100644
--- a/devel/SDL2/patches/patch-src_audio_bsd_SDL__bsdaudio.c
+++ b/devel/SDL2/patches/patch-src_audio_netbsd_SDL__netbsdaudio.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_audio_bsd_SDL__bsdaudio.c,v 1.5 2017/01/26 03:46:20 nat Exp $
+$NetBSD: patch-src_audio_netbsd_SDL__netbsdaudio.c,v 1.1 2017/09/26 13:10:56 adam Exp $
 
-# Remove delay as there is already an inherent delay in writing audio.
+Remove delay as there is already an inherent delay in writing audio.
 https://bugzilla.libsdl.org/show_bug.cgi?id=3177
 
-# audio_prinfo needs 'struct' on NetBSD.
-# Use correct prinfo.
-# Inform upper layer of blocksize.
+audio_prinfo needs 'struct' on NetBSD.
+Use correct prinfo.
+Inform upper layer of blocksize
 
---- src/audio/bsd/SDL_bsdaudio.c.orig	2016-10-20 03:56:26.000000000 +0000
-+++ src/audio/bsd/SDL_bsdaudio.c
-@@ -62,14 +62,14 @@ BSDAUDIO_Status(_THIS)
+--- src/audio/netbsd/SDL_netbsdaudio.c.orig	2017-09-26 12:34:35.000000000 +0000
++++ src/audio/netbsd/SDL_netbsdaudio.c
+@@ -63,14 +63,14 @@ NETBSDAUDIO_Status(_THIS)
  #ifdef DEBUG_AUDIO
      /* *INDENT-OFF* */
      audio_info_t info;
@@ -26,7 +26,7 @@ https://bugzilla.libsdl.org/show_bug.cgi?id=3177
  
      fprintf(stderr, "\n"
              "[%s info]\n"
-@@ -190,10 +190,6 @@ BSDAUDIO_PlayDevice(_THIS)
+@@ -184,10 +184,6 @@ NETBSDAUDIO_PlayDevice(_THIS)
          fprintf(stderr, "Wrote %d bytes of audio data\n", written);
  #endif
  
@@ -37,7 +37,7 @@ https://bugzilla.libsdl.org/show_bug.cgi?id=3177
      } while (p < this->hidden->mixlen);
  
      /* If timer synchronization is enabled, set the next write frame */
-@@ -280,7 +276,7 @@ BSDAUDIO_OpenDevice(_THIS, void *handle,
+@@ -274,7 +270,7 @@ NETBSDAUDIO_OpenDevice(_THIS, void *hand
      const int flags = iscapture ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT;
      SDL_AudioFormat format = 0;
      audio_info_t info;
@@ -46,7 +46,7 @@ https://bugzilla.libsdl.org/show_bug.cgi?id=3177
  
      /* We don't care what the devname is...we'll try to open anything. */
      /*  ...but default to first name in the list... */
-@@ -372,6 +368,7 @@ BSDAUDIO_OpenDevice(_THIS, void *handle,
+@@ -366,6 +362,7 @@ NETBSDAUDIO_OpenDevice(_THIS, void *hand
      (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info);
      (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info);
      this->spec.freq = prinfo->sample_rate;
diff --git a/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.c b/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.c
deleted file mode 100644
index 73365e151bf..00000000000
--- a/devel/SDL2/patches/patch-src_audio_sun_SDL__sunaudio.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_audio_sun_SDL__sunaudio.c,v 1.1 2016/12/11 19:42:46 wiedi Exp $
-
-move decleration up because SDL wants to use -Werror=declaration-after-statement
-
---- src/audio/sun/SDL_sunaudio.c.orig	2016-10-20 03:56:26.000000000 +0000
-+++ src/audio/sun/SDL_sunaudio.c
-@@ -193,6 +193,10 @@ SUNAUDIO_CloseDevice(_THIS)
- static int
- SUNAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
- {
-+#ifdef AUDIO_SETINFO
-+    int enc;
-+#endif
-+    int desired_freq = 0;
-     const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
-     SDL_AudioFormat format = 0;
-     audio_info_t info;
-@@ -220,10 +224,7 @@ SUNAUDIO_OpenDevice(_THIS, void *handle,
-         return SDL_SetError("Couldn't open %s: %s", devname, strerror(errno));
-     }
- 
--#ifdef AUDIO_SETINFO
--    int enc;
--#endif
--    int desired_freq = this->spec.freq;
-+    desired_freq = this->spec.freq;
- 
-     /* Determine the audio parameters from the AudioSpec */
-     switch (SDL_AUDIO_BITSIZE(this->spec.format)) {
diff --git a/devel/SDL2/patches/patch-src_video_SDL__blit__N.c b/devel/SDL2/patches/patch-src_video_SDL__blit__N.c
deleted file mode 100644
index 92a48e585a8..00000000000
--- a/devel/SDL2/patches/patch-src_video_SDL__blit__N.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-src_video_SDL__blit__N.c,v 1.1 2017/09/05 09:02:18 he Exp $
-
-Put code after declarations.
-
---- src/video/SDL_blit_N.c.orig	2016-10-20 03:56:26.000000000 +0000
-+++ src/video/SDL_blit_N.c
-@@ -118,12 +118,6 @@ calc_swizzle32(const SDL_PixelFormat * s
-         16, 8, 0, 24,
-         0, NULL
-     };
--    if (!srcfmt) {
--        srcfmt = &default_pixel_format;
--    }
--    if (!dstfmt) {
--        dstfmt = &default_pixel_format;
--    }
-     const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
-                                                        0x04, 0x04, 0x04, 0x04,
-                                                        0x08, 0x08, 0x08, 0x08,
-@@ -136,6 +130,13 @@ calc_swizzle32(const SDL_PixelFormat * s
-     Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
-     Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
-     Uint32 amask;
-+
-+    if (!srcfmt) {
-+        srcfmt = &default_pixel_format;
-+    }
-+    if (!dstfmt) {
-+        dstfmt = &default_pixel_format;
-+    }
-     /* Use zero for alpha if either surface doesn't have alpha */
-     if (dstfmt->Amask) {
-         amask =
diff --git a/devel/SDL2/patches/patch-src_video_SDL__egl.c b/devel/SDL2/patches/patch-src_video_SDL__egl.c
index a6b5fcfd259..691bd35e36f 100644
--- a/devel/SDL2/patches/patch-src_video_SDL__egl.c
+++ b/devel/SDL2/patches/patch-src_video_SDL__egl.c
@@ -1,19 +1,23 @@
-$NetBSD: patch-src_video_SDL__egl.c,v 1.4 2017/01/26 03:46:20 nat Exp $
+$NetBSD: patch-src_video_SDL__egl.c,v 1.5 2017/09/26 13:10:56 adam Exp $
 
---- src/video/SDL_egl.c.orig	2016-10-20 03:56:26.000000000 +0000
+--- src/video/SDL_egl.c.orig	2017-09-22 18:51:01.000000000 +0000
 +++ src/video/SDL_egl.c
-@@ -40,10 +40,10 @@
+@@ -44,12 +44,12 @@
  
  #if SDL_VIDEO_DRIVER_RPI
  /* Raspbian places the OpenGL ES/EGL binaries in a non standard path */
--#define DEFAULT_EGL "/opt/vc/lib/libEGL.so"
--#define DEFAULT_OGL_ES2 "/opt/vc/lib/libGLESv2.so"
+-#define DEFAULT_EGL "/opt/vc/lib/libbrcmEGL.so"
+-#define DEFAULT_OGL_ES2 "/opt/vc/lib/libbrcmGLESv2.so"
+-#define ALT_EGL "/opt/vc/lib/libEGL.so"
+-#define ALT_OGL_ES2 "/opt/vc/lib/libGLESv2.so"
 -#define DEFAULT_OGL_ES_PVR "/opt/vc/lib/libGLES_CM.so"
 -#define DEFAULT_OGL_ES "/opt/vc/lib/libGLESv1_CM.so"
-+#define DEFAULT_EGL PREFIX "/lib/libEGL.so"
-+#define DEFAULT_OGL_ES2 PREFIX "/lib/libGLESv2.so"
-+#define DEFAULT_OGL_ES_PVR PREFIX "/lib/libGLESv2.so"
-+#define DEFAULT_OGL_ES PREFIX "/lib/libGLESv2.so"
++#define DEFAULT_EGL "/lib/libbrcmEGL.so"
++#define DEFAULT_OGL_ES2 "/lib/libbrcmGLESv2.so"
++#define ALT_EGL "/lib/libEGL.so"
++#define ALT_OGL_ES2 "/lib/libGLESv2.so"
++#define DEFAULT_OGL_ES_PVR "/lib/libGLES_CM.so"
++#define DEFAULT_OGL_ES "/lib/libGLESv1_CM.so"
  
  #elif SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_VIVANTE
  /* Android */