Changes 2.0.2:

General:
* Added SDL_GL_ResetAttributes() to reset OpenGL attributes to default values
* Added an API to load a database of game controller mappings from a file:
    SDL_GameControllerAddMappingsFromFile(), SDL_GameControllerAddMappingsFromRW()
* Added game controller mappings for the PS4 and OUYA controllers
* Added SDL_GetDefaultAssertionHandler() and SDL_GetAssertionHandler()
* Added SDL_DetachThread()
* Added SDL_HasAVX() to determine if the CPU has AVX features
* Added SDL_vsscanf(), SDL_acos(), and SDL_asin() to the stdlib routines
* EGL can now create/manage OpenGL and OpenGL ES 1.x/2.x contexts, and share
  them using SDL_GL_SHARE_WITH_CURRENT_CONTEXT
* Added a field "clicks" to the mouse button event which records whether the event is a single click, double click, etc.
* The screensaver is now disabled by default, and there is a hint SDL_HINT_VIDEO_ALLOW_SCREENSAVER that can change that behavior.
* Added a hint SDL_HINT_MOUSE_RELATIVE_MODE_WARP to specify whether mouse relative mode should be emulated using mouse warping.
* testgl2 does not need to link with libGL anymore
* Added testgles2 test program to demonstrate working with OpenGL ES 2.0
* Added controllermap test program to visually map a game controller

Windows:
* Support for OpenGL ES 2.x contexts using either WGL or EGL (natively via
  the driver or emulated through ANGLE)
* Added a hint SDL_HINT_VIDEO_WIN_D3DCOMPILER to specify which D3D shader compiler to use for OpenGL ES 2 support through ANGLE
* Added a hint SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT that is useful when creating multiple windows that should share the same OpenGL context.
* Added an event SDL_RENDER_TARGETS_RESET that is sent when D3D9 render targets are reset after the device has been restored.

Mac OS X:
* Added a hint SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK to control whether Ctrl+click should be treated as a right click on Mac OS X. This is off by default.

Linux:
* Fixed fullscreen and focused behavior when receiving NotifyGrab events
* Added experimental Wayland and Mir support, disabled by default

