summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-11-14 01:58:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:06:13 +0000
commitf955ef4758ec88a88084b9aafb7ce11ff9bf475e (patch)
tree83f1b933903868bd07557f1e969c0f8cc361d77b
parent3b439ef177187f99e465ea44e90fdb21dae10175 (diff)
downloadpoky-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
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch50
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/linkage.patch46
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.7.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb)8
3 files changed, 3 insertions, 101 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 @@
1Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/5184186d4366]
2
3Backport patch from upstream to fix build failures on ppc and ppc64.
4
5Signed-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
12Fixed 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
19diff -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
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
deleted file mode 100644
index 60185b131f..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1When building use the libtool intermediate .lo files instead of explicitly using
2the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is
3a static build, and .libs/foo.o is a shared build.
4
5If static libraries have been disabled globally then libtool won't generate them
6and explicit references to foo.o won't be satisfied.
7
8Upstream-Status: Pending
9RP
102016/1/16
11
12
13Index: SDL2-2.0.4/configure.in
14===================================================================
15--- SDL2-2.0.4.orig/configure.in
16+++ SDL2-2.0.4/configure.in
17@@ -3464,23 +3464,23 @@ done
18
19 VERSION_OBJECTS=`echo $VERSION_SOURCES`
20 VERSION_DEPENDS=`echo $VERSION_SOURCES`
21-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
22+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
23 VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
24-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
25+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
26 \\$(WINDRES) \\$< \\$@,g"`
27
28 SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
29 SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
30-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
31+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
32 SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
33-\\$(objects)/\\2.o: \\1/\\2.c\\\\
34+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
35 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
36
37 SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
38 SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
39-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
40+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
41 SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
42-\\$(objects)/\\2.o: \\1/\\2.c\\\\
43+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
44 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
45
46 # Set runtime shared library paths as needed
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.7.bb
index 032f45bb20..fcbfa738b5 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.7.bb
@@ -8,7 +8,7 @@ BUGTRACKER = "http://bugzilla.libsdl.org/"
8SECTION = "libs" 8SECTION = "libs"
9 9
10LICENSE = "Zlib" 10LICENSE = "Zlib"
11LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b2304ad7e91711027590d3f102a754b7" 11LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e4688d3bd5bf02dadaa3e5182fd9eda9"
12 12
13PROVIDES = "virtual/libsdl2" 13PROVIDES = "virtual/libsdl2"
14 14
@@ -16,14 +16,12 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtu
16 16
17SRC_URI = " \ 17SRC_URI = " \
18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
19 file://linkage.patch \
20 file://fix-build-failure-on-ppc.patch \
21" 19"
22 20
23S = "${WORKDIR}/SDL2-${PV}" 21S = "${WORKDIR}/SDL2-${PV}"
24 22
25SRC_URI[md5sum] = "d4055424d556b4a908aa76fad63abd3c" 23SRC_URI[md5sum] = "cdb071009d250e1782371049f0d5ca42"
26SRC_URI[sha256sum] = "442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785" 24SRC_URI[sha256sum] = "ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e"
27 25
28inherit autotools lib_package binconfig pkgconfig 26inherit autotools lib_package binconfig pkgconfig
29 27
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 19:13:20 +0000