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 1l6aZq-0001Lo-Tn
 for ptxdist@pengutronix.de; Mon, 01 Feb 2021 15:53:18 +0100
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Mon,  1 Feb 2021 15:53:17 +0100
Message-Id: <20210201145317.13302-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
Subject: [ptxdist] [PATCH] wayland: version bump 1.18.0 -> 1.19.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

Add scanner config option and order options alphabetically.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/host-wayland.make | 5 +++--
 rules/wayland.make      | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rules/host-wayland.make b/rules/host-wayland.make
index 59b2696d5973..49ddb200ed90 100644
--- a/rules/host-wayland.make
+++ b/rules/host-wayland.make
@@ -21,9 +21,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_WAYLAND) += host-wayland
 HOST_WAYLAND_CONF_TOOL	:= meson
 HOST_WAYLAND_CONF_OPT	:= \
 	$(HOST_MESON_OPT) \
-	-Dlibraries=false \
 	-Ddocumentation=false \
 	-Ddtd_validation=false \
-	-Dicon_directory=
+	-Dicon_directory= \
+	-Dlibraries=false \
+	-Dscanner=true
 
 # vim: syntax=make
diff --git a/rules/wayland.make b/rules/wayland.make
index e276686fa1d1..b237a97016ff 100644
--- a/rules/wayland.make
+++ b/rules/wayland.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND) += wayland
 #
 # Paths and names
 #
-WAYLAND_VERSION	:= 1.18.0
-WAYLAND_MD5	:= 23317697b6e3ff2e1ac8c5ba3ed57b65
+WAYLAND_VERSION	:= 1.19.0
+WAYLAND_MD5	:= 5d59ac3d8a8f4e42de2ceb8bb19dfca9
 WAYLAND		:= wayland-$(WAYLAND_VERSION)
 WAYLAND_SUFFIX	:= tar.xz
 WAYLAND_URL	:= http://wayland.freedesktop.org/releases/$(WAYLAND).$(WAYLAND_SUFFIX)
@@ -37,10 +37,11 @@ WAYLAND_CONF_ENV	:= \
 WAYLAND_CONF_TOOL	:= meson
 WAYLAND_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
-	-Dlibraries=true \
 	-Ddocumentation=false \
 	-Ddtd_validation=false \
-	-Dicon_directory=
+	-Dicon_directory= \
+	-Dlibraries=true \
+	-Dscanner=true
 
 # ----------------------------------------------------------------------------
 # Install
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de