From: Alexander Kanavin Date: Thu, 5 Dec 2019 15:43:53 +0000 (+0100) Subject: libxkbcommon: update to 0.9.1 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~12571 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ca54ccab8c7a10072be84d9335fbc71e2f73042;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git libxkbcommon: update to 0.9.1 Switch over to meson, and add an option for wayland support. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb similarity index 59% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.9.1.bb index 0608fd5af86..c147428a149 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"