diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-11-14 01:58:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 13:06:13 +0000 |
commit | f955ef4758ec88a88084b9aafb7ce11ff9bf475e (patch) | |
tree | 83f1b933903868bd07557f1e969c0f8cc361d77b /meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch | |
parent | 3b439ef177187f99e465ea44e90fdb21dae10175 (diff) | |
download | poky-f955ef4758ec88a88084b9aafb7ce11ff9bf475e.tar.gz |
libsdl2: 2.0.5 -> 2.0.7
* Drop linkage.patch, this version already links .lo object.
* Remove backported patch fix-build-failure-on-ppc.patch
* Update LIC_FILES_CHKSUM since the year is changed.
(From OE-Core rev: 2702506f48a1b7e72e1786d24bd0113396dbc85d)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch b/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch deleted file mode 100644 index 1520bcfb6a..0000000000 --- a/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/5184186d4366] | ||
2 | |||
3 | Backport patch from upstream to fix build failures on ppc and ppc64. | ||
4 | |||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
6 | --- | ||
7 | # HG changeset patch | ||
8 | # User Sam Lantinga <slouken@libsdl.org> | ||
9 | # Date 1477159315 25200 | ||
10 | # Node ID 5184186d4366169617b434f5b71c618a7035cde4 | ||
11 | # Parent 71d4148e32de5088c4bc2f04c1e5ded647a2bf82 | ||
12 | Fixed bug 3466 - Can't build 2.0.5 on ppc64 | ||
13 | |||
14 | /home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32': | ||
15 | /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] | ||
16 | const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, | ||
17 | ^ | ||
18 | |||
19 | diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c | ||
20 | --- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700 | ||
21 | +++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700 | ||
22 | @@ -118,12 +118,6 @@ | ||
23 | 16, 8, 0, 24, | ||
24 | 0, NULL | ||
25 | }; | ||
26 | - if (!srcfmt) { | ||
27 | - srcfmt = &default_pixel_format; | ||
28 | - } | ||
29 | - if (!dstfmt) { | ||
30 | - dstfmt = &default_pixel_format; | ||
31 | - } | ||
32 | const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, | ||
33 | 0x04, 0x04, 0x04, 0x04, | ||
34 | 0x08, 0x08, 0x08, 0x08, | ||
35 | @@ -136,6 +130,14 @@ | ||
36 | Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); | ||
37 | Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); | ||
38 | Uint32 amask; | ||
39 | + | ||
40 | + if (!srcfmt) { | ||
41 | + srcfmt = &default_pixel_format; | ||
42 | + } | ||
43 | + if (!dstfmt) { | ||
44 | + dstfmt = &default_pixel_format; | ||
45 | + } | ||
46 | + | ||
47 | /* Use zero for alpha if either surface doesn't have alpha */ | ||
48 | if (dstfmt->Amask) { | ||
49 | amask = | ||
50 | |||