Update to 2.24.0

epel9
Neal Gompa 2 years ago
parent e4e599c6e4
commit 66366a2b49

1
.gitignore vendored

@ -9,3 +9,4 @@
/SDL2-2.0.18.tar.gz
/SDL2-2.0.20.tar.gz
/SDL2-2.0.22.tar.gz
/SDL2-2.24.0.tar.gz

@ -1,18 +1,13 @@
%{?mingw_package_header}
Name: mingw-SDL2
Version: 2.0.22
Release: 3%{?dist}
Version: 2.24.0
Release: 1%{?dist}
Summary: MinGW Windows port of SDL2 cross-platform multimedia library
License: LGPLv2+
URL: http://www.libsdl.org/
Source0: http://www.libsdl.org/release/SDL2-%{version}.tar.gz
# Fix -lmingw32 order in in SDL_LIBS
# The link order must be -lmingw32 -lSDL2main -lSDL2, otherwise
# undefined reference to `WinMain@16'
# appers in consumers
Patch0: mingw-SDL2_lmingw32.patch
BuildArch: noarch
@ -92,6 +87,9 @@ device.
%install
%mingw_make_install
rm -rf %{buildroot}%{mingw32_datadir}/licenses
rm -rf %{buildroot}%{mingw64_datadir}/licenses
# Win32
%files -n mingw32-SDL2
@ -100,6 +98,7 @@ device.
%{mingw32_bindir}/sdl2-config
%{mingw32_libdir}/libSDL2.dll.a
%{mingw32_libdir}/libSDL2main.a
%{mingw32_libdir}/libSDL2_test.a
%{mingw32_libdir}/cmake/SDL2/
%exclude %{mingw32_libdir}/cmake/SDL2/*static*
%{mingw32_libdir}/pkgconfig/sdl2.pc
@ -118,6 +117,7 @@ device.
%{mingw64_bindir}/sdl2-config
%{mingw64_libdir}/libSDL2.dll.a
%{mingw64_libdir}/libSDL2main.a
%{mingw64_libdir}/libSDL2_test.a
%{mingw64_libdir}/cmake/SDL2/
%exclude %{mingw64_libdir}/cmake/SDL2/*static*
%{mingw64_libdir}/pkgconfig/sdl2.pc
@ -131,6 +131,9 @@ device.
%changelog
* Fri Aug 19 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.24.0-1
- Update to 2.24.0
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

@ -1,21 +0,0 @@
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)

@ -1 +1 @@
SHA512 (SDL2-2.0.22.tar.gz) = ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a
SHA512 (SDL2-2.24.0.tar.gz) = 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212

Loading…
Cancel
Save