[1/1] package/sdl2: fix build with directfb

Message ID	20200324192121.3692-1-fontaine.fabrice@gmail.com
State	Accepted
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: Fabrice Fontaine <fontaine.fabrice@gmail.com> To: buildroot@buildroot.org Date: Tue, 24 Mar 2020 20:21:21 +0100 Message-Id: <20200324192121.3692-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/sdl2: fix build with directfb Precedence: list Cc: Michael Fischer <mf@go-sys.de>, Fabrice Fontaine <fontaine.fabrice@gmail.com>, Guillaume Gardet <guillaume.gardet@oliseo.fr> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	[1/1] package/sdl2: fix build with directfb \| expand [1/1] package/sdl2: fix build with directfb

Message ID

20200324192121.3692-1-fontaine.fabrice@gmail.com

State

Accepted

Headers

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@buildroot.org
Date: Tue, 24 Mar 2020 20:21:21 +0100
Message-Id: <20200324192121.3692-1-fontaine.fabrice@gmail.com>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH 1/1] package/sdl2: fix build with directfb
Precedence: list
Cc: Michael Fischer <mf@go-sys.de>,
	Fabrice Fontaine <fontaine.fabrice@gmail.com>,
	Guillaume Gardet <guillaume.gardet@oliseo.fr>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

[1/1] package/sdl2: fix build with directfb | expand

Commit Message

Fabrice Fontaine March 24, 2020, 7:21 p.m. UTC

Fixes:
 - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...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

Comments

Yann E. MORIN March 24, 2020, 9:15 p.m. UTC | #1

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@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

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
+

[1/1] package/sdl2: fix build with directfb

Commit Message

Comments

Patch