devel/sdl20: update to 2.0.7

Changes:	https://discourse.libsdl.org/t/sdl-2-0-7-released/23279
ABI:		https://abi-laboratory.pro/tracker/timeline/sdl/
MFH:		2017Q4 (many regression fixes for 2.0.6)

6 files changed, 10 insertions, 41 deletions

diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index bd1823776eda..f9794a38e521 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sdl2
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTVERSION=	2.0.7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 DISTNAME=	SDL2-${PORTVERSION}
diff --git a/devel/sdl20/distinfo b/devel/sdl20/distinfo
index 6ca7f834d850..c554f21e6adb 100644
--- a/devel/sdl20/distinfo
+++ b/devel/sdl20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506106261
-SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df
-SIZE (SDL2-2.0.6.tar.gz) = 4420311
+TIMESTAMP = 1508786865
+SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e
+SIZE (SDL2-2.0.7.tar.gz) = 4432499
diff --git a/devel/sdl20/files/patch-src_video_SDL__surface.c b/devel/sdl20/files/patch-src_video_SDL__surface.c
deleted file mode 100644
index ba55080fa22f..000000000000
--- a/devel/sdl20/files/patch-src_video_SDL__surface.c
+++ /dev/null
@@ -1,31 +0,0 @@
-SDL_FreeSurface deallocates surface->map even if the surface is not yet freed
-https://bugzilla.libsdl.org/show_bug.cgi?id=3852
-
-Memory leak in SDL_FreeSurface (after bug 3852 fix)
-https://bugzilla.libsdl.org/show_bug.cgi?id=3855
-
---- src/video/SDL_surface.c.orig	2017-09-22 18:51:01 UTC
-+++ src/video/SDL_surface.c
-@@ -1198,10 +1198,8 @@ SDL_FreeSurface(SDL_Surface * surface)
-     if (surface->flags & SDL_DONTFREE) {
-         return;
-     }
--    if (surface->map != NULL) {
--        SDL_FreeBlitMap(surface->map);
--        surface->map = NULL;
--    }
-+    SDL_InvalidateMap(surface->map);
-+
-     if (--surface->refcount > 0) {
-         return;
-     }
-@@ -1219,6 +1217,9 @@ SDL_FreeSurface(SDL_Surface * surface)
-     if (!(surface->flags & SDL_PREALLOC)) {
-         SDL_free(surface->pixels);
-     }
-+    if (surface->map) {
-+        SDL_FreeBlitMap(surface->map);
-+    }
-     SDL_free(surface);
- }
- 
diff --git a/devel/sdl20/pkg-plist b/devel/sdl20/pkg-plist
index bc2c90a0e00c..5460f6ecc45a 100644
--- a/devel/sdl20/pkg-plist
+++ b/devel/sdl20/pkg-plist
@@ -60,6 +60,7 @@ include/SDL2/SDL_test_harness.h
 include/SDL2/SDL_test_images.h
 include/SDL2/SDL_test_log.h
 include/SDL2/SDL_test_md5.h
+include/SDL2/SDL_test_memory.h
 include/SDL2/SDL_test_random.h
 include/SDL2/SDL_thread.h
 include/SDL2/SDL_timer.h
@@ -72,7 +73,7 @@ include/SDL2/begin_code.h
 include/SDL2/close_code.h
 lib/cmake/SDL2/sdl2-config.cmake
 lib/libSDL2-2.0.so.0
-lib/libSDL2-2.0.so.0.6.0
+lib/libSDL2-2.0.so.0.7.0
 lib/libSDL2.a
 lib/libSDL2.so
 lib/libSDL2_test.a
diff --git a/x11/controllermap/Makefile b/x11/controllermap/Makefile
index e79696b4efae..8634ea933f0e 100644
--- a/x11/controllermap/Makefile
+++ b/x11/controllermap/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	controllermap
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	x11
 MASTER_SITES=	http://www.libsdl.org/release/
 DISTNAME=	SDL2-${DISTVERSION}
diff --git a/x11/controllermap/distinfo b/x11/controllermap/distinfo
index 6ca7f834d850..c554f21e6adb 100644
--- a/x11/controllermap/distinfo
+++ b/x11/controllermap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506106261
-SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df
-SIZE (SDL2-2.0.6.tar.gz) = 4420311
+TIMESTAMP = 1508786865
+SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e
+SIZE (SDL2-2.0.7.tar.gz) = 4432499