Update to 2.0.12

This commit is contained in:
Pete Walter 2020-03-11 06:12:27 +00:00
parent 9fe11f14f3
commit af1fce54c3
4 changed files with 10 additions and 27 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/SDL2-2.0.8.tar.gz
/SDL2-2.0.9.tar.gz
/SDL2-2.0.10.tar.gz
/SDL2-2.0.12.tar.gz

View File

@ -1,21 +0,0 @@
diff -up SDL2-2.0.10/src/video/wayland/SDL_waylanddyn.h.gcc10 SDL2-2.0.10/src/video/wayland/SDL_waylanddyn.h
--- SDL2-2.0.10/src/video/wayland/SDL_waylanddyn.h.gcc10 2020-02-11 08:38:53.072406887 -0500
+++ SDL2-2.0.10/src/video/wayland/SDL_waylanddyn.h 2020-02-11 08:39:26.000826752 -0500
@@ -59,6 +59,9 @@ void SDL_WAYLAND_UnloadSymbols(void);
}
#endif
+/* Must be included before our #defines, see Bugzilla #4957 */
+#include "wayland-client-core.h"
+
#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
#ifdef _WAYLAND_CLIENT_H
@@ -98,7 +101,6 @@ void SDL_WAYLAND_UnloadSymbols(void);
#endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
-#include "wayland-client-core.h"
#include "wayland-client-protocol.h"
#include "wayland-egl.h"

View File

@ -1,17 +1,17 @@
Name: SDL2
Version: 2.0.10
Release: 3%{?dist}
Version: 2.0.12
Release: 1%{?dist}
Summary: Cross-platform multimedia library
License: zlib and MIT
URL: http://www.libsdl.org/
Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Source1: SDL_config.h
Patch0: multilib.patch
# ptrdiff_t is not the same as khronos defines on 32bit arches
Patch1: SDL2-2.0.9-khrplatform.patch
# fix gcc10 issue with duplicate symbols (-fno-common)
# https://hg.libsdl.org/SDL/rev/02c8da593c73
Patch2: SDL2-2.0.10-gcc10-fno-common-fix.patch
BuildRequires: gcc
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@ -134,6 +134,9 @@ rm -vf %{buildroot}%{_libdir}/*.la
%{_libdir}/lib*.a
%changelog
* Wed Mar 11 2020 Pete Walter <pwalter@fedoraproject.org> - 2.0.12-1
- Update to 2.0.12
* Tue Feb 11 2020 Tom Callaway <spot@fedoraproject.org> - 2.0.10-3
- apply upstream fix for FTBFS

View File

@ -1 +1 @@
SHA512 (SDL2-2.0.10.tar.gz) = f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
SHA512 (SDL2-2.0.12.tar.gz) = 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317