diff --git a/CVE-2019-13616.patch b/CVE-2019-13616.patch deleted file mode 100644 index 10e5ac9..0000000 --- a/CVE-2019-13616.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r b810b78d32cc -r e7ba650a643a src/video/SDL_bmp.c ---- a/src/video/SDL_bmp.c Thu Jul 25 08:05:13 2019 -0500 -+++ b/src/video/SDL_bmp.c Tue Jul 30 11:00:00 2019 -0700 -@@ -226,6 +226,11 @@ - SDL_RWseek(src, (biSize - headerSize), RW_SEEK_CUR); - } - } -+ if (biWidth <= 0 || biHeight == 0) { -+ SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight); -+ was_error = SDL_TRUE; -+ goto done; -+ } - if (biHeight < 0) { - topDown = SDL_TRUE; - biHeight = -biHeight; diff --git a/SDL2-2.0.10.tar.gz b/SDL2-2.0.10.tar.gz deleted file mode 100644 index 6c1f190..0000000 --- a/SDL2-2.0.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 -size 5550762 diff --git a/SDL2-2.0.10.tar.gz.sig b/SDL2-2.0.10.tar.gz.sig deleted file mode 100644 index 6a5931b..0000000 Binary files a/SDL2-2.0.10.tar.gz.sig and /dev/null differ diff --git a/SDL2-2.0.12.tar.gz b/SDL2-2.0.12.tar.gz new file mode 100644 index 0000000..8535e31 --- /dev/null +++ b/SDL2-2.0.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 +size 5720162 diff --git a/SDL2-2.0.12.tar.gz.sig b/SDL2-2.0.12.tar.gz.sig new file mode 100644 index 0000000..916d4f4 Binary files /dev/null and b/SDL2-2.0.12.tar.gz.sig differ diff --git a/SDL2-endian.patch b/SDL2-endian.patch index 2004405..910349b 100644 --- a/SDL2-endian.patch +++ b/SDL2-endian.patch @@ -1,8 +1,12 @@ -Index: SDL2-2.0.8/include/SDL_endian.h +--- + include/SDL_endian.h | 155 ++------------------------------------------------- + 1 file changed, 7 insertions(+), 148 deletions(-) + +Index: SDL2-2.0.12/include/SDL_endian.h =================================================================== ---- SDL2-2.0.8.orig/include/SDL_endian.h -+++ SDL2-2.0.8/include/SDL_endian.h -@@ -34,29 +34,17 @@ +--- SDL2-2.0.12.orig/include/SDL_endian.h ++++ SDL2-2.0.12/include/SDL_endian.h +@@ -34,32 +34,17 @@ * \name The two types of endianness */ /* @{ */ @@ -16,10 +20,13 @@ Index: SDL2-2.0.8/include/SDL_endian.h -#ifdef __linux__ -#include -#define SDL_BYTEORDER __BYTE_ORDER --#else /* __linux__ */ +-#elif defined(__OpenBSD__) +-#include +-#define SDL_BYTEORDER BYTE_ORDER +-#else -#if defined(__hppa__) || \ - defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ -- (defined(__MIPS__) && defined(__MISPEB__)) || \ +- (defined(__MIPS__) && defined(__MIPSEB__)) || \ - defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ - defined(__sparc__) -#define SDL_BYTEORDER SDL_BIG_ENDIAN @@ -36,7 +43,7 @@ Index: SDL2-2.0.8/include/SDL_endian.h /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus extern "C" { -@@ -65,149 +53,23 @@ extern "C" { +@@ -68,149 +53,23 @@ extern "C" { /** * \file SDL_endian.h */ diff --git a/SDL2.changes b/SDL2.changes index 8f5eda7..af6b2c5 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 11 10:23:44 UTC 2020 - Jan Engelhardt + +- Update to release 2.0.12 + * Support for the Google Stadia controller and other game + controllers + * A new video driver for offscreen rendering + * ARM NEON optimizations +- Drop CVE-2019-13616.patch (merged upstream) + ------------------------------------------------------------------- Sun Jan 12 22:53:50 UTC 2020 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index f109416..a4a350e 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -19,7 +19,7 @@ %define sle_version 0 Name: SDL2 %define lname libSDL2-2_0-0 -Version: 2.0.10 +Version: 2.0.12 Release: 0 Summary: Simple DirectMedia Layer Library License: Zlib @@ -33,8 +33,7 @@ Source3: %name.keyring Source4: baselibs.conf Patch1: sdl2-symvers.patch Patch2: SDL2-endian.patch -Patch3: CVE-2019-13616.patch -Patch4: sdl2-khronos.patch +Patch3: sdl2-khronos.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++