[ptxdist] [PATCH 2/2] waffle: switch to meson build system

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
 rules/waffle.in   |  3 +--
 rules/waffle.make | 27 ++++++++++++---------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/rules/waffle.in b/rules/waffle.in
index 1a5339407f8c..a125621f9c7c 100644
--- a/rules/waffle.in
+++ b/rules/waffle.in
@@ -3,8 +3,7 @@
 menuconfig WAFFLE
        tristate
        prompt "waffle                        "
-       select HOST_CMAKE
-       select HOST_NINJA
+       select HOST_MESON
        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 cfea0e37ebde..4c53b9116351 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -29,24 +29,21 @@ WAFFLE_LICENSE_FILES := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-WAFFLE_CONF_TOOL       := cmake
+WAFFLE_CONF_TOOL       := meson
 WAFFLE_CONF_OPT        := \
-       $(CROSS_CMAKE_USR) \
-       -G Ninja \
-       -DVALGRIND_EXECUTABLE= \
+       $(CROSS_MESON_USR) \
+       -Dbuild-examples=false \
+       -Dbuild-htmldocs=false \
+       -Dbuild-manpages=false \
+       -Dbuild-tests=false \
+       -Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \
+       -Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \
+       -Dnacl=false \
        -Dnacl_sdk_path= \
        -Dnacl_version= \
-       -Dwaffle_build_examples=OFF \
-       -Dwaffle_build_htmldocs=OFF \
-       -Dwaffle_build_manpages=OFF \
-       -Dwaffle_build_tests=OFF \
-       -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \
-       -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \
-       -Dwaffle_has_nacl=OFF \
-       -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=
+       -Dsurfaceless_egl=disabled \
+       -Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \
+       -Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2