fix FTBFS

This commit is contained in:
Tom Callaway 2020-02-11 08:46:16 -05:00
parent a16aa5d25f
commit 9fe11f14f3
2 changed files with 28 additions and 4 deletions

View File

@ -0,0 +1,21 @@
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: 2%{?dist}
Release: 3%{?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
* Tue Feb 11 2020 Tom Callaway <spot@fedoraproject.org> - 2.0.10-3
- apply upstream fix for FTBFS
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild