From 6c0237d7f4a64ea6bb72cd3102c3cfb254006833 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 5 Aug 2026 01:21:23 +0000 Subject: [PATCH] kmscon: upgrade 9.3.5 -> 10.0.1 Major release. 10.0.1 installs a new terminfo entry (${datadir}/terminfo/k/kmscon) that FILES:${PN} didn't claim; added. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj --- ...0001-fix-zlib-cross-compiling-errors.patch | 51 ------------------- .../{kmscon_9.3.5.bb => kmscon_10.0.1.bb} | 16 +++--- 2 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch rename meta-oe/recipes-graphics/kmscon/{kmscon_9.3.5.bb => kmscon_10.0.1.bb} (83%) diff --git a/meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch b/meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch deleted file mode 100644 index c720aa6dde..0000000000 --- a/meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0ff9beddd959ec9afc99f64789fdfb959842ba52 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 21 May 2026 16:30:27 +0200 -Subject: [PATCH 1/1] fix zlib cross-compiling errors - -zlib compression was introduced in version 9.3.3. However, when -cross-compiling kmscon for an architecture other than x86_64, the -genunifont executable tries to use the build-systems zlib instead -of the hosts zlib. - -This leads to the following error during compiling: -libz.so: error adding symbols: file in wrong format - -Fix this by adding a new native zlib dependency specifically for the -genunifont executable. - -Upstream-Status: Submitted [https://github.com/kmscon/kmscon/pull/402] -Signed-off-by: Adam Duskett ---- - meson.build | 1 + - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f7c0858..74cf595 100644 ---- a/meson.build -+++ b/meson.build -@@ -52,6 +52,7 @@ libudev_deps = dependency('libudev', version: '>=172') - dl_deps = dependency('dl') - threads_deps = dependency('threads') - zlib_deps = dependency('zlib') -+zlib_deps_native = dependency('zlib', native: true) - - python = find_program('python3') - -diff --git a/src/meson.build b/src/meson.build -index 63d38ca..070e2a4 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -159,7 +159,7 @@ endif - # Unifont Generator - # This generates the unifont sources from raw hex-encoded font data. - # --genunifont = executable('genunifont', 'genunifont.c', dependencies: [zlib_deps], native: true) -+genunifont = executable('genunifont', 'genunifont.c', dependencies: [zlib_deps_native], native: true) - - unifont_bin = custom_target('unifont-bin', - input: ['font_unifont_data.hex'], --- -2.54.0 - diff --git a/meta-oe/recipes-graphics/kmscon/kmscon_9.3.5.bb b/meta-oe/recipes-graphics/kmscon/kmscon_10.0.1.bb similarity index 83% rename from meta-oe/recipes-graphics/kmscon/kmscon_9.3.5.bb rename to meta-oe/recipes-graphics/kmscon/kmscon_10.0.1.bb index 83256480ee..d02ea24612 100644 --- a/meta-oe/recipes-graphics/kmscon/kmscon_9.3.5.bb +++ b/meta-oe/recipes-graphics/kmscon/kmscon_10.0.1.bb @@ -20,34 +20,30 @@ DEPENDS = "\ zlib \ " -SRC_URI = "\ - git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV} \ - file://0001-fix-zlib-cross-compiling-errors.patch \ -" -SRCREV = "a8832afb1dcca5bb4c0476d4c13c7239fecbd93a" +SRC_URI = "git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV}" +SRCREV = "c9d0e23336c6bb7645a1f5f48a4a82f1d5a589d9" inherit meson pkgconfig systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" +PACKAGECONFIG[dbus] = "-Ddbus=enabled, -Ddbus=disabled, dbus" PACKAGECONFIG[font_freetype] = "-Dfont_freetype=enabled, -Dfont_freetype=disabled, fontconfig freetype" PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango" -PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd" +PACKAGECONFIG[libseat] = "-Dlibseat=enabled, -Dlibseat=disabled, seatd" PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm" PACKAGECONFIG[video_drm2d] = "-Dvideo_drm2d=enabled, -Dvideo_drm2d=disabled, libdrm" EXTRA_OEMESON = "\ - -Delogind=disabled \ + -Ddocs=disabled \ -Dextra_debug=false \ -Dfont_unifont=enabled \ - -Dsession_dummy=enabled \ - -Dsession_terminal=enabled \ -Dtests=false \ -Dvideo_fbdev=enabled \ " SYSTEMD_SERVICE:${PN} = "kmscon.service" -FILES:${PN} += "${systemd_system_unitdir}/kmsconvt@.service" +FILES:${PN} += "${systemd_system_unitdir}/kmsconvt@.service ${datadir}/terminfo" do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then