- fix FTBFS on ppc64/ppc64le
This commit is contained in:
parent
e290478d43
commit
0bfd38e6dc
45
SDL2-2.0.5-ppc.patch
Normal file
45
SDL2-2.0.5-ppc.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
|
||||||
|
# HG changeset patch
|
||||||
|
# User Sam Lantinga <slouken@libsdl.org>
|
||||||
|
# Date 1477159315 25200
|
||||||
|
# Node ID 5184186d4366169617b434f5b71c618a7035cde4
|
||||||
|
# Parent 71d4148e32de5088c4bc2f04c1e5ded647a2bf82
|
||||||
|
Fixed bug 3466 - Can't build 2.0.5 on ppc64
|
||||||
|
|
||||||
|
/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32':
|
||||||
|
/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
|
||||||
|
const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
|
||||||
|
^
|
||||||
|
|
||||||
|
diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c
|
||||||
|
--- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700
|
||||||
|
+++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700
|
||||||
|
@@ -118,12 +118,6 @@
|
||||||
|
16, 8, 0, 24,
|
||||||
|
0, NULL
|
||||||
|
};
|
||||||
|
- if (!srcfmt) {
|
||||||
|
- srcfmt = &default_pixel_format;
|
||||||
|
- }
|
||||||
|
- if (!dstfmt) {
|
||||||
|
- dstfmt = &default_pixel_format;
|
||||||
|
- }
|
||||||
|
const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x04, 0x04, 0x04, 0x04,
|
||||||
|
0x08, 0x08, 0x08, 0x08,
|
||||||
|
@@ -136,6 +130,14 @@
|
||||||
|
Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
|
||||||
|
Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
|
||||||
|
Uint32 amask;
|
||||||
|
+
|
||||||
|
+ if (!srcfmt) {
|
||||||
|
+ srcfmt = &default_pixel_format;
|
||||||
|
+ }
|
||||||
|
+ if (!dstfmt) {
|
||||||
|
+ dstfmt = &default_pixel_format;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* Use zero for alpha if either surface doesn't have alpha */
|
||||||
|
if (dstfmt->Amask) {
|
||||||
|
amask =
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: SDL2
|
Name: SDL2
|
||||||
Version: 2.0.5
|
Version: 2.0.5
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A cross-platform multimedia library
|
Summary: A cross-platform multimedia library
|
||||||
|
|
||||||
License: zlib and MIT
|
License: zlib and MIT
|
||||||
@ -9,6 +9,8 @@ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
|
|||||||
Source1: SDL_config.h
|
Source1: SDL_config.h
|
||||||
|
|
||||||
Patch0: multilib.patch
|
Patch0: multilib.patch
|
||||||
|
# https://hg.libsdl.org/SDL/rev/5184186d4366
|
||||||
|
Patch1: %{name}-2.0.5-ppc.patch
|
||||||
|
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
BuildRequires: audiofile-devel
|
BuildRequires: audiofile-devel
|
||||||
@ -117,6 +119,9 @@ rm -f %{buildroot}%{_libdir}/*.la
|
|||||||
%{_libdir}/lib*.a
|
%{_libdir}/lib*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 26 2016 Dan Horák <dan[at]danny.cz> - 2.0.5-2
|
||||||
|
- fix FTBFS on ppc64/ppc64le
|
||||||
|
|
||||||
* Thu Oct 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.0.5-1
|
* Thu Oct 20 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.0.5-1
|
||||||
- Update to 2.0.5 (RHBZ #1387238)
|
- Update to 2.0.5 (RHBZ #1387238)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user