diff --git a/media-libs/libsdl2/libsdl2-2.0.14.recipe b/media-libs/libsdl2/libsdl2-2.0.14.recipe index c09279d5a..112ff8b41 100644 --- a/media-libs/libsdl2/libsdl2-2.0.14.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.14.recipe @@ -6,7 +6,7 @@ software, emulators, and popular games." HOMEPAGE="https://www.libsdl.org/" COPYRIGHT="1997-2021 Sam Lantinga" LICENSE="Zlib" -REVISION="5" +REVISION="6" SOURCE_URI="https://www.libsdl.org/release/SDL2-$portVersion.tar.gz" CHECKSUM_SHA256="d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" SOURCE_DIR="SDL2-$portVersion" diff --git a/media-libs/libsdl2/patches/libsdl2-2.0.14.patchset b/media-libs/libsdl2/patches/libsdl2-2.0.14.patchset index 49febd339..e21996dcf 100644 --- a/media-libs/libsdl2/patches/libsdl2-2.0.14.patchset +++ b/media-libs/libsdl2/patches/libsdl2-2.0.14.patchset @@ -309,7 +309,7 @@ index 0948451..f3c80ac 100644 2.30.0 -From d7d0eea8dd63e51ec79bbdedcceacd9942113727 Mon Sep 17 00:00:00 2001 +From 27e186cc748fb703abd03fa433c700725980e049 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 25 Apr 2021 13:35:32 +0200 Subject: Haiku: cmake build @@ -317,7 +317,7 @@ Subject: Haiku: cmake build use CMAKE_INSTALL_ variables where applicable diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9b9eb6..8fbd729 100644 +index b9b9eb6..c203236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1141,7 +1141,7 @@ elseif(EMSCRIPTEN) @@ -420,6 +420,24 @@ index b9b9eb6..8fbd729 100644 if(SDL_STATIC) set(ENABLE_STATIC_TRUE "") set(ENABLE_STATIC_FALSE "#") +@@ -2199,7 +2226,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") + # Always build SDLmain + if(NOT WINDOWS_STORE) + add_library(SDL2main STATIC ${SDLMAIN_SOURCES}) +-target_include_directories(SDL2main PUBLIC "$" $ $) ++target_include_directories(SDL2main PUBLIC "$" $ $) + set(_INSTALL_LIBS "SDL2main") + if (NOT ANDROID) + set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX "${SDL_CMAKE_DEBUG_POSTFIX}") +@@ -2239,7 +2266,7 @@ if(SDL_SHARED) + endif() + set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS}) + target_link_libraries(SDL2 PRIVATE ${EXTRA_LIBS} ${EXTRA_LDFLAGS}) +- target_include_directories(SDL2 PUBLIC "$" $ $) ++ target_include_directories(SDL2 PUBLIC "$" $ $) + if(ANDROID) + target_include_directories(SDL2 PRIVATE ${ANDROID_NDK}/sources/android/cpufeatures) + else() @@ -2309,15 +2336,15 @@ endif() ##### Installation targets #####