mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] waffle: version bump 1.7.2 -> 1.8.0
@ 2023-10-18 10:14 Philipp Zabel
  2023-10-21  8:44 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2023-10-18 10:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

NaCl support has been removed, only the build option remains.
It throws an error when enabled.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/waffle.make | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rules/waffle.make b/rules/waffle.make
index 4c53b9116351..bb800ff4a5e2 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
 #
 # Paths and names
 #
-WAFFLE_VERSION	:= 1.7.2
-WAFFLE_MD5	:= e5e9772fe2c1e6267794f7aba08637c8
+WAFFLE_VERSION	:= 1.8.0
+WAFFLE_MD5	:= e4b3a5f28e4db517349631ef54e5f2a0
 WAFFLE		:= waffle-$(WAFFLE_VERSION)
 WAFFLE_SUFFIX	:= tar.xz
 WAFFLE_URL	:= https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
@@ -39,8 +39,6 @@ WAFFLE_CONF_OPT	:= \
 	-Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \
 	-Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \
 	-Dnacl=false \
-	-Dnacl_sdk_path= \
-	-Dnacl_version= \
 	-Dsurfaceless_egl=disabled \
 	-Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \
 	-Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d
-- 
2.39.2




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] waffle: version bump 1.7.2 -> 1.8.0
  2023-10-18 10:14 [ptxdist] [PATCH] waffle: version bump 1.7.2 -> 1.8.0 Philipp Zabel
@ 2023-10-21  8:44 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-10-21  8:44 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as daf8f5c3743c5be75c5b9196eeec171a7fd9cde3.

Michael

[sent from post-receive hook]

On Sat, 21 Oct 2023 10:44:05 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> NaCl support has been removed, only the build option remains.
> It throws an error when enabled.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20231018101455.771168-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/waffle.make b/rules/waffle.make
> index 4c53b9116351..bb800ff4a5e2 100644
> --- a/rules/waffle.make
> +++ b/rules/waffle.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
>  #
>  # Paths and names
>  #
> -WAFFLE_VERSION	:= 1.7.2
> -WAFFLE_MD5	:= e5e9772fe2c1e6267794f7aba08637c8
> +WAFFLE_VERSION	:= 1.8.0
> +WAFFLE_MD5	:= e4b3a5f28e4db517349631ef54e5f2a0
>  WAFFLE		:= waffle-$(WAFFLE_VERSION)
>  WAFFLE_SUFFIX	:= tar.xz
>  WAFFLE_URL	:= https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
> @@ -39,8 +39,6 @@ WAFFLE_CONF_OPT	:= \
>  	-Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \
>  	-Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \
>  	-Dnacl=false \
> -	-Dnacl_sdk_path= \
> -	-Dnacl_version= \
>  	-Dsurfaceless_egl=disabled \
>  	-Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \
>  	-Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-10-21  8:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-18 10:14 [ptxdist] [PATCH] waffle: version bump 1.7.2 -> 1.8.0 Philipp Zabel
2023-10-21  8:44 ` [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