| # HG changeset patch |
| # User Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| # Date 1585069551 25200 |
| # Node ID 769f800952179633ec6c3e6bc1bc1d40e401750a |
| # Parent 63387e8920f58f608288f247824ec5f4c286691f |
| src/video/directfb/SDL_DirectFB_render.c: fix build |
| Build with directfb is broken due to a spurious '}' and a missing 'E' |
| since version 2.0.12 and https://hg.libsdl.org/SDL/rev/2d5b5a5ccbfb: |
| |
| /home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c: In function 'SetBlendMode': |
| /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 |
| 202 | case SDL_BLENDMODE_MUL: |
| | ^~~~ |
| |
| /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'? |
| 205 | SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR)); |
| | ^~~~~~~~~~~~~ |
| |
| Fixes: |
| - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77 |
| |
| Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| |
| -- |
| |
| The patch was imported from the libsdl Mercurial repository |
| (https://hg.libsdl.org/SDL) as of changeset id 769f80095217. |
| |
| Upstream-Status: Backport |
| |
| Signed-off-by: Mark Jonas <toertel@gmail.com> |
| |
| |
| diff -r 63387e8920f5 -r 769f80095217 src/video/directfb/SDL_DirectFB_render.c |
| --- a/src/video/directfb/SDL_DirectFB_render.c Mon Mar 23 14:10:25 2020 -0700 |
| +++ b/src/video/directfb/SDL_DirectFB_render.c Tue Mar 24 10:05:51 2020 -0700 |
| @@ -198,11 +198,10 @@ |
| SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR)); |
| |
| break; |
| - } |
| case SDL_BLENDMODE_MUL: |
| data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL; |
| data->drawFlags = DSDRAW_BLEND; |
| - SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR)); |
| + SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR)); |
| SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA)); |
| |
| break; |