diff --git a/meta-oe/recipes-graphics/kmscon/files/0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch b/meta-oe/recipes-graphics/kmscon/files/0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch deleted file mode 100644 index 0806f9bb04..0000000000 --- a/meta-oe/recipes-graphics/kmscon/files/0001-kmscon_conf.c-Fix-llvm-compilation-failure.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 03a330d486132e3798a125d26d4f10252ffd8e2d Mon Sep 17 00:00:00 2001 -From: Adam Duskett -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 ---- - 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 - diff --git a/meta-oe/recipes-graphics/kmscon/kmscon_9.2.1.bb b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.1.bb similarity index 85% rename from meta-oe/recipes-graphics/kmscon/kmscon_9.2.1.bb rename to meta-oe/recipes-graphics/kmscon/kmscon_9.3.1.bb index 508f24c58e..4e27ba218a 100644 --- a/meta-oe/recipes-graphics/kmscon/kmscon_9.2.1.bb +++ b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.1.bb @@ -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 }