Skip to content

Commit f1edcf6

Browse files
livingsilver94neheb
authored andcommitted
lvgl: Update to 9.4.0
1 parent 6f1c52f commit f1edcf6

File tree

8 files changed

+129
-78
lines changed

8 files changed

+129
-78
lines changed

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,6 +2830,7 @@
28302830
"lvgl_thorvg"
28312831
],
28322832
"versions": [
2833+
"9.4.0-1",
28332834
"9.3.0-1",
28342835
"9.2.2-2",
28352836
"9.2.2-1"

subprojects/lvgl.wrap

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
[wrap-file]
2-
directory = lvgl-9.3.0
3-
source_url = https://github.com/lvgl/lvgl/archive/refs/tags/v9.3.0.tar.gz
4-
source_filename = lvgl-9.3.0.tar.gz
5-
source_hash = 4933becfd3603b29158a5d04138139582836ef2bc17beb6c39dccda9cb0d32e7
2+
directory = lvgl-9.4.0
3+
source_url = https://github.com/lvgl/lvgl/archive/refs/tags/v9.4.0.tar.gz
4+
source_filename = lvgl-9.4.0.tar.gz
5+
source_hash = 932c864de98431b38c5758a87f1de12bbee7b76943b8312bcf13d2f29ac14627
66
patch_directory = lvgl
77

88
[provide]
9-
lvgl = lvgl_dep
10-
lvgl_demos = lvgl_demos_dep
11-
lvgl_examples = lvgl_examples_dep
12-
lvgl_thorvg = lvgl_thorvg_dep
9+
dependency_names = lvgl, lvgl_demos, lvgl_examples, lvgl_thorvg

subprojects/packagefiles/lvgl/demos/meson.build

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ lvgl_demos_src = [
1010
'benchmark/assets/lv_font_benchmark_montserrat_24_aligned.c',
1111
'benchmark/assets/lv_font_benchmark_montserrat_26_aligned.c',
1212
'benchmark/lv_demo_benchmark.c',
13+
'gltf/lv_demo_gltf.c',
1314
'keypad_encoder/lv_demo_keypad_encoder.c',
1415
'lv_demos.c',
1516
'music/assets/img_lv_demo_music_btn_corner_large.c',
@@ -64,9 +65,9 @@ lvgl_demos_src = [
6465
'render/assets/img_render_lvgl_logo_argb8888_premultiplied.c',
6566
'render/assets/img_render_lvgl_logo_i1.c',
6667
'render/assets/img_render_lvgl_logo_l8.c',
68+
'render/assets/img_render_lvgl_logo_rgb565a8.c',
6769
'render/assets/img_render_lvgl_logo_rgb565.c',
6870
'render/assets/img_render_lvgl_logo_rgb565_swapped.c',
69-
'render/assets/img_render_lvgl_logo_rgb565a8.c',
7071
'render/assets/img_render_lvgl_logo_rgb888.c',
7172
'render/assets/img_render_lvgl_logo_xrgb8888.c',
7273
'render/lv_demo_render.c',
@@ -77,7 +78,11 @@ lvgl_demos_src = [
7778
'widgets/assets/img_demo_widgets_avatar.c',
7879
'widgets/assets/img_demo_widgets_needle.c',
7980
'widgets/assets/img_lvgl_logo.c',
81+
'widgets/lv_demo_widgets_analytics.c',
8082
'widgets/lv_demo_widgets.c',
83+
'widgets/lv_demo_widgets_components.c',
84+
'widgets/lv_demo_widgets_profile.c',
85+
'widgets/lv_demo_widgets_shop.c',
8186
]
8287

8388
lvgl_demos = library(
@@ -93,3 +98,4 @@ lvgl_demos_dep = declare_dependency(
9398
include_directories: include_directories('../src', '.'),
9499
link_with: lvgl_demos,
95100
)
101+
meson.override_dependency('lvgl_demos', lvgl_demos_dep)

subprojects/packagefiles/lvgl/examples/meson.build

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ lvgl_examples_src = [
88
'assets/animimg002.c',
99
'assets/animimg003.c',
1010
'assets/emoji/img_emoji_F617.c',
11+
'assets/imgbtn_left.c',
12+
'assets/imgbtn_mid.c',
13+
'assets/imgbtn_right.c',
1114
'assets/img_caret_down.c',
1215
'assets/img_cogwheel_argb.c',
1316
'assets/img_cogwheel_indexed16.c',
@@ -16,14 +19,12 @@ lvgl_examples_src = [
1619
'assets/img_skew_strip.c',
1720
'assets/img_star.c',
1821
'assets/img_svg_img.c',
19-
'assets/imgbtn_left.c',
20-
'assets/imgbtn_mid.c',
21-
'assets/imgbtn_right.c',
2222
'event/lv_example_event_bubble.c',
2323
'event/lv_example_event_button.c',
2424
'event/lv_example_event_click.c',
2525
'event/lv_example_event_draw.c',
2626
'event/lv_example_event_streak.c',
27+
'event/lv_example_event_trickle.c',
2728
'get_started/lv_example_get_started_1.c',
2829
'get_started/lv_example_get_started_2.c',
2930
'get_started/lv_example_get_started_3.c',
@@ -53,6 +54,9 @@ lvgl_examples_src = [
5354
'libs/freetype/lv_example_freetype_3.c',
5455
'libs/gif/img_bulb_gif.c',
5556
'libs/gif/lv_example_gif_1.c',
57+
'libs/gltf/lv_example_gltf_1.c',
58+
'libs/gltf/lv_example_gltf_2.c',
59+
'libs/gstreamer/lv_example_gstreamer_1.c',
5660
'libs/libjpeg_turbo/lv_example_libjpeg_turbo_1.c',
5761
'libs/libpng/img_png_demo.c',
5862
'libs/libpng/lv_example_libpng_1.c',
@@ -63,6 +67,8 @@ lvgl_examples_src = [
6367
'libs/rlottie/lv_example_rlottie_2.c',
6468
'libs/rlottie/lv_example_rlottie_approve.c',
6569
'libs/svg/lv_example_svg_1.c',
70+
'libs/svg/lv_example_svg_2.c',
71+
'libs/svg/lv_example_svg_3.c',
6672
'libs/tiny_ttf/lv_example_tiny_ttf_1.c',
6773
'libs/tiny_ttf/lv_example_tiny_ttf_2.c',
6874
'libs/tiny_ttf/lv_example_tiny_ttf_3.c',
@@ -94,7 +100,10 @@ lvgl_examples_src = [
94100
'others/observer/lv_example_observer_4.c',
95101
'others/observer/lv_example_observer_5.c',
96102
'others/observer/lv_example_observer_6.c',
103+
'others/observer/lv_example_observer_7.c',
97104
'others/snapshot/lv_example_snapshot_1.c',
105+
'others/translation/lv_example_translation_1.c',
106+
'others/translation/lv_example_translation_2.c',
98107
'others/xml/lv_example_xml_1.c',
99108
'others/xml/lv_example_xml_2.c',
100109
'porting/lv_port_disp_template.c',
@@ -110,7 +119,6 @@ lvgl_examples_src = [
110119
'scroll/lv_example_scroll_6.c',
111120
'scroll/lv_example_scroll_7.c',
112121
'scroll/lv_example_scroll_8.c',
113-
'styles/lv_example_style_1.c',
114122
'styles/lv_example_style_10.c',
115123
'styles/lv_example_style_11.c',
116124
'styles/lv_example_style_12.c',
@@ -121,6 +129,7 @@ lvgl_examples_src = [
121129
'styles/lv_example_style_17.c',
122130
'styles/lv_example_style_18.c',
123131
'styles/lv_example_style_19.c',
132+
'styles/lv_example_style_1.c',
124133
'styles/lv_example_style_2.c',
125134
'styles/lv_example_style_3.c',
126135
'styles/lv_example_style_4.c',
@@ -130,6 +139,7 @@ lvgl_examples_src = [
130139
'styles/lv_example_style_8.c',
131140
'styles/lv_example_style_9.c',
132141
'widgets/animimg/lv_example_animimg_1.c',
142+
'widgets/arclabel/lv_example_arclabel_1.c',
133143
'widgets/arc/lv_example_arc_1.c',
134144
'widgets/arc/lv_example_arc_2.c',
135145
'widgets/arc/lv_example_arc_3.c',
@@ -148,9 +158,9 @@ lvgl_examples_src = [
148158
'widgets/buttonmatrix/lv_example_buttonmatrix_3.c',
149159
'widgets/calendar/lv_example_calendar_1.c',
150160
'widgets/calendar/lv_example_calendar_2.c',
151-
'widgets/canvas/lv_example_canvas_1.c',
152161
'widgets/canvas/lv_example_canvas_10.c',
153162
'widgets/canvas/lv_example_canvas_11.c',
163+
'widgets/canvas/lv_example_canvas_1.c',
154164
'widgets/canvas/lv_example_canvas_2.c',
155165
'widgets/canvas/lv_example_canvas_3.c',
156166
'widgets/canvas/lv_example_canvas_4.c',
@@ -172,12 +182,12 @@ lvgl_examples_src = [
172182
'widgets/dropdown/lv_example_dropdown_1.c',
173183
'widgets/dropdown/lv_example_dropdown_2.c',
174184
'widgets/dropdown/lv_example_dropdown_3.c',
185+
'widgets/imagebutton/lv_example_imagebutton_1.c',
175186
'widgets/image/lv_example_image_1.c',
176187
'widgets/image/lv_example_image_2.c',
177188
'widgets/image/lv_example_image_3.c',
178189
'widgets/image/lv_example_image_4.c',
179190
'widgets/image/lv_example_image_5.c',
180-
'widgets/imagebutton/lv_example_imagebutton_1.c',
181191
'widgets/keyboard/lv_example_keyboard_1.c',
182192
'widgets/keyboard/lv_example_keyboard_2.c',
183193
'widgets/keyboard/lv_example_keyboard_3.c',
@@ -187,6 +197,7 @@ lvgl_examples_src = [
187197
'widgets/label/lv_example_label_4.c',
188198
'widgets/label/lv_example_label_5.c',
189199
'widgets/label/lv_example_label_6.c',
200+
'widgets/label/lv_example_label_7.c',
190201
'widgets/led/lv_example_led_1.c',
191202
'widgets/line/lv_example_line_1.c',
192203
'widgets/list/lv_example_list_1.c',
@@ -207,9 +218,10 @@ lvgl_examples_src = [
207218
'widgets/roller/lv_example_roller_1.c',
208219
'widgets/roller/lv_example_roller_2.c',
209220
'widgets/roller/lv_example_roller_3.c',
210-
'widgets/scale/lv_example_scale_1.c',
211221
'widgets/scale/lv_example_scale_10.c',
212222
'widgets/scale/lv_example_scale_11.c',
223+
'widgets/scale/lv_example_scale_12.c',
224+
'widgets/scale/lv_example_scale_1.c',
213225
'widgets/scale/lv_example_scale_2.c',
214226
'widgets/scale/lv_example_scale_3.c',
215227
'widgets/scale/lv_example_scale_4.c',
@@ -252,3 +264,4 @@ lvgl_examples_dep = declare_dependency(
252264
include_directories: include_directories('../src', '.'),
253265
link_with: lvgl_examples,
254266
)
267+
meson.override_dependency('lvgl_examples', lvgl_examples_dep)

subprojects/packagefiles/lvgl/meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ project(
44
'cpp',
55
default_options: ['default_library=static'],
66
license: 'MIT',
7-
meson_version: '>= 0.52.0',
8-
version: '9.3.0',
7+
meson_version: '>= 0.54.0',
8+
version: '9.4.0',
99
)
1010

1111
subdir('src')
12-
if not get_option('LV_CONF_BUILD_DISABLE_DEMOS')
12+
if get_option('CONFIG_LV_BUILD_DEMOS')
1313
subdir('demos')
1414
endif
15-
if not get_option('LV_CONF_BUILD_DISABLE_EXAMPLES')
15+
if get_option('CONFIG_LV_BUILD_EXAMPLES')
1616
subdir('examples')
1717
endif
Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
option(
2-
'LV_CONF_BUILD_DISABLE_DEMOS',
3-
description: 'Do not build demos',
2+
'CONFIG_LV_BUILD_DEMOS',
3+
description: 'Build demo applications',
44
type: 'boolean',
5-
value: false,
5+
value: true,
66
)
77
option(
8-
'LV_CONF_BUILD_DISABLE_EXAMPLES',
9-
description: 'Do not build examples',
8+
'CONFIG_LV_BUILD_EXAMPLES',
9+
description: 'Build the examples',
1010
type: 'boolean',
11-
value: false,
11+
value: true,
1212
)
1313
option(
14-
'LV_CONF_INCLUDE_SIMPLE',
14+
'LV_BUILD_LVGL_H_SIMPLE_INCLUDE',
1515
description: 'Use #include "lv_conf.h" instead of #include "../../lv_conf.h"',
1616
type: 'boolean',
1717
value: true,
1818
)
1919
option(
20-
'LV_CONF_PATH',
20+
'LV_BUILD_CONF_PATH',
2121
description: 'Path of the lv_conf.h file',
2222
type: 'string',
2323
)
@@ -28,14 +28,8 @@ option(
2828
value: false,
2929
)
3030
option(
31-
'LV_CONF_BUILD_DISABLE_THORVG_INTERNAL',
32-
description: 'Do not build the internal thorvg library',
33-
type: 'boolean',
34-
value: false,
35-
)
36-
option(
37-
'LV_LVGL_H_INCLUDE_SIMPLE',
38-
description: 'Use #include "lvgl.h" instead of #include "../../lvgl.h"',
31+
'CONFIG_LV_USE_THORVG_INTERNAL',
32+
description: 'Build the internal thorvg library',
3933
type: 'boolean',
4034
value: true,
4135
)

subprojects/packagefiles/lvgl/src/libs/thorvg/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ lvgl_thorvg_dep = declare_dependency(
6060
include_directories: include_directories('.'),
6161
link_with: thorvg,
6262
)
63+
meson.override_dependency('lvgl_thorvg', lvgl_thorvg_dep)

0 commit comments

Comments
 (0)