diff -uprN -x CVS sdl2.orig/Makefile sdl2/Makefile
--- sdl2.orig/Makefile Wed Nov 11 02:02:33 2015
+++ sdl2/Makefile Sun Jan 3 11:54:15 2016
@@ -2,14 +2,13 @@
COMMENT= cross-platform multimedia library
-V= 2.0.3
-REVISION= 0
+V= 2.0.4
DISTNAME= SDL2-${V}
PKGNAME= sdl2-${V}
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
-SHARED_LIBS= SDL2 0.1
+SHARED_LIBS= SDL2 0.2
HOMEPAGE= http://www.libsdl.org/
diff -uprN -x CVS sdl2.orig/distinfo sdl2/distinfo
--- sdl2.orig/distinfo Tue Nov 3 21:22:46 2015
+++ sdl2/distinfo Sun Jan 3 11:40:17 2016
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.0.3.tar.gz) = paaaar+AvM5xP6hzYHc1/nEvRCdqfwSNYKYbsvazyQw=
-SIZE (SDL2-2.0.3.tar.gz) = 3871267
+SHA256 (SDL2-2.0.4.tar.gz) = 2lXlQL9jMYJBU4BdWLWQopw50tUGxtAvpAmu3qshF0s=
+SIZE (SDL2-2.0.4.tar.gz) = 4136230
diff -uprN -x CVS sdl2.orig/patches/patch-Makefile_in
sdl2/patches/patch-Makefile_in
--- sdl2.orig/patches/patch-Makefile_in Thu Oct 31 05:11:11 2013
+++ sdl2/patches/patch-Makefile_in Sun Jan 3 11:49:50 2016
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2013/10/30 18:11:11 bcallah Exp $
---- Makefile.in.orig Thu Oct 24 00:05:29 2013
-+++ Makefile.in Tue Oct 29 23:06:17 2013
-@@ -100,7 +100,7 @@ LT_AGE = @LT_AGE@
+--- Makefile.in.orig Sun Jan 3 06:56:31 2016
++++ Makefile.in Sun Jan 3 11:45:11 2016
+@@ -115,7 +115,7 @@ LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
diff -uprN -x CVS sdl2.orig/patches/patch-src_audio_sndio_SDL_sndioaudio_c
sdl2/patches/patch-src_audio_sndio_SDL_sndioaudio_c
--- sdl2.orig/patches/patch-src_audio_sndio_SDL_sndioaudio_c Mon Mar 17
20:49:46 2014
+++ sdl2/patches/patch-src_audio_sndio_SDL_sndioaudio_c Thu Jan 1 10:00:00 1970
@@ -1,66 +0,0 @@
-$OpenBSD: patch-src_audio_sndio_SDL_sndioaudio_c,v 1.1 2014/03/17 09:49:46
ratchov Exp $
---- src/audio/sndio/SDL_sndioaudio.c.orig Fri Jan 31 12:09:18 2014
-+++ src/audio/sndio/SDL_sndioaudio.c Fri Jan 31 12:38:03 2014
-@@ -209,7 +209,7 @@ SNDIO_OpenDevice(_THIS, const char *devname, int iscap
- this->hidden->mixlen = this->spec.size;
-
- /* !!! FIXME: SIO_DEVANY can be a specific device... */
-- if ((this->hidden->dev = SNDIO_sio_open(NULL, SIO_PLAY, 0)) == NULL) {
-+ if ((this->hidden->dev = SNDIO_sio_open(SIO_DEVANY, SIO_PLAY, 0)) ==
NULL) {
- SNDIO_CloseDevice(this);
- return SDL_SetError("sio_open() failed");
- }
-@@ -229,7 +229,17 @@ SNDIO_OpenDevice(_THIS, const char *devname, int iscap
- par.sig = SDL_AUDIO_ISSIGNED(test_format) ? 1 : 0;
- par.bits = SDL_AUDIO_BITSIZE(test_format);
-
-- if (SNDIO_sio_setpar(this->hidden->dev, &par) == 1) {
-+ if (SNDIO_sio_setpar(this->hidden->dev, &par) == 0) {
-+ continue;
-+ }
-+ if (SNDIO_sio_getpar(this->hidden->dev, &par) == 0) {
-+ SNDIO_CloseDevice(this);
-+ return SDL_SetError("sio_getpar() failed");
-+ }
-+ if (par.bps != SIO_BPS(par.bits)) {
-+ continue;
-+ }
-+ if ((par.bits == 8 * par.bps) || (par.msb)) {
- status = 0;
- break;
- }
-@@ -242,26 +252,21 @@ SNDIO_OpenDevice(_THIS, const char *devname, int iscap
- return SDL_SetError("sndio: Couldn't find any hardware audio
formats");
- }
-
-- if (SNDIO_sio_getpar(this->hidden->dev, &par) == 0) {
-- SNDIO_CloseDevice(this);
-- return SDL_SetError("sio_getpar() failed");
-- }
--
-- if ((par.bits == 32) && (par.sig) && (par.le))
-+ if ((par.bps == 4) && (par.sig) && (par.le))
- this->spec.format = AUDIO_S32LSB;
-- else if ((par.bits == 32) && (par.sig) && (!par.le))
-+ else if ((par.bps == 4) && (par.sig) && (!par.le))
- this->spec.format = AUDIO_S32MSB;
-- else if ((par.bits == 16) && (par.sig) && (par.le))
-+ else if ((par.bps == 2) && (par.sig) && (par.le))
- this->spec.format = AUDIO_S16LSB;
-- else if ((par.bits == 16) && (par.sig) && (!par.le))
-+ else if ((par.bps == 2) && (par.sig) && (!par.le))
- this->spec.format = AUDIO_S16MSB;
-- else if ((par.bits == 16) && (!par.sig) && (par.le))
-+ else if ((par.bps == 2) && (!par.sig) && (par.le))
- this->spec.format = AUDIO_U16LSB;
-- else if ((par.bits == 16) && (!par.sig) && (!par.le))
-+ else if ((par.bps == 2) && (!par.sig) && (!par.le))
- this->spec.format = AUDIO_U16MSB;
-- else if ((par.bits == 8) && (par.sig))
-+ else if ((par.bps == 1) && (par.sig))
- this->spec.format = AUDIO_S8;
-- else if ((par.bits == 8) && (!par.sig))
-+ else if ((par.bps == 1) && (!par.sig))
- this->spec.format = AUDIO_U8;
- else {
- SNDIO_CloseDevice(this);
diff -uprN -x CVS sdl2.orig/patches/patch-src_video_SDL_egl_c
sdl2/patches/patch-src_video_SDL_egl_c
--- sdl2.orig/patches/patch-src_video_SDL_egl_c Thu Jan 1 10:00:00 1970
+++ sdl2/patches/patch-src_video_SDL_egl_c Sun Jan 3 11:49:45 2016
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- src/video/SDL_egl.c.orig Sun Jan 3 11:47:58 2016
++++ src/video/SDL_egl.c Sun Jan 3 11:49:32 2016
+@@ -58,7 +58,12 @@
+ #define DEFAULT_OGL_ES2 "libGLESv2.dll"
+ #define DEFAULT_OGL_ES_PVR "libGLES_CM.dll"
+ #define DEFAULT_OGL_ES "libGLESv1_CM.dll"
+-
++#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"
+ #else
+ /* Desktop Linux */
+ #define DEFAULT_OGL "libGL.so.1"
diff -uprN -x CVS sdl2.orig/patches/patch-src_video_x11_SDL_x11window_c
sdl2/patches/patch-src_video_x11_SDL_x11window_c
--- sdl2.orig/patches/patch-src_video_x11_SDL_x11window_c Sun May 25
11:35:14 2014
+++ sdl2/patches/patch-src_video_x11_SDL_x11window_c Thu Jan 1 10:00:00 1970
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_video_x11_SDL_x11window_c,v 1.1 2014/05/25 01:35:14 brad
Exp $
-
-Fix stack overflow detected by stack protector strong.
-
-https://bugzilla.libsdl.org/show_bug.cgi?id=2513
-http://hg.libsdl.org/SDL/rev/b74a32894c02
-
---- src/video/x11/SDL_x11window.c.orig Sat May 24 14:44:20 2014
-+++ src/video/x11/SDL_x11window.c Sat May 24 14:44:55 2014
-@@ -362,7 +362,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
- Atom _NET_WM_WINDOW_TYPE_NORMAL;
- Atom _NET_WM_PID;
- Atom XdndAware, xdnd_version = 5;
-- Uint32 fevent = 0;
-+ long fevent = 0;
-
- #if SDL_VIDEO_OPENGL_GLX || SDL_VIDEO_OPENGL_EGL
- if ((window->flags & SDL_WINDOW_OPENGL) &&
diff -uprN -x CVS sdl2.orig/pkg/PLIST sdl2/pkg/PLIST
--- sdl2.orig/pkg/PLIST Fri May 22 21:31:14 2015
+++ sdl2/pkg/PLIST Sun Jan 3 11:46:44 2016
@@ -10,6 +10,7 @@ include/SDL2/SDL_blendmode.h
include/SDL2/SDL_clipboard.h
include/SDL2/SDL_config.h
include/SDL2/SDL_cpuinfo.h
+include/SDL2/SDL_egl.h
include/SDL2/SDL_endian.h
include/SDL2/SDL_error.h
include/SDL2/SDL_events.h
@@ -29,8 +30,13 @@ include/SDL2/SDL_mouse.h
include/SDL2/SDL_mutex.h
include/SDL2/SDL_name.h
include/SDL2/SDL_opengl.h
+include/SDL2/SDL_opengl_glext.h
include/SDL2/SDL_opengles.h
include/SDL2/SDL_opengles2.h
+include/SDL2/SDL_opengles2_gl2.h
+include/SDL2/SDL_opengles2_gl2ext.h
+include/SDL2/SDL_opengles2_gl2platform.h
+include/SDL2/SDL_opengles2_khrplatform.h
include/SDL2/SDL_pixels.h
include/SDL2/SDL_platform.h
include/SDL2/SDL_power.h
@@ -65,6 +71,9 @@ include/SDL2/SDL_version.h
include/SDL2/SDL_video.h
include/SDL2/begin_code.h
include/SDL2/close_code.h
+lib/cmake/
+lib/cmake/SDL2/
+lib/cmake/SDL2/sdl2-config.cmake
lib/libSDL2.a
lib/libSDL2.la
@lib lib/libSDL2.so.${LIBSDL2_VERSION}
