Use a single lvgl submodule for all apps

.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

buffyboard/find-lvgl-sources.sh

@@ -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'

buffyboard/indev.c

@@ -7,7 +7,7 @@
 #include "cursor.h"
 #include "indev.h"
 
-#include "lvgl/lvgl.h"
+#include "../lvgl/lvgl.h"
 
 #include <limits.h>
 

buffyboard/lvgl

@@ -1 +0,0 @@
-Subproject commit e4de2d265aa1b251038d18659835502e95d14eaf

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),

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'

lvgl

@@ -0,0 +1 @@
+Subproject commit 1ea51ad616664a709dff3fe4dae68eaee34e755d

unl0kr/find-lvgl-sources.sh

@@ -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'

unl0kr/lvgl

@@ -1 +0,0 @@
-Subproject commit 4f9c16f1774b466b55e1dd819313431098521735

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
 )