From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]
 helo=dude02.pengutronix.de.)
 by metis.ext.pengutronix.de with esmtp (Exim 4.92)
 (envelope-from <p.zabel@pengutronix.de>) id 1itU4C-0004Ps-S6
 for ptxdist@pengutronix.de; Mon, 20 Jan 2020 11:13:56 +0100
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Mon, 20 Jan 2020 11:13:55 +0100
Message-Id: <20200120101356.20649-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
Subject: [ptxdist] [PATCH 1/2] libxkbcommon: version bump 0.7.1 -> 0.10.0
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/libxkbcommon.in   |  1 +
 rules/libxkbcommon.make | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

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