* [PATCH] libsdl2: upgrade to 2.0.14
@ 2021-02-01 10:23 Yann Dirson
2021-02-01 19:10 ` [OE-core] " Mark Jonas
2021-02-03 20:56 ` Andrey Zhizhikin
0 siblings, 2 replies; 9+ messages in thread
From: Yann Dirson @ 2021-02-01 10:23 UTC (permalink / raw)
To: openembedded-core; +Cc: Yann Dirson, Romain Roffé
From: Yann Dirson <yann@blade-group.com>
This version does not support tslib any more, as can be seen by the
failed AUH run.
Originally-by: Romain Roffé <romain.roffe@blade-group.com>
Signed-off-by: Yann Dirson <yann@blade-group.com>
---
.../libsdl2/directfb-renderfillrect-fix.patch | 33 -------------
...ectfb-spurious-curly-brace-missing-e.patch | 49 -------------------
.../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +--
3 files changed, 1 insertion(+), 87 deletions(-)
delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch
delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} (91%)
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch
deleted file mode 100644
index 83d4f4b1ec..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# 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 <toertel@gmail.com>
-
-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;
- }
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
deleted file mode 100644
index aa351a89ba..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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;
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb
similarity index 91%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb
index 5fa99821c4..872592fdae 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb
@@ -18,14 +18,11 @@ 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}"
-SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff"
-SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863"
+SRC_URI[sha256sum] = "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc"
inherit autotools lib_package binconfig-disabled pkgconfig
@@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm"
PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl"
PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
-PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib"
PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon"
PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender"
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 2021-02-01 10:23 [PATCH] libsdl2: upgrade to 2.0.14 Yann Dirson @ 2021-02-01 19:10 ` Mark Jonas 2021-02-03 13:54 ` Yann Dirson 2021-02-03 20:56 ` Andrey Zhizhikin 1 sibling, 1 reply; 9+ messages in thread From: Mark Jonas @ 2021-02-01 19:10 UTC (permalink / raw) To: Yann Dirson; +Cc: OE Core mailing list, Yann Dirson, Romain Roffé Hi, tslib support is often relevant for embedded projects with simple (resistive) touch screens. Would it make sense to keep the 2.0.12 recipe and offer both in parallel? Cheers, Mark On Mon, Feb 1, 2021 at 11:23 AM Yann Dirson <yann.dirson@blade-group.com> wrote: > > From: Yann Dirson <yann@blade-group.com> > > This version does not support tslib any more, as can be seen by the > failed AUH run. > > Originally-by: Romain Roffé <romain.roffe@blade-group.com> > Signed-off-by: Yann Dirson <yann@blade-group.com> > --- > .../libsdl2/directfb-renderfillrect-fix.patch | 33 ------------- > ...ectfb-spurious-curly-brace-missing-e.patch | 49 ------------------- > .../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +-- > 3 files changed, 1 insertion(+), 87 deletions(-) > delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch > rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} (91%) > > diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > deleted file mode 100644 > index 83d4f4b1ec..0000000000 > --- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -# HG changeset patch > -# User Sam Lantinga <slouken@libsdl.org> > -# 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 <toertel@gmail.com> > - > -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; > - } > 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 > deleted file mode 100644 > index aa351a89ba..0000000000 > --- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -# 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; > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > similarity index 91% > rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > index 5fa99821c4..872592fdae 100644 > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > @@ -18,14 +18,11 @@ 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}" > > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" > -SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" > +SRC_URI[sha256sum] = "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" > > inherit autotools lib_package binconfig-disabled pkgconfig > > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" > PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" > PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" > PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" > -PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" > PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon" > PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" > > -- > 2.29.2 > > > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 2021-02-01 19:10 ` [OE-core] " Mark Jonas @ 2021-02-03 13:54 ` Yann Dirson 2021-02-03 17:05 ` Alexander Kanavin [not found] ` <16604BBA745DB2D9.18741@lists.openembedded.org> 0 siblings, 2 replies; 9+ messages in thread From: Yann Dirson @ 2021-02-03 13:54 UTC (permalink / raw) To: Mark Jonas; +Cc: OE Core mailing list, Yann Dirson, Romain Roffé [-- Attachment #1: Type: text/plain, Size: 8442 bytes --] Le lun. 1 févr. 2021 à 20:11, Mark Jonas <toertel@gmail.com> a écrit : > Hi, > > tslib support is often relevant for embedded projects with simple > (resistive) touch screens. Would it make sense to keep the 2.0.12 > recipe and offer both in parallel? > What do others think ? We could use a libsdl2.inc with the common stuff, of just keep the current 2.0.12 version as is. Maybe even move the 2.0.12 recipe to meta-oe, where tslib seems to live nowadays, although that could make the recipe harder to find for those who need it. I'd suggest if that support is still needed, to approach libsdl upstream with a patch restoring the tslib support ? Maybe we could even carry such a patch in yocto until upstream does something ? That could be better than just carying an old version. > Cheers, > Mark > > On Mon, Feb 1, 2021 at 11:23 AM Yann Dirson <yann.dirson@blade-group.com> > wrote: > > > > From: Yann Dirson <yann@blade-group.com> > > > > This version does not support tslib any more, as can be seen by the > > failed AUH run. > > > > Originally-by: Romain Roffé <romain.roffe@blade-group.com> > > Signed-off-by: Yann Dirson <yann@blade-group.com> > > --- > > .../libsdl2/directfb-renderfillrect-fix.patch | 33 ------------- > > ...ectfb-spurious-curly-brace-missing-e.patch | 49 ------------------- > > .../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +-- > > 3 files changed, 1 insertion(+), 87 deletions(-) > > delete mode 100644 > meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > > delete mode 100644 > meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch > > rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => > libsdl2_2.0.14.bb} (91%) > > > > diff --git > a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > > deleted file mode 100644 > > index 83d4f4b1ec..0000000000 > > --- > a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > > +++ /dev/null > > @@ -1,33 +0,0 @@ > > -# HG changeset patch > > -# User Sam Lantinga <slouken@libsdl.org> > > -# 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 <toertel@gmail.com> > > - > > -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; > > - } > > 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 > > deleted file mode 100644 > > index aa351a89ba..0000000000 > > --- > a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch > > +++ /dev/null > > @@ -1,49 +0,0 @@ > > -# 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; > > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > > similarity index 91% > > rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > > rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > > index 5fa99821c4..872592fdae 100644 > > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > > @@ -18,14 +18,11 @@ 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}" > > > > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" > > -SRC_URI[sha256sum] = > "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" > > +SRC_URI[sha256sum] = > "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" > > > > inherit autotools lib_package binconfig-disabled pkgconfig > > > > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = > "--enable-jack,--disable-jack,jack" > > PACKAGECONFIG[kmsdrm] = > "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" > > PACKAGECONFIG[opengl] = > "--enable-video-opengl,--disable-video-opengl,virtual/libgl" > > PACKAGECONFIG[pulseaudio] = > "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" > > -PACKAGECONFIG[tslib] = > "--enable-input-tslib,--disable-input-tslib,tslib" > > PACKAGECONFIG[wayland] = > "--enable-video-wayland,--disable-video-wayland,wayland-native wayland > wayland-protocols libxkbcommon" > > PACKAGECONFIG[x11] = > "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr > libxrender" > > > > -- > > 2.29.2 > > > > > > > > > -- Yann Dirson <yann@blade-group.com> Blade / Shadow -- http://shadow.tech [-- Attachment #2: Type: text/html, Size: 12057 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 2021-02-03 13:54 ` Yann Dirson @ 2021-02-03 17:05 ` Alexander Kanavin [not found] ` <16604BBA745DB2D9.18741@lists.openembedded.org> 1 sibling, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-02-03 17:05 UTC (permalink / raw) To: Yann Dirson Cc: Mark Jonas, OE Core mailing list, Yann Dirson, Romain Roffé [-- Attachment #1: Type: text/plain, Size: 8936 bytes --] Certainly not in oe-core please. This looks like a problem you need to take upstream, and until then do any downgrades via private layer. Alex On Wed, 3 Feb 2021 at 14:54, Yann Dirson <yann.dirson@blade-group.com> wrote: > Le lun. 1 févr. 2021 à 20:11, Mark Jonas <toertel@gmail.com> a écrit : > >> Hi, >> >> tslib support is often relevant for embedded projects with simple >> (resistive) touch screens. Would it make sense to keep the 2.0.12 >> recipe and offer both in parallel? >> > > What do others think ? > > We could use a libsdl2.inc with the common stuff, of just keep the current > 2.0.12 > version as is. Maybe even move the 2.0.12 recipe to meta-oe, where tslib > seems > to live nowadays, although that could make the recipe harder to find for > those who > need it. > > I'd suggest if that support is still needed, to approach libsdl upstream > with a patch > restoring the tslib support ? Maybe we could even carry such a patch in > yocto until > upstream does something ? That could be better than just carying an old > version. > > >> Cheers, >> Mark >> >> On Mon, Feb 1, 2021 at 11:23 AM Yann Dirson <yann.dirson@blade-group.com> >> wrote: >> > >> > From: Yann Dirson <yann@blade-group.com> >> > >> > This version does not support tslib any more, as can be seen by the >> > failed AUH run. >> > >> > Originally-by: Romain Roffé <romain.roffe@blade-group.com> >> > Signed-off-by: Yann Dirson <yann@blade-group.com> >> > --- >> > .../libsdl2/directfb-renderfillrect-fix.patch | 33 ------------- >> > ...ectfb-spurious-curly-brace-missing-e.patch | 49 ------------------- >> > .../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +-- >> > 3 files changed, 1 insertion(+), 87 deletions(-) >> > delete mode 100644 >> meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >> > delete mode 100644 >> meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch >> > rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => >> libsdl2_2.0.14.bb} (91%) >> > >> > diff --git >> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >> b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >> > deleted file mode 100644 >> > index 83d4f4b1ec..0000000000 >> > --- >> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >> > +++ /dev/null >> > @@ -1,33 +0,0 @@ >> > -# HG changeset patch >> > -# User Sam Lantinga <slouken@libsdl.org> >> > -# 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 <toertel@gmail.com> >> > - >> > -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; >> > - } >> > 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 >> > deleted file mode 100644 >> > index aa351a89ba..0000000000 >> > --- >> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch >> > +++ /dev/null >> > @@ -1,49 +0,0 @@ >> > -# 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; >> > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >> > similarity index 91% >> > rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >> > rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >> > index 5fa99821c4..872592fdae 100644 >> > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >> > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >> > @@ -18,14 +18,11 @@ 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}" >> > >> > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" >> > -SRC_URI[sha256sum] = >> "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" >> > +SRC_URI[sha256sum] = >> "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" >> > >> > inherit autotools lib_package binconfig-disabled pkgconfig >> > >> > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = >> "--enable-jack,--disable-jack,jack" >> > PACKAGECONFIG[kmsdrm] = >> "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" >> > PACKAGECONFIG[opengl] = >> "--enable-video-opengl,--disable-video-opengl,virtual/libgl" >> > PACKAGECONFIG[pulseaudio] = >> "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" >> > -PACKAGECONFIG[tslib] = >> "--enable-input-tslib,--disable-input-tslib,tslib" >> > PACKAGECONFIG[wayland] = >> "--enable-video-wayland,--disable-video-wayland,wayland-native wayland >> wayland-protocols libxkbcommon" >> > PACKAGECONFIG[x11] = >> "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr >> libxrender" >> > >> > -- >> > 2.29.2 >> > >> > >> > >> > >> > > > -- > Yann Dirson <yann@blade-group.com> > Blade / Shadow -- http://shadow.tech > > > > > [-- Attachment #2: Type: text/html, Size: 12617 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <16604BBA745DB2D9.18741@lists.openembedded.org>]
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 [not found] ` <16604BBA745DB2D9.18741@lists.openembedded.org> @ 2021-02-03 19:47 ` Alexander Kanavin [not found] ` <1660549372F1DC15.22837@lists.openembedded.org> 1 sibling, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-02-03 19:47 UTC (permalink / raw) To: Alexander Kanavin Cc: Yann Dirson, Mark Jonas, OE Core mailing list, Yann Dirson, Romain Roffé [-- Attachment #1: Type: text/plain, Size: 9488 bytes --] It looks like tslib support was not in 2.0.12 version either, and probably was ripped out long time ago: http://hg.libsdl.org/SDL/rev/a708852dbd5c Alex On Wed, 3 Feb 2021 at 18:05, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > Certainly not in oe-core please. This looks like a problem you need to > take upstream, and until then do any downgrades via private layer. > > Alex > > On Wed, 3 Feb 2021 at 14:54, Yann Dirson <yann.dirson@blade-group.com> > wrote: > >> Le lun. 1 févr. 2021 à 20:11, Mark Jonas <toertel@gmail.com> a écrit : >> >>> Hi, >>> >>> tslib support is often relevant for embedded projects with simple >>> (resistive) touch screens. Would it make sense to keep the 2.0.12 >>> recipe and offer both in parallel? >>> >> >> What do others think ? >> >> We could use a libsdl2.inc with the common stuff, of just keep the >> current 2.0.12 >> version as is. Maybe even move the 2.0.12 recipe to meta-oe, where tslib >> seems >> to live nowadays, although that could make the recipe harder to find for >> those who >> need it. >> >> I'd suggest if that support is still needed, to approach libsdl upstream >> with a patch >> restoring the tslib support ? Maybe we could even carry such a patch in >> yocto until >> upstream does something ? That could be better than just carying an old >> version. >> >> >>> Cheers, >>> Mark >>> >>> On Mon, Feb 1, 2021 at 11:23 AM Yann Dirson <yann.dirson@blade-group.com> >>> wrote: >>> > >>> > From: Yann Dirson <yann@blade-group.com> >>> > >>> > This version does not support tslib any more, as can be seen by the >>> > failed AUH run. >>> > >>> > Originally-by: Romain Roffé <romain.roffe@blade-group.com> >>> > Signed-off-by: Yann Dirson <yann@blade-group.com> >>> > --- >>> > .../libsdl2/directfb-renderfillrect-fix.patch | 33 ------------- >>> > ...ectfb-spurious-curly-brace-missing-e.patch | 49 ------------------- >>> > .../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +-- >>> > 3 files changed, 1 insertion(+), 87 deletions(-) >>> > delete mode 100644 >>> meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>> > delete mode 100644 >>> meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch >>> > rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => >>> libsdl2_2.0.14.bb} (91%) >>> > >>> > diff --git >>> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>> b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>> > deleted file mode 100644 >>> > index 83d4f4b1ec..0000000000 >>> > --- >>> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>> > +++ /dev/null >>> > @@ -1,33 +0,0 @@ >>> > -# HG changeset patch >>> > -# User Sam Lantinga <slouken@libsdl.org> >>> > -# 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 <toertel@gmail.com> >>> > - >>> > -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; >>> > - } >>> > 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 >>> > deleted file mode 100644 >>> > index aa351a89ba..0000000000 >>> > --- >>> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch >>> > +++ /dev/null >>> > @@ -1,49 +0,0 @@ >>> > -# 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; >>> > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >>> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >>> > similarity index 91% >>> > rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >>> > rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >>> > index 5fa99821c4..872592fdae 100644 >>> > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >>> > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >>> > @@ -18,14 +18,11 @@ 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}" >>> > >>> > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" >>> > -SRC_URI[sha256sum] = >>> "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" >>> > +SRC_URI[sha256sum] = >>> "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" >>> > >>> > inherit autotools lib_package binconfig-disabled pkgconfig >>> > >>> > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = >>> "--enable-jack,--disable-jack,jack" >>> > PACKAGECONFIG[kmsdrm] = >>> "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" >>> > PACKAGECONFIG[opengl] = >>> "--enable-video-opengl,--disable-video-opengl,virtual/libgl" >>> > PACKAGECONFIG[pulseaudio] = >>> "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" >>> > -PACKAGECONFIG[tslib] = >>> "--enable-input-tslib,--disable-input-tslib,tslib" >>> > PACKAGECONFIG[wayland] = >>> "--enable-video-wayland,--disable-video-wayland,wayland-native wayland >>> wayland-protocols libxkbcommon" >>> > PACKAGECONFIG[x11] = >>> "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr >>> libxrender" >>> > >>> > -- >>> > 2.29.2 >>> > >>> > >>> > >>> > >>> >> >> >> -- >> Yann Dirson <yann@blade-group.com> >> Blade / Shadow -- http://shadow.tech >> >> >> >> >> > > > [-- Attachment #2: Type: text/html, Size: 13376 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <1660549372F1DC15.22837@lists.openembedded.org>]
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 [not found] ` <1660549372F1DC15.22837@lists.openembedded.org> @ 2021-02-03 20:29 ` Alexander Kanavin 0 siblings, 0 replies; 9+ messages in thread From: Alexander Kanavin @ 2021-02-03 20:29 UTC (permalink / raw) To: Alexander Kanavin Cc: Yann Dirson, Mark Jonas, OE Core mailing list, Yann Dirson, Romain Roffé [-- Attachment #1: Type: text/plain, Size: 10006 bytes --] I digged a bit: I think libsdl 1.x might still have it, but libsdl 2.x definitely does not. Alex On Wed, 3 Feb 2021 at 20:47, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > It looks like tslib support was not in 2.0.12 version either, and probably > was ripped out long time ago: > http://hg.libsdl.org/SDL/rev/a708852dbd5c > > Alex > > On Wed, 3 Feb 2021 at 18:05, Alexander Kanavin via lists.openembedded.org > <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > >> Certainly not in oe-core please. This looks like a problem you need to >> take upstream, and until then do any downgrades via private layer. >> >> Alex >> >> On Wed, 3 Feb 2021 at 14:54, Yann Dirson <yann.dirson@blade-group.com> >> wrote: >> >>> Le lun. 1 févr. 2021 à 20:11, Mark Jonas <toertel@gmail.com> a écrit : >>> >>>> Hi, >>>> >>>> tslib support is often relevant for embedded projects with simple >>>> (resistive) touch screens. Would it make sense to keep the 2.0.12 >>>> recipe and offer both in parallel? >>>> >>> >>> What do others think ? >>> >>> We could use a libsdl2.inc with the common stuff, of just keep the >>> current 2.0.12 >>> version as is. Maybe even move the 2.0.12 recipe to meta-oe, where >>> tslib seems >>> to live nowadays, although that could make the recipe harder to find for >>> those who >>> need it. >>> >>> I'd suggest if that support is still needed, to approach libsdl upstream >>> with a patch >>> restoring the tslib support ? Maybe we could even carry such a patch in >>> yocto until >>> upstream does something ? That could be better than just carying an old >>> version. >>> >>> >>>> Cheers, >>>> Mark >>>> >>>> On Mon, Feb 1, 2021 at 11:23 AM Yann Dirson < >>>> yann.dirson@blade-group.com> wrote: >>>> > >>>> > From: Yann Dirson <yann@blade-group.com> >>>> > >>>> > This version does not support tslib any more, as can be seen by the >>>> > failed AUH run. >>>> > >>>> > Originally-by: Romain Roffé <romain.roffe@blade-group.com> >>>> > Signed-off-by: Yann Dirson <yann@blade-group.com> >>>> > --- >>>> > .../libsdl2/directfb-renderfillrect-fix.patch | 33 ------------- >>>> > ...ectfb-spurious-curly-brace-missing-e.patch | 49 >>>> ------------------- >>>> > .../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +-- >>>> > 3 files changed, 1 insertion(+), 87 deletions(-) >>>> > delete mode 100644 >>>> meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>>> > delete mode 100644 >>>> meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch >>>> > rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => >>>> libsdl2_2.0.14.bb} (91%) >>>> > >>>> > diff --git >>>> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>>> b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>>> > deleted file mode 100644 >>>> > index 83d4f4b1ec..0000000000 >>>> > --- >>>> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch >>>> > +++ /dev/null >>>> > @@ -1,33 +0,0 @@ >>>> > -# HG changeset patch >>>> > -# User Sam Lantinga <slouken@libsdl.org> >>>> > -# 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 <toertel@gmail.com> >>>> > - >>>> > -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; >>>> > - } >>>> > 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 >>>> > deleted file mode 100644 >>>> > index aa351a89ba..0000000000 >>>> > --- >>>> a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch >>>> > +++ /dev/null >>>> > @@ -1,49 +0,0 @@ >>>> > -# 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; >>>> > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >>>> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >>>> > similarity index 91% >>>> > rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >>>> > rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >>>> > index 5fa99821c4..872592fdae 100644 >>>> > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >>>> > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >>>> > @@ -18,14 +18,11 @@ 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}" >>>> > >>>> > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" >>>> > -SRC_URI[sha256sum] = >>>> "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" >>>> > +SRC_URI[sha256sum] = >>>> "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" >>>> > >>>> > inherit autotools lib_package binconfig-disabled pkgconfig >>>> > >>>> > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = >>>> "--enable-jack,--disable-jack,jack" >>>> > PACKAGECONFIG[kmsdrm] = >>>> "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" >>>> > PACKAGECONFIG[opengl] = >>>> "--enable-video-opengl,--disable-video-opengl,virtual/libgl" >>>> > PACKAGECONFIG[pulseaudio] = >>>> "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" >>>> > -PACKAGECONFIG[tslib] = >>>> "--enable-input-tslib,--disable-input-tslib,tslib" >>>> > PACKAGECONFIG[wayland] = >>>> "--enable-video-wayland,--disable-video-wayland,wayland-native wayland >>>> wayland-protocols libxkbcommon" >>>> > PACKAGECONFIG[x11] = >>>> "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr >>>> libxrender" >>>> > >>>> > -- >>>> > 2.29.2 >>>> > >>>> > >>>> > >>>> > >>>> >>> >>> >>> -- >>> Yann Dirson <yann@blade-group.com> >>> Blade / Shadow -- http://shadow.tech >>> >>> >>> >>> >>> >> >> >> > > > [-- Attachment #2: Type: text/html, Size: 14065 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 2021-02-01 10:23 [PATCH] libsdl2: upgrade to 2.0.14 Yann Dirson 2021-02-01 19:10 ` [OE-core] " Mark Jonas @ 2021-02-03 20:56 ` Andrey Zhizhikin 2021-02-04 0:11 ` Yann Dirson 1 sibling, 1 reply; 9+ messages in thread From: Andrey Zhizhikin @ 2021-02-03 20:56 UTC (permalink / raw) To: Yann Dirson; +Cc: OE Core mailing list, Yann Dirson, Romain Roffé Hello Yann, On Mon, Feb 1, 2021 at 11:23 AM Yann Dirson <yann.dirson@blade-group.com> wrote: > > From: Yann Dirson <yann@blade-group.com> > > This version does not support tslib any more, as can be seen by the > failed AUH run. > > Originally-by: Romain Roffé <romain.roffe@blade-group.com> > Signed-off-by: Yann Dirson <yann@blade-group.com> > --- > .../libsdl2/directfb-renderfillrect-fix.patch | 33 ------------- > ...ectfb-spurious-curly-brace-missing-e.patch | 49 ------------------- > .../{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} | 6 +-- > 3 files changed, 1 insertion(+), 87 deletions(-) > delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch > rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.12.bb => libsdl2_2.0.14.bb} (91%) > > diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > deleted file mode 100644 > index 83d4f4b1ec..0000000000 > --- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -# HG changeset patch > -# User Sam Lantinga <slouken@libsdl.org> > -# 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 <toertel@gmail.com> > - > -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; > - } > 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 > deleted file mode 100644 > index aa351a89ba..0000000000 > --- a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -# 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; > diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > similarity index 91% > rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > index 5fa99821c4..872592fdae 100644 > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > @@ -18,14 +18,11 @@ 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 \ I believe the patch ac_check_define.patch can also be dropped, as it was applied upstream and is included in 2.0.14, see http://hg.libsdl.org/SDL/rev/2c13b7ca1997 > " > > S = "${WORKDIR}/SDL2-${PV}" > > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" Wonder why md5sum was just dropped and rather not updated? > -SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" > +SRC_URI[sha256sum] = "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" > > inherit autotools lib_package binconfig-disabled pkgconfig > > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" > PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" > PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" > PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" > -PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" > PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon" > PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" > > -- > 2.29.2 > > > > -- Regards, Andrey. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 2021-02-03 20:56 ` Andrey Zhizhikin @ 2021-02-04 0:11 ` Yann Dirson 2021-02-04 8:18 ` Andrey Zhizhikin 0 siblings, 1 reply; 9+ messages in thread From: Yann Dirson @ 2021-02-04 0:11 UTC (permalink / raw) To: Andrey Zhizhikin; +Cc: OE Core mailing list, Yann Dirson, Romain Roffé [-- Attachment #1: Type: text/plain, Size: 2261 bytes --] Le mer. 3 févr. 2021 à 21:56, Andrey Zhizhikin <andrey.z@gmail.com> a écrit : > Hello Yann, > > > index 5fa99821c4..872592fdae 100644 > > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb > > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb > > @@ -18,14 +18,11 @@ 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 \ > > I believe the patch ac_check_define.patch can also be dropped, as it > was applied upstream and is included in 2.0.14, see > http://hg.libsdl.org/SDL/rev/2c13b7ca1997 > hm, not sure what patch you're talking about, I don't see any by that name. > > " > > > > S = "${WORKDIR}/SDL2-${PV}" > > > > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" > > Wonder why md5sum was just dropped and rather not updated? > It's an obsolete algorithm. AUH itself removes this in its patches. > > -SRC_URI[sha256sum] = > "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" > > +SRC_URI[sha256sum] = > "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" > > > > inherit autotools lib_package binconfig-disabled pkgconfig > > > > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = > "--enable-jack,--disable-jack,jack" > > PACKAGECONFIG[kmsdrm] = > "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" > > PACKAGECONFIG[opengl] = > "--enable-video-opengl,--disable-video-opengl,virtual/libgl" > > PACKAGECONFIG[pulseaudio] = > "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" > > -PACKAGECONFIG[tslib] = > "--enable-input-tslib,--disable-input-tslib,tslib" > > PACKAGECONFIG[wayland] = > "--enable-video-wayland,--disable-video-wayland,wayland-native wayland > wayland-protocols libxkbcommon" > > PACKAGECONFIG[x11] = > "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr > libxrender" > > > > -- > > 2.29.2 > > > > > > > > > > > -- > Regards, > Andrey. > -- Yann Dirson <yann@blade-group.com> Blade / Shadow -- http://shadow.tech [-- Attachment #2: Type: text/html, Size: 3774 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH] libsdl2: upgrade to 2.0.14 2021-02-04 0:11 ` Yann Dirson @ 2021-02-04 8:18 ` Andrey Zhizhikin 0 siblings, 0 replies; 9+ messages in thread From: Andrey Zhizhikin @ 2021-02-04 8:18 UTC (permalink / raw) To: Yann Dirson; +Cc: OE Core mailing list, Yann Dirson, Romain Roffé Hello Yann, On Thu, Feb 4, 2021 at 1:11 AM Yann Dirson <yann.dirson@blade-group.com> wrote: > > > > Le mer. 3 févr. 2021 à 21:56, Andrey Zhizhikin <andrey.z@gmail.com> a écrit : >> >> Hello Yann, >> >> > index 5fa99821c4..872592fdae 100644 >> > --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb >> > +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb >> > @@ -18,14 +18,11 @@ 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 \ >> >> I believe the patch ac_check_define.patch can also be dropped, as it >> was applied upstream and is included in 2.0.14, see >> http://hg.libsdl.org/SDL/rev/2c13b7ca1997 > > > hm, not sure what patch you're talking about, I don't see any by that name. Ah, please discard this. That patch was introduced by commit 79ada27ec2 and was present in the master-next of poky. Latest master-next update does not have it anymore. :) > >> >> > " >> > >> > S = "${WORKDIR}/SDL2-${PV}" >> > >> > -SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" >> >> Wonder why md5sum was just dropped and rather not updated? > > > It's an obsolete algorithm. AUH itself removes this in its patches. Got it, thanks for clarification. > >> >> > -SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" >> > +SRC_URI[sha256sum] = "d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" >> > >> > inherit autotools lib_package binconfig-disabled pkgconfig >> > >> > @@ -64,7 +61,6 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" >> > PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" >> > PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" >> > PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" >> > -PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" >> > PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon" >> > PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" >> > >> > -- >> > 2.29.2 >> > >> > >> > >> > >> >> >> -- >> Regards, >> Andrey. > > > > -- > Yann Dirson <yann@blade-group.com> > Blade / Shadow -- http://shadow.tech > -- Regards, Andrey. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-04 8:18 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 10:23 [PATCH] libsdl2: upgrade to 2.0.14 Yann Dirson
2021-02-01 19:10 ` [OE-core] " Mark Jonas
2021-02-03 13:54 ` Yann Dirson
2021-02-03 17:05 ` Alexander Kanavin
[not found] ` <16604BBA745DB2D9.18741@lists.openembedded.org>
2021-02-03 19:47 ` Alexander Kanavin
[not found] ` <1660549372F1DC15.22837@lists.openembedded.org>
2021-02-03 20:29 ` Alexander Kanavin
2021-02-03 20:56 ` Andrey Zhizhikin
2021-02-04 0:11 ` Yann Dirson
2021-02-04 8:18 ` Andrey Zhizhikin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.