summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl2
diff options
context:
space:
mode:
authorMark Jonas <toertel@gmail.com>2020-11-02 09:34:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-03 08:21:10 +0000
commit9e9871de010d79cb93aeb48d8d56bac62c09e347 (patch)
treeea5f7f01489db50ef766ee41a8e65124e5a8e964 /meta/recipes-graphics/libsdl2
parent7661beb222022b33bdc7e1589479f428bbed84d8 (diff)
downloadpoky-9e9871de010d79cb93aeb48d8d56bac62c09e347.tar.gz
libsdl2: Fix directfb syntax error
Build of libsdl2 with directfb is broken due to a spurious '}' and a missing 'E' since version 2.0.12. The upstream is already fixed. (From OE-Core rev: 8963daba093c3c5e2c60e1e4e057862971b84cb0) Signed-off-by: Mark Jonas <toertel@gmail.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-spurious-curly-brace-missing-e.patch49
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb1
2 files changed, 50 insertions, 0 deletions
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
new file mode 100644
index 0000000000..aa351a89ba
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
@@ -0,0 +1,49 @@
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.12.bb
index 83dce86801..8ecf161f69 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
@@ -18,6 +18,7 @@ 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 \
21" 22"
22 23
23S = "${WORKDIR}/SDL2-${PV}" 24S = "${WORKDIR}/SDL2-${PV}"