diff options
Diffstat (limited to 'meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch')
-rw-r--r-- | meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch deleted file mode 100644 index cfb6c6e817..0000000000 --- a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From b202ce51f7b68c460fcd1b6d9c3ffa8aaf2baaf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Marek Vasut <marex@denx.de> | ||
3 | Date: Tue, 12 Mar 2024 19:05:38 +0100 | ||
4 | Subject: [PATCH 6/6] Add SDL2 example support | ||
5 | |||
6 | Extend the main.c to support both legacy fbdev, DRM/KMS, SDL2 initialization. | ||
7 | The SDL2 window resolution can be configured using environment variables | ||
8 | LV_VIDEO_WIDTH and LV_VIDEO_HEIGHT and defaults to 800 x 480 . | ||
9 | |||
10 | To use legacy fbdev support, adjust lv_conf.h as follows: | ||
11 | LV_USE_LINUX_FBDEV=1 | ||
12 | LV_USE_LINUX_DRM=0 | ||
13 | LV_USE_SDL=0 | ||
14 | |||
15 | To use DRM/KMS support, adjust lv_conf.h as follows: | ||
16 | LV_USE_LINUX_FBDEV=0 | ||
17 | LV_USE_LINUX_DRM=1 | ||
18 | LV_USE_SDL=0 | ||
19 | |||
20 | To use SDL2 support, adjust lv_conf.h as follows: | ||
21 | LV_USE_LINUX_FBDEV=0 | ||
22 | LV_USE_LINUX_DRM=0 | ||
23 | LV_USE_SDL=1 | ||
24 | |||
25 | Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] | ||
26 | Signed-off-by: Marek Vasut <marex@denx.de> | ||
27 | --- | ||
28 | CMakeLists.txt | 6 +++++- | ||
29 | main.c | 8 ++++++++ | ||
30 | 2 files changed, 13 insertions(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
33 | index c1cfb7f..658193f 100644 | ||
34 | --- a/CMakeLists.txt | ||
35 | +++ b/CMakeLists.txt | ||
36 | @@ -15,6 +15,10 @@ add_executable(main main.c mouse_cursor_icon.c) | ||
37 | include(${CMAKE_CURRENT_LIST_DIR}/lvgl/tests/FindLibDRM.cmake) | ||
38 | include_directories(${Libdrm_INCLUDE_DIRS}) | ||
39 | |||
40 | -target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${Libdrm_LIBRARIES} m pthread) | ||
41 | +find_package(SDL2) | ||
42 | +find_package(SDL2_image) | ||
43 | +include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS}) | ||
44 | + | ||
45 | +target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${Libdrm_LIBRARIES} m pthread) | ||
46 | add_custom_target (run COMMAND ${EXECUTABLE_OUTPUT_PATH}/main DEPENDS main) | ||
47 | |||
48 | diff --git a/main.c b/main.c | ||
49 | index ab4e936..4b66ebc 100644 | ||
50 | --- a/main.c | ||
51 | +++ b/main.c | ||
52 | @@ -25,6 +25,14 @@ static void lv_linux_disp_init(void) | ||
53 | |||
54 | lv_linux_drm_set_file(disp, videocard, -1); | ||
55 | } | ||
56 | +#elif LV_USE_SDL | ||
57 | +static void lv_linux_disp_init(void) | ||
58 | +{ | ||
59 | + const int width = atoi(getenv("LV_VIDEO_WIDTH") ? : "800"); | ||
60 | + const int height = atoi(getenv("LV_VIDEO_HEIGHT") ? : "480"); | ||
61 | + | ||
62 | + lv_sdl_window_create(width, height); | ||
63 | +} | ||
64 | #else | ||
65 | #error Unsupported configuration | ||
66 | #endif | ||
67 | -- | ||
68 | 2.43.0 | ||
69 | |||