Accepting request 200215 from games

Copy to 13.1 too, if possible

OBS-URL: https://build.opensuse.org/request/show/200215
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL2_image?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2013-09-25 15:20:14 +00:00 committed by Git OBS Bridge
commit 92965e7739
3 changed files with 29 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 12 10:42:27 UTC 2013 - dvaleev@suse.com
- Fix undefined s on BigEndian platforms (bigendian_undefined_s.patch)
-------------------------------------------------------------------
Tue Aug 13 12:04:26 UTC 2013 - jengelh@inai.de

View File

@ -28,6 +28,7 @@ Url: http://libsdl.org/projects/SDL_image/
#Hg-Clone: http://hg.libsdl.org/SDL_image/
Source: http://libsdl.org/projects/SDL_image/release/%name-%version.tar.gz
Source2: baselibs.conf
Patch0: bigendian_undefined_s.patch
BuildRequires: libSDL2-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
@ -65,6 +66,7 @@ formats.
%prep
%setup -q
%patch0 -p1
rm -rf external
%build

View File

@ -0,0 +1,22 @@
From: Dinar Valeev <dvaleev@suse.com>
Date: Thu, 12 Sep 2013 12:51:31 +0200
build: resolve compile abort on big-endian platforms
s was not declared.
Addition by jengelh: Make it unsigned, because that is the
only thing to make sense with the >> operator.
Index: SDL2_image-2.0.0/IMG_webp.c
===================================================================
--- SDL2_image-2.0.0.orig/IMG_webp.c
+++ SDL2_image-2.0.0/IMG_webp.c
@@ -242,6 +242,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *
Bmask = 0x00FF0000;
Amask = (features.has_alpha) ? 0xFF000000 : 0;
#else
+ unsigned int s;
s = (features.has_alpha) ? 0 : 8;
Rmask = 0xFF000000 >> s;
Gmask = 0x00FF0000 >> s;