- Remove upstreamed patch (commit ID: a1fc510a)

  - 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 <[email protected]>
---
v1 -> v2:
  - Add a line about the removed patch
  - Fix the removal of an else statement

 .../kmscon/{kmscon_9.2.1.bb => kmscon_9.3.1.bb}        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-graphics/kmscon/{kmscon_9.2.1.bb => kmscon_9.3.1.bb} 
(85%)

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
 }
-- 
2.52.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#124131): 
https://lists.openembedded.org/g/openembedded-devel/message/124131
Mute This Topic: https://lists.openembedded.org/mt/117635076/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to