diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 8eb9d6c0c5c..5f90263cd21 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -128,9 +128,9 @@ set(OPENSUBDIV_HASH 230f5cd2911d6240e58a3773b9c6e5e4) set(OPENSUBDIV_HASH_TYPE MD5) set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz) -set(SDL_VERSION 2.0.20) +set(SDL_VERSION 2.28.2) set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz) -set(SDL_HASH a53acc02e1cca98c4123229069b67c9e) +set(SDL_HASH 06ff379c406cd8318d18f0de81ee2709) set(SDL_HASH_TYPE MD5) set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz) set(SDL_CPE "cpe:2.3:a:libsdl:sdl:${SDL_VERSION}:*:*:*:*:*:*:*") diff --git a/build_files/build_environment/patches/sdl.diff b/build_files/build_environment/patches/sdl.diff index 6caa98f9d68..b40bb9aa67c 100644 --- a/build_files/build_environment/patches/sdl.diff +++ b/build_files/build_environment/patches/sdl.diff @@ -2,34 +2,14 @@ diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c --- CMakeLists.txt.old 2016-01-02 12:56:31 -0700 +++ CMakeLists.txt 2016-10-03 11:24:24 -0600 @@ -609,7 +609,7 @@ - list(APPEND EXTRA_LIBS m) endif() -- check_library_exists(iconv iconv_open "" HAVE_LIBICONV) -+ #check_library_exists(iconv iconv_open "" HAVE_LIBICONV) - if(HAVE_LIBICONV) - list(APPEND EXTRA_LIBS iconv) - set(HAVE_ICONV 1) ---- src/video/SDL_video.c 2018-09-10 23:27:57.000000000 +0200 -+++ src/video/SDL_video.c 2018-09-10 23:28:09.000000000 +0200 -@@ -1176,7 +1176,7 @@ - return 0; - } - --#ifdef __MACOSX__ -+#if defined(__MACOSX__) && 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 - */ -@@ -2563,7 +2563,7 @@ - return SDL_FALSE; - } - --#ifdef __MACOSX__ -+#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA - if (SDL_strcmp(_this->name, "cocoa") == 0) { /* don't do this for X11, etc */ - if (Cocoa_IsWindowInFullscreenSpace(window)) { - return SDL_FALSE; + if(SDL_SYSTEM_ICONV) +- check_library_exists(iconv iconv_open "" HAVE_LIBICONV) ++ #check_library_exists(iconv iconv_open "" HAVE_LIBICONV) + if(HAVE_LIBICONV) + list(APPEND EXTRA_LIBS iconv) + set(HAVE_ICONV 1) --- CMakeLists.txt 2022-12-09 20:40:00 +++ CMakeLists.txt 2022-12-09 20:40:00 @@ -526,6 +526,13 @@