summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-05 16:43:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 11:56:41 +0000
commit5ca54ccab8c7a10072be84d9335fbc71e2f73042 (patch)
tree38435740d9e1f9d2d4f017aaf510e90c5efcf8b0
parentd4d403bb1d116751c676eab121698c7e09f070ee (diff)
downloadopenembedded-core-contrib-5ca54ccab8c7a10072be84d9335fbc71e2f73042.tar.gz
openembedded-core-contrib-5ca54ccab8c7a10072be84d9335fbc71e2f73042.tar.bz2
openembedded-core-contrib-5ca54ccab8c7a10072be84d9335fbc71e2f73042.zip
libxkbcommon: update to 0.9.1
Switch over to meson, and add an option for wayland support. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb (renamed from meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb)13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb
index 0608fd5af8..c147428a14 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb
@@ -9,17 +9,18 @@ DEPENDS = "util-macros flex-native bison-native"
SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "3c4409058dfd203f641a563358e0187d"
-SRC_URI[sha256sum] = "60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b"
+SRC_URI[md5sum] = "4662756fd73ab0ac9e32efdad8f807f6"
+SRC_URI[sha256sum] = "d4c6aabf0a5c1fc616f8a6a65c8a818c03773b9a87da9fbc434da5acd1199be0"
UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
-inherit autotools pkgconfig
+inherit meson pkgconfig
-EXTRA_OECONF = "--disable-docs"
+EXTRA_OEMESON = "-Denable-docs=false"
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config,"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
+PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
+PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
# Fix a following runtime error:
# xkbcommon: ERROR: couldn't find a Compose file for locale "C"