[Bf-blender-cvs] [1f3eb3088ff] master: build_environment: sdl 2.0.8

[Ray Molenkamp]

Commit: 1f3eb3088ffcb1ff26c903ba0a6bd978799a7510
Author: Ray Molenkamp
Date:   Mon Aug 13 19:19:42 2018 -0600
Branches: master
https://developer.blender.org/rB1f3eb3088ffcb1ff26c903ba0a6bd978799a7510

build_environment: sdl 2.0.8

===================================================================

M	build_files/build_environment/cmake/harvest.cmake
M	build_files/build_environment/cmake/sdl.cmake
M	build_files/build_environment/cmake/versions.cmake
M	build_files/build_environment/patches/sdl.diff

===================================================================

diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index f346429dfbf..6ad9a10667f 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -34,10 +34,6 @@ if(BUILD_MODE STREQUAL Release)
 				# pthreads, rename include dir
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib &&
-				# sdl merge bin/lib folder, copy include
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib &&
 				# OpenImageIO
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
diff --git a/build_files/build_environment/cmake/sdl.cmake b/build_files/build_environment/cmake/sdl.cmake
index 0fbfa078eb1..4e32245f81f 100644
--- a/build_files/build_environment/cmake/sdl.cmake
+++ b/build_files/build_environment/cmake/sdl.cmake
@@ -37,3 +37,13 @@ ExternalProject_Add(external_sdl
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/sdl
 )
+
+if(BUILD_MODE STREQUAL Release AND WIN32)
+	ExternalProject_Add_Step(external_sdl after_install
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
+		DEPENDEES install
+	)
+endif()
+
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index e0af29ce0a7..d2e39351b7e 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -97,9 +97,9 @@ set(OPENSUBDIV_VERSION v3_3_3)
 set(OPENSUBDIV_Hash 29c79dc01ef616aab02670bed5544ddd)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
 
-set(SDL_VERSION 2.0.4)
+set(SDL_VERSION 2.0.8)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_HASH 44fc4a023349933e7f5d7a582f7b886e)
+set(SDL_HASH 3800d705cef742c6a634f202c37f263f)
 
 set(OPENCOLLADA_VERSION v1.6.51)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
diff --git a/build_files/build_environment/patches/sdl.diff b/build_files/build_environment/patches/sdl.diff
index b309d0230f3..d0a3bca863d 100644
--- a/build_files/build_environment/patches/sdl.diff
+++ b/build_files/build_environment/patches/sdl.diff
@@ -1,33 +1,4 @@
 diff -ru /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c ./src/video/SDL_video.c
---- /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c	2016-01-02 20:56:31.000000000 +0100
-+++ ./src/video/SDL_video.c	2016-05-15 02:58:27.000000000 +0200
-@@ -137,7 +137,7 @@
- 
- #define FULLSCREEN_MASK (SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN)
- 
--#ifdef __MACOSX__
-+#if SDL_VIDEO_DRIVER_COCOA
- /* Support for Mac OS X fullscreen spaces */
- extern SDL_bool Cocoa_IsWindowInFullscreenSpace(SDL_Window * window);
- extern SDL_bool Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state);
-@@ -1141,7 +1141,7 @@
-     if ( window->is_hiding && fullscreen )
-         return 0;
- 
--#ifdef __MACOSX__
-+#if SDL_VIDEO_DRIVER_COCOA
-     /* if the window is going away and no resolution change is necessary,
-      do nothing, or else we may trigger an ugly double-transition
-      */
-@@ -2365,7 +2365,7 @@
-         return SDL_FALSE;
-     }
- 
--#ifdef __MACOSX__
-+#if SDL_VIDEO_DRIVER_COCOA
-     if (Cocoa_IsWindowInFullscreenSpace(window)) {
-         return SDL_FALSE;
-     }
 --- CMakeLists.txt.old	2016-01-02 12:56:31 -0700
 +++ CMakeLists.txt	2016-10-03 11:24:24 -0600
 @@ -609,7 +609,7 @@
@@ -39,12 +10,3 @@ diff -ru /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c .
      if(HAVE_LIBICONV)
        list(APPEND EXTRA_LIBS iconv)
        set(HAVE_ICONV 1)
-@@ -1455,7 +1455,7 @@
- set(_INSTALL_LIBS "SDL2main")
- 
- if(SDL_SHARED)
--  add_library(SDL2 SHARED ${SOURCE_FILES})
-+  add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES})
-   if(UNIX)
-     set_target_properties(SDL2 PROPERTIES
-       VERSION ${LT_VERSION}