libsdl2: Fix directfb syntax error
PATCH 1/2 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.
--- ...ectfb-spurious-curly-brace-missing-e.patch | 49 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.12.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch new file +49 -0
@@ -0,0 +1,49 @@ +# HG changeset patch +# User Fabrice Fontaine <[email protected]> +# 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 <[email protected]> + +-- + +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 <[email protected]> + + +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;
meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +1 -0
@@ -18,6 +18,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ + file://directfb-spurious-curly-brace-missing-e.patch \ " S = "${WORKDIR}/SDL2-${PV}"
Signature · 1 line
2.25.1
PATCH 2/2 libsdl2: Fix directfb SDL_RenderFillRect
Refactoring of SDL2 internal API has broken SDL_RenderFillRect for DirectFB. The problem has already been fixed upstream.
--- .../libsdl2/directfb-renderfillrect-fix.patch | 33 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.12.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch
meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch new file +33 -0
@@ -0,0 +1,33 @@ +# HG changeset patch +# User Sam Lantinga <[email protected]> +# Date 1590793369 25200 +# Node ID a90089f75990e8b07a1dcf931c5f8a580ae343bf +# Parent a9b4bd264f3cbedc4f3287b3ec6b32311370ba85 +Fixed bug 5146 - SDL_RenderFillRect doesn't work in DirectFB + +Lacky + +It 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. + +Replacing "count" with "len" in the argument list for SDL_memcpy in DirectFB_QueueFillRects fixes problem. + +-- + +The patch was imported from the libsdl Mercurial repository +(https://hg.libsdl.org/SDL) as of changeset id a90089f75990. + +Upstream-Status: Backport + +Signed-off-by: Mark Jonas <[email protected]> + +diff -r a9b4bd264f3c -r a90089f75990 src/video/directfb/SDL_DirectFB_render.c +--- a/src/video/directfb/SDL_DirectFB_render.c Thu May 21 00:06:09 2020 -0400 ++++ b/src/video/directfb/SDL_DirectFB_render.c Fri May 29 16:02:49 2020 -0700 +@@ -626,7 +626,7 @@ + } + + cmd->data.draw.count = count; +- SDL_memcpy(verts, rects, count); ++ SDL_memcpy(verts, rects, len); + return 0; + }
meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +1 -0
@@ -19,6 +19,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ file://directfb-spurious-curly-brace-missing-e.patch \ + file://directfb-renderfillrect-fix.patch \ " S = "${WORKDIR}/SDL2-${PV}"
Signature · 1 line
2.25.1
Mark Jonas <[email protected]> escreveu no dia segunda, 2/11/2020 à(s) 08:45:
Quoted 3 lines
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.
This needs Upstream-Status:
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
Quoted 81 lines
Signed-off-by Mark Jonas <[email protected]>--- ...ectfb-spurious-curly-brace-missing-e.patch | 49 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.12.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patchmeta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch new file +49
-0@@ -0,0 +1,49 @@ +# HG changeset patch +# User Fabrice Fontaine <[email protected]> +# 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 <[email protected]> + +-- + +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 <[email protected]> + + +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;meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +1
-1@@ -18,6 +18,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ + file://directfb-spurious-curly-brace-missing-e.patch \ " S = "${WORKDIR}/SDL2-${PV}" --2.25.1
Signature · 2 lines
best regards, José Quaresma
Re: [OE-core] [PATCH 2/2] libsdl2: Fix directfb SDL_RenderFillRect
In reply to Mark JonasMark Jonas <[email protected]> escreveu no dia segunda, 2/11/2020 à(s) 08:45:
Quoted 3 lines
Refactoring of SDL2 internal API has broken
SDL_RenderFillRectfor DirectFB. The problem has already been fixed upstream.
This needs Upstream-Status:
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
Quoted 65 lines
Signed-off-by Mark Jonas <[email protected]>--- .../libsdl2/directfb-renderfillrect-fix.patch | 33 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.12.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patchmeta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch new file +33
-0@@ -0,0 +1,33 @@ +# HG changeset patch +# User Sam Lantinga <[email protected]> +# Date 1590793369 25200 +# Node ID a90089f75990e8b07a1dcf931c5f8a580ae343bf +# Parent a9b4bd264f3cbedc4f3287b3ec6b32311370ba85 +Fixed bug 5146 - SDL_RenderFillRect doesn't work in DirectFB + +Lacky + +It 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. + +Replacing "count" with "len" in the argument list for SDL_memcpy in DirectFB_QueueFillRects fixes problem. + +-- + +The patch was imported from the libsdl Mercurial repository +(https://hg.libsdl.org/SDL) as of changeset id a90089f75990. + +Upstream-Status: Backport + +Signed-off-by: Mark Jonas <[email protected]> + +diff -r a9b4bd264f3c -r a90089f75990 src/video/directfb/SDL_DirectFB_render.c +--- a/src/video/directfb/SDL_DirectFB_render.c Thu May 21 00:06:09 2020 -0400 ++++ b/src/video/directfb/SDL_DirectFB_render.c Fri May 29 16:02:49 2020 -0700 +@@ -626,7 +626,7 @@ + } + + cmd->data.draw.count = count; +- SDL_memcpy(verts, rects, count); ++ SDL_memcpy(verts, rects, len); + return 0; + }meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +1
-1@@ -19,6 +19,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ file://directfb-spurious-curly-brace-missing-e.patch \ + file://directfb-renderfillrect-fix.patch \ " S = "${WORKDIR}/SDL2-${PV}" --2.25.1
Signature · 2 lines
best regards, José Quaresma
Re: [OE-core] [PATCH 2/2] libsdl2: Fix directfb SDL_RenderFillRect
In reply to a message not in the archiveJose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia segunda, 2/11/2020 à(s) 09:41:
Quoted 34 lines
Mark Jonas <[email protected]> escreveu no dia segunda, 2/11/2020 à(s) 08:45:
Quoted 3 lines
Refactoring of SDL2 internal API has broken
SDL_RenderFillRectfor DirectFB. The problem has already been fixed upstream.This needs Upstream-Status:
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-StatusQuoted 25 lines
Signed-off-by Mark Jonas <[email protected]>--- .../libsdl2/directfb-renderfillrect-fix.patch | 33 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.12.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patchmeta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch new file +11
-0@@ -0,0 +1,33 @@ +# HG changeset patch +# User Sam Lantinga <[email protected]> +# Date 1590793369 25200 +# Node ID a90089f75990e8b07a1dcf931c5f8a580ae343bf +# Parent a9b4bd264f3cbedc4f3287b3ec6b32311370ba85 +Fixed bug 5146 - SDL_RenderFillRect doesn't work in DirectFB + +Lacky + +It 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. +
Quoted 8 lines
meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch line 19
Quoted 8 lines
meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch new file +8
-0+Replacing "count" with "len" in the argument list for SDL_memcpy in DirectFB_QueueFillRects fixes problem. + +-- + +The patch was imported from the libsdl Mercurial repository +(https://hg.libsdl.org/SDL) as of changeset id a90089f75990. + +Upstream-Status: Backport
Sorry for that!
Upstream-Status is present
Quoted 40 lines
Quoted 27 lines
meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch new file +14
-0+ +Signed-off-by: Mark Jonas <[email protected]> + +diff -r a9b4bd264f3c -r a90089f75990 src/video/directfb/SDL_DirectFB_render.c +--- a/src/video/directfb/SDL_DirectFB_render.c Thu May 21 00:06:09 2020 -0400 ++++ b/src/video/directfb/SDL_DirectFB_render.c Fri May 29 16:02:49 2020 -0700 +@@ -626,7 +626,7 @@ + } + + cmd->data.draw.count = count; +- SDL_memcpy(verts, rects, count); ++ SDL_memcpy(verts, rects, len); + return 0; + }meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +1
-1@@ -19,6 +19,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ file://directfb-spurious-curly-brace-missing-e.patch \ + file://directfb-renderfillrect-fix.patch \ " S = "${WORKDIR}/SDL2-${PV}" --Quoted 5 lines
2.25.1
--
best regards,
José Quaresma
Signature · 2 lines
best regards, José Quaresma
Jose Quaresma via lists.openembedded.org <[email protected]> escreveu no dia segunda, 2/11/2020 à(s) 09:41:
Quoted 44 lines
Mark Jonas <[email protected]> escreveu no dia segunda, 2/11/2020 à(s) 08:45:
Quoted 3 lines
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.
This needs Upstream-Status:
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-StatusQuoted 35 lines
Signed-off-by Mark Jonas <[email protected]>--- ...ectfb-spurious-curly-brace-missing-e.patch | 49 +++++++++++++++++++ .../libsdl2/libsdl2_2.0.12.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patchmeta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch new file +21
-0@@ -0,0 +1,49 @@ +# HG changeset patch +# User Fabrice Fontaine <[email protected]> +# 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 +
Quoted 8 lines
meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch line 29
Quoted 8 lines
meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch new file +8
-0+Signed-off-by: Fabrice Fontaine <[email protected]> + +-- + +The patch was imported from the libsdl Mercurial repository +(https://hg.libsdl.org/SDL) as of changeset id 769f80095217. + +Upstream-Status: Backport
Sorry for that!
Upstream-Status is present
Quoted 46 lines
Quoted 33 lines
meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch new file +20
-0+ +Signed-off-by: Mark Jonas <[email protected]> + + +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;meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +1
-1@@ -18,6 +18,7 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ + file://directfb-spurious-curly-brace-missing-e.patch \ " S = "${WORKDIR}/SDL2-${PV}" --Quoted 5 lines
2.25.1
--
best regards,
José Quaresma
Signature · 2 lines
best regards, José Quaresma