summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl2
diff options
context:
space:
mode:
authorYann Dirson <yann@blade-group.com>2021-02-01 11:23:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-05 08:16:32 +0000
commit9449f2276422a21d5f9b9f05fbc1d79bc1a19f83 (patch)
treebc08ae1b9340c92345cc3c047c992665052d115d /meta/recipes-graphics/libsdl2
parent4cb93cd028f171143089a64a1a17b3c9a085d4b2 (diff)
downloadpoky-9449f2276422a21d5f9b9f05fbc1d79bc1a19f83.tar.gz
libsdl2: upgrade to 2.0.14
This version does not support tslib any more, as can be seen by the failed AUH run. Originally-by: Romain Roffé <romain.roffe@blade-group.com> (From OE-Core rev: 5b54e97594ab021a73d3225ed42dac0dfaf3fc15) Signed-off-by: Yann Dirson <yann@blade-group.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl2')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch33
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch49
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb)6
3 files changed, 1 insertions, 87 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch
deleted file mode 100644
index 83d4f4b1ec..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1# HG changeset patch
2# User Sam Lantinga <slouken@libsdl.org>
3# Date 1590793369 25200
4# Node ID a90089f75990e8b07a1dcf931c5f8a580ae343bf
5# Parent a9b4bd264f3cbedc4f3287b3ec6b32311370ba85
6Fixed bug 5146 - SDL_RenderFillRect doesn't work in DirectFB
7
8Lacky
9
10It looks like refactoring of SDL2 internal API has broken SDL_RenderFillRect for DirectFB. In new version function SDL_RenderFillRect returns 0, but rectangle is not visible.
11
12Replacing "count" with "len" in the argument list for SDL_memcpy in DirectFB_QueueFillRects fixes problem.
13
14--
15
16The patch was imported from the libsdl Mercurial repository
17(https://hg.libsdl.org/SDL) as of changeset id a90089f75990.
18
19Upstream-Status: Backport
20
21Signed-off-by: Mark Jonas <toertel@gmail.com>
22
23diff -r a9b4bd264f3c -r a90089f75990 src/video/directfb/SDL_DirectFB_render.c
24--- a/src/video/directfb/SDL_DirectFB_render.c Thu May 21 00:06:09 2020 -0400
25+++ b/src/video/directfb/SDL_DirectFB_render.c Fri May 29 16:02:49 2020 -0700
26@@ -626,7 +626,7 @@
27 }
28
29 cmd->data.draw.count = count;
30- SDL_memcpy(verts, rects, count);
31+ SDL_memcpy(verts, rects, len);
32 return 0;
33 }
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
deleted file mode 100644
index aa351a89ba..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1# HG changeset patch
2# User Fabrice Fontaine <fontaine.fabrice@gmail.com>
3# Date 1585069551 25200
4# Node ID 769f800952179633ec6c3e6bc1bc1d40e401750a
5# Parent 63387e8920f58f608288f247824ec5f4c286691f
6src/video/directfb/SDL_DirectFB_render.c: fix build
7Build with directfb is broken due to a spurious '}' and a missing 'E'
8since version 2.0.12 and https://hg.libsdl.org/SDL/rev/2d5b5a5ccbfb:
9
10/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c: In function 'SetBlendMode':
11/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:202:9: error: case label not within a switch statement
12 202 | case SDL_BLENDMODE_MUL:
13 | ^~~~
14
15/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:205:67: error: 'DSBF_DSTCOLOR' undeclared (first use in this function); did you mean 'DSBF_DESTCOLOR'?
16 205 | SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR));
17 | ^~~~~~~~~~~~~
18
19Fixes:
20 - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77
21
22Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
23
24--
25
26The patch was imported from the libsdl Mercurial repository
27(https://hg.libsdl.org/SDL) as of changeset id 769f80095217.
28
29Upstream-Status: Backport
30
31Signed-off-by: Mark Jonas <toertel@gmail.com>
32
33
34diff -r 63387e8920f5 -r 769f80095217 src/video/directfb/SDL_DirectFB_render.c
35--- a/src/video/directfb/SDL_DirectFB_render.c Mon Mar 23 14:10:25 2020 -0700
36+++ b/src/video/directfb/SDL_DirectFB_render.c Tue Mar 24 10:05:51 2020 -0700
37@@ -198,11 +198,10 @@
38 SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR));
39
40 break;
41- }
42 case SDL_BLENDMODE_MUL:
43 data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
44 data->drawFlags = DSDRAW_BLEND;
45- SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR));
46+ SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR));
47 SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
48
49 break;
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb
index 5fa99821c4..872592fdae 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb
@@ -18,14 +18,11 @@ PROVIDES = "virtual/libsdl2"
18 18
19SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 19SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
20 file://more-gen-depends.patch \ 20 file://more-gen-depends.patch \
21 file://directfb-spurious-curly-brace-missing-e.patch \
22 file://directfb-renderfillrect-fix.patch \
23" 21"
24 22
25S = "${WORKDIR}/SDL2-${PV}" 23S = "${WORKDIR}/SDL2-${PV}"
26 24
27SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" 25SRC_URI[sha256sum] = "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc"
28SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863"
29 26
30inherit autotools lib_package binconfig-disabled pkgconfig 27inherit autotools lib_package binconfig-disabled pkgconfig
31 28
@@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
64PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" 61PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm"
65PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" 62PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl"
66PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" 63PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
67PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
68PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon" 64PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon"
69PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" 65PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
70 66