Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
Changes since v1:
- Remove left-over autoconf patch.
---
...01-configure.ac-Add-AC_SYS_LARGEFILE.patch | 28 -------------------
patches/libxkbcommon-0.7.1/autogen.sh | 1 -
patches/libxkbcommon-0.7.1/series | 1 -
rules/libxkbcommon.in | 1 +
rules/libxkbcommon.make | 27 ++++++++++--------
5 files changed, 16 insertions(+), 42 deletions(-)
delete mode 100644
patches/libxkbcommon-0.7.1/0001-configure.ac-Add-AC_SYS_LARGEFILE.patch
delete mode 120000 patches/libxkbcommon-0.7.1/autogen.sh
delete mode 100644 patches/libxkbcommon-0.7.1/series
diff --git
a/patches/libxkbcommon-0.7.1/0001-configure.ac-Add-AC_SYS_LARGEFILE.patch
b/patches/libxkbcommon-0.7.1/0001-configure.ac-Add-AC_SYS_LARGEFILE.patch
deleted file mode 100644
index 62ee7f164384..000000000000
--- a/patches/libxkbcommon-0.7.1/0001-configure.ac-Add-AC_SYS_LARGEFILE.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2ca0fd94f90298c0c5d1a4355d524c6a4eeb090f Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.za...@pengutronix.de>
-Date: Tue, 2 May 2017 15:04:14 +0200
-Subject: [PATCH] configure.ac: Add AC_SYS_LARGEFILE
-
-Allow to enable large file support on 32-bit systems.
-
-Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 725915b..0724d20 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,6 +37,8 @@ AM_MAINTAINER_MODE([enable])
- # Get _GNU_SOURCE and friends
- AC_USE_SYSTEM_EXTENSIONS
-
-+AC_SYS_LARGEFILE
-+
- # Initialize libtool
- LT_INIT
-
---
-2.11.0
-
diff --git a/patches/libxkbcommon-0.7.1/autogen.sh
b/patches/libxkbcommon-0.7.1/autogen.sh
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/libxkbcommon-0.7.1/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/libxkbcommon-0.7.1/series
b/patches/libxkbcommon-0.7.1/series
deleted file mode 100644
index c1cc28dce419..000000000000
--- a/patches/libxkbcommon-0.7.1/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-configure.ac-Add-AC_SYS_LARGEFILE.patch
diff --git a/rules/libxkbcommon.in b/rules/libxkbcommon.in
index 93d915ebdd07..0f39485033dc 100644
--- a/rules/libxkbcommon.in
+++ b/rules/libxkbcommon.in
@@ -3,6 +3,7 @@
menuconfig LIBXKBCOMMON
tristate
prompt "libxkbcommon "
+ select HOST_MESON
select XKEYBOARD_CONFIG if RUNTIME
select LIBXCB if LIBXKBCOMMON_X11
select HOST_XORG_UTIL_MACROS
diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
index 9be4832e2e04..70f21e994c95 100644
--- a/rules/libxkbcommon.make
+++ b/rules/libxkbcommon.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBXKBCOMMON) += libxkbcommon
#
# Paths and names
#
-LIBXKBCOMMON_VERSION := 0.7.1
-LIBXKBCOMMON_MD5 := 947ba609cb0239b9462127d5cf8908ee
+LIBXKBCOMMON_VERSION := 0.10.0
+LIBXKBCOMMON_MD5 := 2d9ad3a46b317138b5e72a91cf105451
LIBXKBCOMMON := libxkbcommon-$(LIBXKBCOMMON_VERSION)
LIBXKBCOMMON_SUFFIX := tar.xz
LIBXKBCOMMON_URL :=
http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
@@ -30,17 +30,20 @@ LIBXKBCOMMON_LICENSE := MIT AND X11 AND HPND
#
# autoconf
#
-LIBXKBCOMMON_CONF_TOOL := autoconf
+LIBXKBCOMMON_CONF_TOOL := meson
LIBXKBCOMMON_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --disable-static \
- --disable-selective-werror \
- --disable-strict-compilation \
- --disable-docs \
- --$(call ptx/endis, PTXCONF_LIBXKBCOMMON_X11)-x11 \
- --disable-wayland \
- --with-xkb-config-root=$(XORG_DATADIR)/X11/xkb
+ $(CROSS_MESON_USR) \
+ -Ddefault-layout='us' \
+ -Ddefault-model='pc105' \
+ -Ddefault-options='' \
+ -Ddefault-rules='evdev' \
+ -Ddefault-variant='' \
+ -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
+
# ----------------------------------------------------------------------------
# Target-Install
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
