SHA256
1
0
forked from pool/SDL2

- Update to release 2.0.12

OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=101
This commit is contained in:
Jan Engelhardt 2020-03-11 10:32:16 +00:00 committed by Git OBS Bridge
parent 78f134d919
commit c172cccaf4
8 changed files with 29 additions and 28 deletions

View File

@ -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;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57
size 5550762

Binary file not shown.

3
SDL2-2.0.12.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863
size 5720162

BIN
SDL2-2.0.12.tar.gz.sig Normal file

Binary file not shown.

View File

@ -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.12.orig/include/SDL_endian.h
+++ SDL2-2.0.8/include/SDL_endian.h +++ SDL2-2.0.12/include/SDL_endian.h
@@ -34,29 +34,17 @@ @@ -34,32 +34,17 @@
* \name The two types of endianness * \name The two types of endianness
*/ */
/* @{ */ /* @{ */
@ -16,10 +20,13 @@ Index: SDL2-2.0.8/include/SDL_endian.h
-#ifdef __linux__ -#ifdef __linux__
-#include <endian.h> -#include <endian.h>
-#define SDL_BYTEORDER __BYTE_ORDER -#define SDL_BYTEORDER __BYTE_ORDER
-#else /* __linux__ */ -#elif defined(__OpenBSD__)
-#include <endian.h>
-#define SDL_BYTEORDER BYTE_ORDER
-#else
-#if defined(__hppa__) || \ -#if defined(__hppa__) || \
- defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
- (defined(__MIPS__) && defined(__MISPEB__)) || \ - (defined(__MIPS__) && defined(__MIPSEB__)) || \
- defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ - defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
- defined(__sparc__) - defined(__sparc__)
-#define SDL_BYTEORDER SDL_BIG_ENDIAN -#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++ */ /* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -65,149 +53,23 @@ extern "C" { @@ -68,149 +53,23 @@ extern "C" {
/** /**
* \file SDL_endian.h * \file SDL_endian.h
*/ */

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Mar 11 10:23:44 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- 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 <jengelh@inai.de> Sun Jan 12 22:53:50 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

View File

@ -19,7 +19,7 @@
%define sle_version 0 %define sle_version 0
Name: SDL2 Name: SDL2
%define lname libSDL2-2_0-0 %define lname libSDL2-2_0-0
Version: 2.0.10 Version: 2.0.12
Release: 0 Release: 0
Summary: Simple DirectMedia Layer Library Summary: Simple DirectMedia Layer Library
License: Zlib License: Zlib
@ -33,8 +33,7 @@ Source3: %name.keyring
Source4: baselibs.conf Source4: baselibs.conf
Patch1: sdl2-symvers.patch Patch1: sdl2-symvers.patch
Patch2: SDL2-endian.patch Patch2: SDL2-endian.patch
Patch3: CVE-2019-13616.patch Patch3: sdl2-khronos.patch
Patch4: sdl2-khronos.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: gcc-c++ BuildRequires: gcc-c++