From be5a0f4c63feb5d24fdbbdb9ab17b831cffc177d Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Thu, 22 Feb 2024 12:14:28 +0000 Subject: [PATCH] Use a single lvgl submodule for all apps --- .gitmodules | 7 ++----- buffyboard/find-lvgl-sources.sh | 27 --------------------------- buffyboard/indev.c | 2 +- buffyboard/lvgl | 1 - buffyboard/meson.build | 4 ++-- find-lvgl-sources.sh | 27 +++++++++++++++++++++++++++ lvgl | 1 + unl0kr/find-lvgl-sources.sh | 27 --------------------------- unl0kr/lvgl | 1 - unl0kr/meson.build | 4 ++-- 10 files changed, 35 insertions(+), 66 deletions(-) delete mode 100755 buffyboard/find-lvgl-sources.sh delete mode 160000 buffyboard/lvgl create mode 100755 find-lvgl-sources.sh create mode 160000 lvgl delete mode 100755 unl0kr/find-lvgl-sources.sh delete mode 160000 unl0kr/lvgl diff --git a/.gitmodules b/.gitmodules index 6f37eca..fcb8f14 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "buffyboard/lvgl"] - path = buffyboard/lvgl - url = https://github.com/littlevgl/lvgl.git -[submodule "unl0kr/lvgl"] - path = unl0kr/lvgl +[submodule "lvgl"] + path = lvgl url = https://github.com/littlevgl/lvgl.git diff --git a/buffyboard/find-lvgl-sources.sh b/buffyboard/find-lvgl-sources.sh deleted file mode 100755 index 2d539cf..0000000 --- a/buffyboard/find-lvgl-sources.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# Copyright 2022 Johannes Marbach, Oliver Smith -# SPDX-License-Identifier: GPL-3.0-or-later - - -find lvgl/src -name 'lv_init.c' -find lvgl/src/core -name '*.c' -find lvgl/src/dev -name '*.c' -find lvgl/src/display -name '*.c' -find lvgl/src/draw -name '*.c' -find lvgl/src/drivers -name '*.c' -find lvgl/src/extra -name '*.c' -find lvgl/src/extra/widgets/keyboard -name '*.c' -find lvgl/src/extra/widgets/msgbox -name '*.c' -find lvgl/src/extra/widgets/span -name '*.c' -find lvgl/src/indev -name '*.c' -find lvgl/src/font -name '*.c' -find lvgl/src/hal -name '*.c' -find lvgl/src/layouts -name '*.c' -find lvgl/src/libs -name '*.c' -find lvgl/src/misc -name '*.c' -find lvgl/src/osal -name '*.c' -find lvgl/src/stdlib -name '*.c' -find lvgl/src/tick -name '*.c' -find lvgl/src/themes -name '*.c' -find lvgl/src/widgets -name '*.c' diff --git a/buffyboard/indev.c b/buffyboard/indev.c index edf4ec7..88e9390 100644 --- a/buffyboard/indev.c +++ b/buffyboard/indev.c @@ -7,7 +7,7 @@ #include "cursor.h" #include "indev.h" -#include "lvgl/lvgl.h" +#include "../lvgl/lvgl.h" #include diff --git a/buffyboard/lvgl b/buffyboard/lvgl deleted file mode 160000 index e4de2d2..0000000 --- a/buffyboard/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4de2d265aa1b251038d18659835502e95d14eaf diff --git a/buffyboard/meson.build b/buffyboard/meson.build index bc446d2..dd84fb5 100644 --- a/buffyboard/meson.build +++ b/buffyboard/meson.build @@ -27,12 +27,12 @@ squeek2lvgl_sources = [ '../squeek2lvgl/sq2lv.c', ] -lvgl_sources = run_command('find-lvgl-sources.sh', 'lvgl', check: true).stdout().strip().split('\n') +lvgl_sources = run_command('../find-lvgl-sources.sh', '../lvgl', check: true).stdout().strip().split('\n') executable( 'buffyboard', sources: buffyboard_sources + squeek2lvgl_sources + lvgl_sources, - include_directories: ['lvgl'], + include_directories: ['..'], dependencies: [ dependency('libinput'), meson.get_compiler('c').find_library('m', required: false), diff --git a/find-lvgl-sources.sh b/find-lvgl-sources.sh new file mode 100755 index 0000000..6c6bd7d --- /dev/null +++ b/find-lvgl-sources.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +# Copyright 2022 Johannes Marbach, Oliver Smith +# SPDX-License-Identifier: GPL-3.0-or-later + + +find "$1/src" -name 'lv_init.c' +find "$1/src/core" -name '*.c' +find "$1/src/dev" -name '*.c' +find "$1/src/display" -name '*.c' +find "$1/src/draw" -name '*.c' +find "$1/src/drivers" -name '*.c' +find "$1/src/extra" -name '*.c' +find "$1/src/extra/widgets/keyboard" -name '*.c' +find "$1/src/extra/widgets/msgbox" -name '*.c' +find "$1/src/extra/widgets/span" -name '*.c' +find "$1/src/indev" -name '*.c' +find "$1/src/font" -name '*.c' +find "$1/src/hal" -name '*.c' +find "$1/src/layouts" -name '*.c' +find "$1/src/libs" -name '*.c' +find "$1/src/misc" -name '*.c' +find "$1/src/osal" -name '*.c' +find "$1/src/stdlib" -name '*.c' +find "$1/src/tick" -name '*.c' +find "$1/src/themes" -name '*.c' +find "$1/src/widgets" -name '*.c' diff --git a/lvgl b/lvgl new file mode 160000 index 0000000..1ea51ad --- /dev/null +++ b/lvgl @@ -0,0 +1 @@ +Subproject commit 1ea51ad616664a709dff3fe4dae68eaee34e755d diff --git a/unl0kr/find-lvgl-sources.sh b/unl0kr/find-lvgl-sources.sh deleted file mode 100755 index 2d539cf..0000000 --- a/unl0kr/find-lvgl-sources.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# Copyright 2022 Johannes Marbach, Oliver Smith -# SPDX-License-Identifier: GPL-3.0-or-later - - -find lvgl/src -name 'lv_init.c' -find lvgl/src/core -name '*.c' -find lvgl/src/dev -name '*.c' -find lvgl/src/display -name '*.c' -find lvgl/src/draw -name '*.c' -find lvgl/src/drivers -name '*.c' -find lvgl/src/extra -name '*.c' -find lvgl/src/extra/widgets/keyboard -name '*.c' -find lvgl/src/extra/widgets/msgbox -name '*.c' -find lvgl/src/extra/widgets/span -name '*.c' -find lvgl/src/indev -name '*.c' -find lvgl/src/font -name '*.c' -find lvgl/src/hal -name '*.c' -find lvgl/src/layouts -name '*.c' -find lvgl/src/libs -name '*.c' -find lvgl/src/misc -name '*.c' -find lvgl/src/osal -name '*.c' -find lvgl/src/stdlib -name '*.c' -find lvgl/src/tick -name '*.c' -find lvgl/src/themes -name '*.c' -find lvgl/src/widgets -name '*.c' diff --git a/unl0kr/lvgl b/unl0kr/lvgl deleted file mode 160000 index 4f9c16f..0000000 --- a/unl0kr/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f9c16f1774b466b55e1dd819313431098521735 diff --git a/unl0kr/meson.build b/unl0kr/meson.build index b237671..8d6243d 100644 --- a/unl0kr/meson.build +++ b/unl0kr/meson.build @@ -49,14 +49,14 @@ if libdrm_dep.found() add_project_arguments('-DLV_USE_LINUX_DRM=1', language: ['c']) endif -lvgl_sources = run_command('find-lvgl-sources.sh', 'lvgl', check: true).stdout().strip().split('\n') +lvgl_sources = run_command('../find-lvgl-sources.sh', '../lvgl', check: true).stdout().strip().split('\n') install_data(sources: 'unl0kr.conf', install_dir : get_option('sysconfdir')) executable( 'unl0kr', sources: unl0kr_sources + squeek2lvgl_sources + lvgl_sources, - include_directories: ['lvgl'], + include_directories: ['..'], dependencies: unl0kr_dependencies, install: true )