Update to 2.0.5 (RHBZ #1387238)

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
This commit is contained in:
Igor Gnatenko 2016-10-20 14:28:27 +02:00
parent 32e6c272b3
commit e290478d43
5 changed files with 8 additions and 1244 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/SDL2-2.0.2.tar.gz
/SDL2-2.0.3.tar.gz
/SDL2-2.0.4.tar.gz
/SDL2-2.0.5.tar.gz

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
Name: SDL2
Version: 2.0.4
Release: 9%{?dist}
Version: 2.0.5
Release: 1%{?dist}
Summary: A cross-platform multimedia library
License: zlib and MIT
@ -9,11 +9,6 @@ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Source1: SDL_config.h
Patch0: multilib.patch
# Wayland fixes backported from upstream
Patch1: SDL2-wayland-fixes.patch
# https://bugzilla.libsdl.org/show_bug.cgi?id=3295
# https://bugzilla.redhat.com/show_bug.cgi?id=1366868
Patch2: bug_822210_fix_sdl2-config.cmake_whitespace.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@ -69,9 +64,7 @@ Summary: Static libraries for SDL2
Static libraries for SDL2.
%prep
%setup -q
%patch0 -p1 -b .multilib
%patch1 -p1 -b .wayland-fixes
%autosetup -p1
# Compilation without ESD
sed -i -e 's/.*AM_PATH_ESD.*//' configure.in
sed -i -e 's/\r//g' TODO.txt README.txt WhatsNew.txt BUGS.txt COPYING.txt CREDITS.txt README-SDL.txt
@ -124,6 +117,9 @@ rm -f %{buildroot}%{_libdir}/*.la
%{_libdir}/lib*.a
%changelog
* Thu Oct 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.0.5-1
- Update to 2.0.5 (RHBZ #1387238)
* Mon Sep 05 2016 Kalev Lember <klember@redhat.com> - 2.0.4-9
- Backport Wayland fixes from upstream

View File

@ -1,9 +0,0 @@
diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in
index e5a036a..03efbe1 100644
--- a/sdl2-config.cmake.in
+++ b/sdl2-config.cmake.in
@@ -8,3 +8,4 @@ set(SDL2_EXEC_PREFIX "@prefix@")
set(SDL2_LIBDIR "@libdir@")
set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
+string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)

View File

@ -1 +1 @@
44fc4a023349933e7f5d7a582f7b886e SDL2-2.0.4.tar.gz
d4055424d556b4a908aa76fad63abd3c SDL2-2.0.5.tar.gz