diff options
author | wangmy <wangmy@fujitsu.com> | 2022-01-17 22:30:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-18 10:53:54 +0000 |
commit | 3fa9789deed855d251282f2f1dac28dd960f76b9 (patch) | |
tree | e7dd00d9b2071cbce1721919082f4faacc370782 /meta/recipes-graphics | |
parent | 348dd6d628aad0854056c644b341b5da81f1255b (diff) | |
download | poky-3fa9789deed855d251282f2f1dac28dd960f76b9.tar.gz |
libsdl2: upgrade 2.0.18 -> 2.0.20
0001-Fix-build-against-wayland-1.20.patch
removed since it is included in 2.0.20
License-Update: year updated to 2022.
Changelog:
=========
General:
SDL_RenderGeometryRaw() takes a pointer to SDL_Color, not int.
You can cast color data in SDL_PIXELFORMAT_RGBA32 format
(SDL_PIXELFORMAT_ABGR8888 on little endian systems) for this parameter.
Improved accuracy of horizontal and vertical line drawing when using OpenGL
or OpenGLES
Added the hint SDL_HINT_RENDER_LINE_METHOD to control the method of line
drawing used, to select speed, correctness, and compatibility.
Fixed hotplug controller detection, broken in 2.0.18
(From OE-Core rev: 21de64185beb799aee04dc12ae84e3a60cc671a3)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-build-against-wayland-1.20.patch | 45 | ||||
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb) | 7 |
2 files changed, 3 insertions, 49 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-build-against-wayland-1.20.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-build-against-wayland-1.20.patch deleted file mode 100644 index 8923334e27..0000000000 --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-build-against-wayland-1.20.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001 | ||
2 | From: David Redondo <kde@david-redondo.de> | ||
3 | Date: Fri, 10 Dec 2021 16:22:34 +0100 | ||
4 | Subject: [PATCH] Fix build against wayland 1.20 | ||
5 | |||
6 | Fixes #5088 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/libsdl-org/SDL/pull/5092] | ||
9 | |||
10 | --- | ||
11 | src/video/wayland/SDL_waylanddyn.h | 2 ++ | ||
12 | src/video/wayland/SDL_waylandsym.h | 4 ++++ | ||
13 | 2 files changed, 6 insertions(+) | ||
14 | |||
15 | diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h | ||
16 | index 13b0884..2268555 100644 | ||
17 | --- a/src/video/wayland/SDL_waylanddyn.h | ||
18 | +++ b/src/video/wayland/SDL_waylanddyn.h | ||
19 | @@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void); | ||
20 | #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) | ||
21 | #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag) | ||
22 | #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag) | ||
23 | +#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) | ||
24 | +#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) | ||
25 | |||
26 | #define wl_seat_interface (*WAYLAND_wl_seat_interface) | ||
27 | #define wl_surface_interface (*WAYLAND_wl_surface_interface) | ||
28 | diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h | ||
29 | index d6e6a76..32e47d2 100644 | ||
30 | --- a/src/video/wayland/SDL_waylandsym.h | ||
31 | +++ b/src/video/wayland/SDL_waylandsym.h | ||
32 | @@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18) | ||
33 | SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *)) | ||
34 | SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *)) | ||
35 | |||
36 | +SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) | ||
37 | +SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) | ||
38 | +SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) | ||
39 | + | ||
40 | SDL_WAYLAND_INTERFACE(wl_seat_interface) | ||
41 | SDL_WAYLAND_INTERFACE(wl_surface_interface) | ||
42 | SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) | ||
43 | -- | ||
44 | 2.7.4 | ||
45 | |||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb index 6c949d9604..90724ab8b7 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb | |||
@@ -8,7 +8,7 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" | |||
8 | SECTION = "libs" | 8 | SECTION = "libs" |
9 | 9 | ||
10 | LICENSE = "Zlib" | 10 | LICENSE = "Zlib" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=095c2687a3c3908e26984eaa8ec2d770" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315" |
12 | 12 | ||
13 | # arm-neon adds MIT license | 13 | # arm-neon adds MIT license |
14 | LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}" | 14 | LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}" |
@@ -17,14 +17,13 @@ LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'f | |||
17 | PROVIDES = "virtual/libsdl2" | 17 | PROVIDES = "virtual/libsdl2" |
18 | 18 | ||
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://0001-Fix-build-against-wayland-1.20.patch \ | ||
21 | file://optional-libunwind-generic.patch \ | 20 | file://optional-libunwind-generic.patch \ |
22 | file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \ | 21 | file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \ |
23 | " | 22 | " |
24 | 23 | ||
25 | S = "${WORKDIR}/SDL2-${PV}" | 24 | S = "${WORKDIR}/SDL2-${PV}" |
26 | 25 | ||
27 | SRC_URI[sha256sum] = "94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c" | 26 | SRC_URI[sha256sum] = "c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06" |
28 | 27 | ||
29 | inherit cmake lib_package binconfig-disabled pkgconfig | 28 | inherit cmake lib_package binconfig-disabled pkgconfig |
30 | 29 | ||