* [ptxdist] [PATCH] waffle: version bump 1.6.1 -> 1.7.0
@ 2021-03-08 13:20 Lucas Stach
2021-03-14 13:35 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2021-03-08 13:20 UTC (permalink / raw)
To: ptxdist
- 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] waffle: version bump 1.6.1 -> 1.7.0
2021-03-08 13:20 [ptxdist] [PATCH] waffle: version bump 1.6.1 -> 1.7.0 Lucas Stach
@ 2021-03-14 13:35 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-03-14 13:35 UTC (permalink / raw)
To: ptxdist; +Cc: Lucas Stach
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-14 13:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08 13:20 [ptxdist] [PATCH] waffle: version bump 1.6.1 -> 1.7.0 Lucas Stach
2021-03-14 13:35 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox