mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
kmscon: bump version to 9.3.1
- Remove upstreamed patch (commit ID: a1fc510a)
- backspace_sends_delete is now a runtime option as
of commit 0d6d85a8b865cac17529d049ae9a561db782ac59
- The kmscon.conf file in the source is renamed to kms.conf.example
To keep the same behavior as the previous versions, kms.conf.example
is moved to ${sysconfdir}/kmscon/kmscon.conf before running sed.
- The render-engine config option has been removed as of commit
59eef2a154f78101195ad8ff08376e2418e773f0.
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-40
@@ -1,40 +0,0 @@
|
||||
From 03a330d486132e3798a125d26d4f10252ffd8e2d Mon Sep 17 00:00:00 2001
|
||||
From: Adam Duskett <adam.duskett@amarulasolutions.com>
|
||||
Date: Fri, 16 Jan 2026 11:35:39 +0100
|
||||
Subject: [PATCH] kmscon_conf.c: Fix llvm compilation failure
|
||||
|
||||
When building with an LLVM toolchain, the follow error occurs:
|
||||
|
||||
```
|
||||
kmscon_conf.c:757:72:
|
||||
error: expression which evaluates to zero treated as a null pointer constant
|
||||
of type 'void *' [-Werror,-Wnon-literal-null-conversion]
|
||||
CONF_OPTION(0, 0, "gpus", &conf_gpus, NULL, NULL, NULL, &conf->gpus, KMSCON_GPU_ALL),
|
||||
^~~~~~~~~~~~~~
|
||||
1 error generated.
|
||||
```
|
||||
|
||||
Fix the error by adding a cast to (void *).
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/kmscon/kmscon/pull/225]
|
||||
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
|
||||
---
|
||||
src/kmscon_conf.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kmscon_conf.c b/src/kmscon_conf.c
|
||||
index df2e51d..9e9a839 100644
|
||||
--- a/src/kmscon_conf.c
|
||||
+++ b/src/kmscon_conf.c
|
||||
@@ -754,7 +754,7 @@ int kmscon_conf_new(struct conf_ctx **out)
|
||||
/* Video Options */
|
||||
CONF_OPTION_BOOL_FULL(0, "drm", aftercheck_drm, NULL, NULL, &conf->drm, true),
|
||||
CONF_OPTION_BOOL(0, "hwaccel", &conf->hwaccel, false),
|
||||
- CONF_OPTION(0, 0, "gpus", &conf_gpus, NULL, NULL, NULL, &conf->gpus, KMSCON_GPU_ALL),
|
||||
+ CONF_OPTION(0, 0, "gpus", &conf_gpus, NULL, NULL, NULL, &conf->gpus, (void *)KMSCON_GPU_ALL),
|
||||
CONF_OPTION_STRING(0, "render-engine", &conf->render_engine, NULL),
|
||||
CONF_OPTION_BOOL(0, "use-original-mode", &conf->use_original_mode, true),
|
||||
CONF_OPTION_STRING(0, "mode", &conf->mode, NULL),
|
||||
--
|
||||
2.52.0
|
||||
|
||||
+3
-7
@@ -19,17 +19,13 @@ DEPENDS = "\
|
||||
udev \
|
||||
"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/kmscon/kmscon;branch=main;protocol=https \
|
||||
file://0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch \
|
||||
"
|
||||
SRCREV = "7d46650dbb0826f9b89de42f879be879391c14fd"
|
||||
SRC_URI = "git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV}"
|
||||
SRCREV = "e44ff728e51c5a38b56392abe9bc3e8306db86cc"
|
||||
|
||||
inherit meson pkgconfig systemd
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
|
||||
|
||||
PACKAGECONFIG[backspace_sends_delete] = "-Dbackspace_sends_delete=true, -Dbackspace_sends_delete=false"
|
||||
PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango"
|
||||
PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd"
|
||||
PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm"
|
||||
@@ -61,9 +57,9 @@ do_install:append() {
|
||||
fi
|
||||
|
||||
if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'true', 'false', d)}; then
|
||||
mv ${D}${sysconfdir}/kmscon/kmscon.conf.example ${D}${sysconfdir}/kmscon/kmscon.conf
|
||||
sed -e "s@#drm@drm@g" \
|
||||
-e "s@#hwaccel@hwaccel@g" \
|
||||
-e "s@#render-engine=gltex@render-engine=gltex@g" \
|
||||
-i ${D}${sysconfdir}/kmscon/kmscon.conf
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user