diff options
| author | Mark Jonas <toertel@gmail.com> | 2020-11-02 09:34:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-12 13:06:28 +0000 |
| commit | 528de6bc4f762c323a9e2060f3d63df0f5f14781 (patch) | |
| tree | 7970992389b54ab99b88b3e7c278b1af56893f70 | |
| parent | 0ccf16fab308538474dd3543434a95296bba5c63 (diff) | |
| download | poky-528de6bc4f762c323a9e2060f3d63df0f5f14781.tar.gz | |
libsdl2: Fix directfb SDL_RenderFillRect
Refactoring of SDL2 internal API has broken SDL_RenderFillRect for
DirectFB. The problem has already been fixed upstream.
(From OE-Core rev: a7c8dfc1f9beebeb9da7f61b323d85fba82ec1cb)
(From OE-Core rev: 1eabecc8bcb459b0fe6b14c9a368cd1b4b6dd7dd)
Signed-off-by: Mark Jonas <toertel@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e9565315265d4c5a17a27317d721ce5598523efc)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch new file mode 100644 index 0000000000..83d4f4b1ec --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/directfb-renderfillrect-fix.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | # HG changeset patch | ||
| 2 | # User Sam Lantinga <slouken@libsdl.org> | ||
| 3 | # Date 1590793369 25200 | ||
| 4 | # Node ID a90089f75990e8b07a1dcf931c5f8a580ae343bf | ||
| 5 | # Parent a9b4bd264f3cbedc4f3287b3ec6b32311370ba85 | ||
| 6 | Fixed bug 5146 - SDL_RenderFillRect doesn't work in DirectFB | ||
| 7 | |||
| 8 | Lacky | ||
| 9 | |||
| 10 | 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. | ||
| 11 | |||
| 12 | Replacing "count" with "len" in the argument list for SDL_memcpy in DirectFB_QueueFillRects fixes problem. | ||
| 13 | |||
| 14 | -- | ||
| 15 | |||
| 16 | The patch was imported from the libsdl Mercurial repository | ||
| 17 | (https://hg.libsdl.org/SDL) as of changeset id a90089f75990. | ||
| 18 | |||
| 19 | Upstream-Status: Backport | ||
| 20 | |||
| 21 | Signed-off-by: Mark Jonas <toertel@gmail.com> | ||
| 22 | |||
| 23 | diff -r a9b4bd264f3c -r a90089f75990 src/video/directfb/SDL_DirectFB_render.c | ||
| 24 | --- a/src/video/directfb/SDL_DirectFB_render.c Thu May 21 00:06:09 2020 -0400 | ||
| 25 | +++ b/src/video/directfb/SDL_DirectFB_render.c Fri May 29 16:02:49 2020 -0700 | ||
| 26 | @@ -626,7 +626,7 @@ | ||
| 27 | } | ||
| 28 | |||
| 29 | cmd->data.draw.count = count; | ||
| 30 | - SDL_memcpy(verts, rects, count); | ||
| 31 | + SDL_memcpy(verts, rects, len); | ||
| 32 | return 0; | ||
| 33 | } | ||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb index 8ecf161f69..0b75eb0c1d 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb | |||
| @@ -19,6 +19,7 @@ PROVIDES = "virtual/libsdl2" | |||
| 19 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ | 19 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ |
| 20 | file://more-gen-depends.patch \ | 20 | file://more-gen-depends.patch \ |
| 21 | file://directfb-spurious-curly-brace-missing-e.patch \ | 21 | file://directfb-spurious-curly-brace-missing-e.patch \ |
| 22 | file://directfb-renderfillrect-fix.patch \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | S = "${WORKDIR}/SDL2-${PV}" | 25 | S = "${WORKDIR}/SDL2-${PV}" |