Android:
* Joystick support (minimum SDK version required to build SDL is now 12,
  the required runtime version remains at 10, but on such devices joystick
  support won't be available).
* Hotplugging support for joysticks
* Added a hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK to control whether the accelerometer should be listed as a 3 axis joystick, which it will by default.

5 files changed, 35 insertions, 35 deletions

diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile
index 739a05d8426..595154e6ea1 100644
--- a/devel/SDL2/Makefile
+++ b/devel/SDL2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2013/11/25 12:00:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 13:25:49 adam Exp $
 
-DISTNAME=	SDL2-2.0.1
-PKGREVISION=	1
+DISTNAME=	SDL2-2.0.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL2/PLIST b/devel/SDL2/PLIST
index c0b686a2069..1a269bb8862 100644
--- a/devel/SDL2/PLIST
+++ b/devel/SDL2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/11/02 20:20:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/03/13 13:25:49 adam Exp $
 bin/sdl2-config
 include/SDL2/SDL.h
 include/SDL2/SDL_assert.h
@@ -18,6 +18,7 @@ include/SDL2/SDL_config_windows.h
 include/SDL2/SDL_config_wiz.h
 include/SDL2/SDL_copying.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
@@ -74,8 +75,8 @@ include/SDL2/SDL_video.h
 include/SDL2/begin_code.h
 include/SDL2/close_code.h
 lib/libSDL2-2.0.so
-lib/libSDL2-2.0.so.1
-lib/libSDL2-2.0.so.1.0.1
+lib/libSDL2-2.0.so.0
+lib/libSDL2-2.0.so.0.2.0
 lib/libSDL2.a
 lib/libSDL2.so
 lib/libSDL2main.a
diff --git a/devel/SDL2/distinfo b/devel/SDL2/distinfo
index 3c4818f924d..901ea7e992b 100644
--- a/devel/SDL2/distinfo
+++ b/devel/SDL2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2013/11/02 20:20:07 adam Exp $
+$NetBSD: distinfo,v 1.3 2014/03/13 13:25:49 adam Exp $
 
-SHA1 (SDL2-2.0.1.tar.gz) = e40051311b648e4e60ed1683f62a948d93a0a49f
-RMD160 (SDL2-2.0.1.tar.gz) = 35c3219f3dd38b7a742563689c574037824d6908
-Size (SDL2-2.0.1.tar.gz) = 3660224 bytes
-SHA1 (patch-CMakeLists.txt) = 7809461b484953351e4bf0e4cbbf4622b18ca583
-SHA1 (patch-src_cpuinfo_SDL_cpuinfo.c) = c39dc0286b323f980c9b9a2889223f5312deb3ce
+SHA1 (SDL2-2.0.2.tar.gz) = 304c7cd3dddca98724a3e162f232a8a8f6e1ceb3
+RMD160 (SDL2-2.0.2.tar.gz) = de9aed4b63aec80a4d384c9de0bbdac4f8935ac7
+Size (SDL2-2.0.2.tar.gz) = 3812882 bytes
+SHA1 (patch-CMakeLists.txt) = b2bc2b520be6040bff6224fb3c103878c3820986
+SHA1 (patch-src_cpuinfo_SDL_cpuinfo.c) = 9482910e62023b92e80ce4d3b670a1a1e666789f
diff --git a/devel/SDL2/patches/patch-CMakeLists.txt b/devel/SDL2/patches/patch-CMakeLists.txt
index b356e03b913..89e36773b4d 100644
--- a/devel/SDL2/patches/patch-CMakeLists.txt
+++ b/devel/SDL2/patches/patch-CMakeLists.txt
@@ -1,9 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2013/11/02 20:20:07 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2014/03/13 13:25:49 adam Exp $
 
 Allow in-tree build.
 Handle .dylib extension on Darwin.
 
---- CMakeLists.txt.orig	2013-08-12 02:57:53.000000000 +0000
+--- CMakeLists.txt.orig	2014-03-08 04:36:49.000000000 +0000
 +++ CMakeLists.txt
 @@ -1,6 +1,3 @@
 -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
@@ -12,21 +12,21 @@ Handle .dylib extension on Darwin.
  
  cmake_minimum_required(VERSION 2.6)
  project(SDL2 C)
-@@ -1213,10 +1213,15 @@ list(APPEND INCLUDE_FILES ${BIN_INCLUDE_
- install(FILES ${INCLUDE_FILES} DESTINATION include/SDL2)
- 
- if(SDL_SHARED)
-+  if(APPLE)
-+    set(SO_EXT "dylib")
-+  else(APPLE)
-+    set(SO_EXT "so")
-+  endif(APPLE)
-   install(CODE "
-     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
--    \"libSDL2-2.0.so\" \"libSDL2.so\")")
--  install(FILES ${SDL2_BINARY_DIR}/libSDL2.so DESTINATION "lib${LIB_SUFFIX}")
-+    \"libSDL2-2.0.${SO_EXT}\" \"libSDL2.${SO_EXT}\")")
-+  install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SO_EXT} DESTINATION "lib${LIB_SUFFIX}")
- endif(SDL_SHARED)
+@@ -1283,10 +1280,15 @@ install(FILES ${INCLUDE_FILES} DESTINATI
  
  if(NOT WINDOWS OR CYGWIN)
+   if(SDL_SHARED)
++    if(APPLE)
++      set(SO_EXT "dylib")
++    else(APPLE)
++      set(SO_EXT "so")
++    endif(APPLE)
+     install(CODE "
+       execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+-      \"libSDL2-2.0.so\" \"libSDL2.so\")")
+-    install(FILES ${SDL2_BINARY_DIR}/libSDL2.so DESTINATION "lib${LIB_SUFFIX}")
++      \"libSDL2-2.0.${SO_EXT}\" \"libSDL2.${SO_EXT}\")")
++    install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SO_EXT} DESTINATION "lib${LIB_SUFFIX}")
+   endif()
+   if(FREEBSD)
+     # FreeBSD uses ${PREFIX}/libdata/pkgconfig
diff --git a/devel/SDL2/patches/patch-src_cpuinfo_SDL_cpuinfo.c b/devel/SDL2/patches/patch-src_cpuinfo_SDL_cpuinfo.c
index 3003024f3aa..bd64e3c65d5 100644
--- a/devel/SDL2/patches/patch-src_cpuinfo_SDL_cpuinfo.c
+++ b/devel/SDL2/patches/patch-src_cpuinfo_SDL_cpuinfo.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_cpuinfo_SDL_cpuinfo.c,v 1.1 2013/11/02 20:20:07 adam Exp $
+$NetBSD: patch-src_cpuinfo_SDL_cpuinfo.c,v 1.2 2014/03/13 13:25:49 adam Exp $
 
 Fix building on NetBSD and OpenBSD.
 
---- src/cpuinfo/SDL_cpuinfo.c.orig	2013-11-02 19:57:32.000000000 +0000
+--- src/cpuinfo/SDL_cpuinfo.c.orig	2014-03-08 04:36:51.000000000 +0000
 +++ src/cpuinfo/SDL_cpuinfo.c
-@@ -621,7 +621,7 @@ SDL_GetSystemRAM(void)
+@@ -665,7 +665,7 @@ SDL_GetSystemRAM(void)
  #endif
  #ifdef HAVE_SYSCTLBYNAME
          if (SDL_SystemRAM <= 0) {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
  #ifdef HW_REALMEM
              int mib[2] = {CTL_HW, HW_REALMEM};
  #else