From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/sdl2: fix build with directfb
Date: Tue, 24 Mar 2020 22:15:43 +0100 [thread overview]
Message-ID: <20200324211543.GN22325@scaer> (raw)
In-Reply-To: <20200324192121.3692-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2020-03-24 20:21 +0100, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...ctfb-SDL_DirectFB_render.c-fix-build.patch | 46 +++++++++++++++++++
> 1 file changed, 46 insertions(+)
> create mode 100644 package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch
>
> diff --git a/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch b/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch
> new file mode 100644
> index 0000000000..2fbad97402
> --- /dev/null
> +++ b/package/sdl2/0001-src-video-directfb-SDL_DirectFB_render.c-fix-build.patch
> @@ -0,0 +1,46 @@
> +From 7c6d466d98910a2896680351cc5cea1b7fb37ab9 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Tue, 24 Mar 2020 13:33:40 +0100
> +Subject: [PATCH] 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>
> +[Retrieved from: https://hg.libsdl.org/SDL/rev/769f80095217]
> +---
> + src/video/directfb/SDL_DirectFB_render.c | 3 +--
> + 1 file changed, 1 insertion(+), 2 deletions(-)
> +
> +diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c
> +index 618009850..cc31fb8f4 100644
> +--- a/src/video/directfb/SDL_DirectFB_render.c
> ++++ b/src/video/directfb/SDL_DirectFB_render.c
> +@@ -198,11 +198,10 @@ SetBlendMode(DirectFB_RenderData * data, int blendMode,
> + 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;
> +--
> +2.25.1
> +
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2020-03-24 21:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 19:21 [Buildroot] [PATCH 1/1] package/sdl2: fix build with directfb Fabrice Fontaine
2020-03-24 21:15 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200324211543.GN22325@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox