diff --git a/.gitignore b/.gitignore index c7e4fd9..825c4d3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /SDL2-2.0.16.tar.gz /SDL2-2.0.18.tar.gz /SDL2-2.0.20.tar.gz +/SDL2-2.0.22.tar.gz diff --git a/mingw-SDL2.spec b/mingw-SDL2.spec index 6744a71..7043f15 100644 --- a/mingw-SDL2.spec +++ b/mingw-SDL2.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-SDL2 -Version: 2.0.20 -Release: 4%{?dist} +Version: 2.0.22 +Release: 1%{?dist} Summary: MinGW Windows port of SDL2 cross-platform multimedia library License: LGPLv2+ @@ -127,6 +127,9 @@ device. %changelog +* Sat Apr 30 2022 Neal Gompa - 2.0.22-1 +- Update to 2.0.22 + * Fri Mar 25 2022 Sandro Mani - 2.0.20-4 - Rebuild with mingw-gcc-12 diff --git a/mingw-SDL2_lmingw32.patch b/mingw-SDL2_lmingw32.patch index 8f82d45..b2b6e23 100644 --- a/mingw-SDL2_lmingw32.patch +++ b/mingw-SDL2_lmingw32.patch @@ -1,12 +1,21 @@ -diff -rupN SDL2-2.0.20/CMakeLists.txt SDL2-2.0.20-new/CMakeLists.txt ---- SDL2-2.0.20/CMakeLists.txt 2022-01-08 22:13:56.000000000 +0100 -+++ SDL2-2.0.20-new/CMakeLists.txt 2022-03-02 12:41:51.634494670 +0100 -@@ -1787,7 +1787,7 @@ elseif(WINDOWS) - list(APPEND EXTRA_LIBS mingw32) - list(APPEND EXTRA_LDFLAGS "-mwindows") - set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main") -- list(APPEND SDL_LIBS "-lmingw32" "-lSDL2main" "-mwindows") -+ list(APPEND SDL_LIBS "-lSDL2main" "-lmingw32" "-mwindows") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 644715a..23b7e13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1813,13 +1813,13 @@ elseif(WINDOWS) + file(GLOB VERSION_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.rc) + file(GLOB SDLMAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/windows/*.c) + if(MINGW OR CYGWIN) +- list(APPEND EXTRA_LIBS mingw32) +- list(APPEND EXTRA_LDFLAGS "-mwindows") +- list(APPEND SDL_LIBS "-lmingw32" "-mwindows") + if(NOT SDL2_DISABLE_SDL2MAIN) + set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main") + list(APPEND SDL_LIBS "-lSDL2main") + endif(NOT SDL2_DISABLE_SDL2MAIN) ++ list(APPEND EXTRA_LIBS mingw32) ++ list(APPEND EXTRA_LDFLAGS "-mwindows") ++ list(APPEND SDL_LIBS "-lmingw32" "-mwindows") endif() elseif(APPLE) diff --git a/sources b/sources index 0d522da..05a5fe0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.20.tar.gz) = 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de +SHA512 (SDL2-2.0.22.tar.gz) = ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a