summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-04-09 18:26:08 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-04-09 18:26:08 +0200
commitf43f37a68e4ee0d4056358aa25b1e0311aed16ac (patch)
tree570059b0b7ee99cf34aa9f02c0a0cd194c86fc67
parent4b3be8225f389c7db0e2d665e8e600cb2cf52b91 (diff)
downloadptxdist-f43f37a68e4ee0d4056358aa25b1e0311aed16ac.tar.gz
ptxdist-f43f37a68e4ee0d4056358aa25b1e0311aed16ac.tar.xz
libxkbcommon: version bump 0.10.0 -> 1.2.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/libxkbcommon.make10
1 files changed, 6 insertions, 4 deletions
diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
index 625813b53..f3540ea9b 100644
--- a/rules/libxkbcommon.make
+++ b/rules/libxkbcommon.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBXKBCOMMON) += libxkbcommon
#
# Paths and names
#
-LIBXKBCOMMON_VERSION := 0.10.0
-LIBXKBCOMMON_MD5 := 2d9ad3a46b317138b5e72a91cf105451
+LIBXKBCOMMON_VERSION := 1.2.1
+LIBXKBCOMMON_MD5 := 36b2803f3beedd0aeeb265072e9c3e5d
LIBXKBCOMMON := libxkbcommon-$(LIBXKBCOMMON_VERSION)
LIBXKBCOMMON_SUFFIX := tar.xz
LIBXKBCOMMON_URL := http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
@@ -42,8 +42,10 @@ LIBXKBCOMMON_CONF_OPT := \
-Denable-docs=false \
-Denable-wayland=false \
-Denable-x11=$(call ptx/truefalse, PTXCONF_LIBXKBCOMMON_X11) \
- -Dx-locale-root=$(XORG_DATADIR/X11/locale) \
- -Dxkb-config-root=$(XORG_DATADIR)/X11/xkb
+ -Denable-xkbregistry=false \
+ -Dx-locale-root=$(XORG_DATADIR)/X11/locale \
+ -Dxkb-config-extra-path=/etc/xkb \
+ -Dxkb-config-root=$(XORG_DATADIR)/X11/xkb \
# ----------------------------------------------------------------------------