xkeyboard-config: update 2.44 -> 2.45

License-update: disclaimer and copyright clarifications per
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/821

Replace manual symlink creation with a meson option.

Drop no-op autoconf options.

Adjust packaging as this is where upstream installs now.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.44.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.45.bb
similarity index 65%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.44.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.45.bb
index 52d074fd5ed2e0fe801788f442a6719606dafb82..857ccc75160b3d5af17646288f1cf02495340ae1 100644 (file)
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.44.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.45.bb
@@ -10,23 +10,18 @@ HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig"
 BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config"
 
 LICENSE = "MIT & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8fc8ae699974c360e2e2e883a63ce264"
+LIC_FILES_CHKSUM = "file://COPYING;md5=faa756e04053029ddc602caf99e5ef1d"
 
 SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "54d2c33eeebb031d48fa590c543e54c9bcbd0f00386ebc6489b2f47a0da4342a"
+SRC_URI[sha256sum] = "169e075a92d957a57787c199e84e359df2931b7196c1c5b4a3d576ee6235a87c"
 
 SECTION = "x11/libs"
 DEPENDS = "util-macros libxslt-native"
 
-EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps"
-
-FILES:${PN} += "${datadir}/X11/xkb"
+FILES:${PN} += "${datadir}/X11/xkb ${datadir}/xkeyboard-config-2"
 
 inherit meson pkgconfig gettext python3native
 
-do_install:append () {
-    install -d ${D}${datadir}/X11/xkb/compiled
-    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
+EXTRA_OEMESON += "-Dxorg-rules-symlinks=true"
 
 BBCLASSEXTEND += "native"