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
>
>
>
>