From 2c8238d5542f3e44b6dd1987dac6001fe893271f Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Tue, 18 Feb 2025 15:39:17 +0800
Subject: libxkbcommon: upgrade 1.7.0 -> 1.8.0

(From OE-Core rev: ba4965e5e391b6727db0e75383689e55a3db8a13)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-lib/libxkbcommon_1.7.0.bb                 | 39 ----------------------
 .../xorg-lib/libxkbcommon_1.8.0.bb                 | 39 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb
 create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_1.8.0.bb

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb
deleted file mode 100644
index f216a07983..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Generic XKB keymap library"
-DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
-processes a reduced subset of keymaps as defined by the XKB specification."
-HOMEPAGE = "http://www.xkbcommon.org"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87"
-LICENSE = "MIT & MIT"
-
-DEPENDS = "flex-native bison-native"
-
-SRC_URI = "git://github.com/xkbcommon/libxkbcommon;protocol=https;branch=master"
-
-SRCREV = "7a31e3585edf78be281559377e26d15f8c4bc655"
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig bash-completion
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry"
-
-PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
-PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
-PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
-PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2"
-
-PACKAGE_BEFORE_PN += "xkbcli"
-FILES:${PN} = ""
-FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*"
-
-python populate_packages:prepend () {
-    # Put the libraries into separate packages to avoid dependency creep
-    do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True)
-}
-
-# Recommended to fix a possible runtime error:
-# xkbcommon: ERROR: couldn't find a Compose file for locale "C"
-RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}"
-
-BBCLASSEXTEND += "native"
-
-CVE_PRODUCT += "xkbcommon:libxkbcommon"
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.8.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.8.0.bb
new file mode 100644
index 0000000000..a7dad3f4a2
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.8.0.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Generic XKB keymap library"
+DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \
+processes a reduced subset of keymaps as defined by the XKB specification."
+HOMEPAGE = "http://www.xkbcommon.org"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87"
+LICENSE = "MIT & MIT"
+
+DEPENDS = "flex-native bison-native"
+
+SRC_URI = "git://github.com/xkbcommon/libxkbcommon;protocol=https;branch=master"
+
+SRCREV = "76740e0c4583ae49675e7ba8213d31ee09aa00d2"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig bash-completion
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry"
+
+PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
+PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
+PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
+PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2"
+
+PACKAGE_BEFORE_PN += "xkbcli"
+FILES:${PN} = ""
+FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*"
+
+python populate_packages:prepend () {
+    # Put the libraries into separate packages to avoid dependency creep
+    do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True)
+}
+
+# Recommended to fix a possible runtime error:
+# xkbcommon: ERROR: couldn't find a Compose file for locale "C"
+RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}"
+
+BBCLASSEXTEND += "native"
+
+CVE_PRODUCT += "xkbcommon:libxkbcommon"
-- 
cgit v1.2.3-54-g00ecf