From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lucas Stach <l.stach@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] waffle: version bump 1.6.1 -> 1.7.0
Date: Sun, 14 Mar 2021 14:35:40 +0100 [thread overview]
Message-ID: <E1lLQuC-007JOa-07@dude03.red.stw.pengutronix.de> (raw)
In-Reply-To: <20210308132006.15742-1-l.stach@pengutronix.de>
Thanks, applied as 67250f2b8eaebfacc42162cc736280a9c35c9378.
Michael
[sent from post-receive hook]
On Sun, 14 Mar 2021 14:35:39 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> - version bump
> - switch to ninja build
> - set all configuration opntions
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210308132006.15742-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-03-14 13:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 13:20 [ptxdist] [PATCH] " Lucas Stach
2021-03-14 13:35 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1lLQuC-007JOa-07@dude03.red.stw.pengutronix.de \
--to=mol@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox