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 <l.stach@pengutronix.de>) id 1lJFnr-0001Yq-05
 for ptxdist@pengutronix.de; Mon, 08 Mar 2021 14:20:07 +0100
From: Lucas Stach <l.stach@pengutronix.de>
Date: Mon,  8 Mar 2021 14:20:06 +0100
Message-Id: <20210308132006.15742-1-l.stach@pengutronix.de>
MIME-Version: 1.0
Subject: [ptxdist] [PATCH] waffle: version bump 1.6.1 -> 1.7.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

- version bump
- switch to ninja build
- set all configuration opntions

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/waffle.in   |  1 +
 rules/waffle.make | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rules/waffle.in b/rules/waffle.in
index a9f86de7b36b..1a5339407f8c 100644
--- a/rules/waffle.in
+++ b/rules/waffle.in
@@ -4,6 +4,7 @@ menuconfig WAFFLE
 	tristate
 	prompt "waffle                        "
 	select HOST_CMAKE
+	select HOST_NINJA
 	select MESALIB
 	select LIBXCB		if WAFFLE_GLX || WAFFLE_X11_EGL
 	select XORG_LIB_X11	if WAFFLE_GLX || WAFFLE_X11_EGL
diff --git a/rules/waffle.make b/rules/waffle.make
index 7a384476ecc7..003ed8c0c9f9 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
 #
 # Paths and names
 #
-WAFFLE_VERSION	:= 1.6.1
-WAFFLE_MD5	:= c91529e579483f44fb330052872b9c73
+WAFFLE_VERSION	:= 1.7.0
+WAFFLE_MD5	:= 1e77b0cd95856fc9594f556fe9e13cb9
 WAFFLE		:= waffle-$(WAFFLE_VERSION)
 WAFFLE_SUFFIX	:= tar.xz
-WAFFLE_URL	:= http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
+WAFFLE_URL	:= https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
 WAFFLE_SOURCE	:= $(SRCDIR)/$(WAFFLE).$(WAFFLE_SUFFIX)
 WAFFLE_DIR	:= $(BUILDDIR)/$(WAFFLE)
 WAFFLE_LICENSE	:= BSD-2-Clause
@@ -32,6 +32,10 @@ WAFFLE_LICENSE_FILES := \
 WAFFLE_CONF_TOOL	:= cmake
 WAFFLE_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
+	-G Ninja \
+	-DVALGRIND_EXECUTABLE= \
+	-Dnacl_sdk_path= \
+	-Dnacl_version= \
 	-Dwaffle_build_examples=OFF \
 	-Dwaffle_build_htmldocs=OFF \
 	-Dwaffle_build_manpages=OFF \
@@ -42,7 +46,7 @@ WAFFLE_CONF_OPT	:= \
 	-Dwaffle_has_surfaceless_egl=OFF \
 	-Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \
 	-Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \
-
+	-Dwaffle_xsltproc=
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.29.2


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