[Buildroot] [PATCH 2/4] package/waffle: bump to 5f1f48287e806544d745e9a8f5aed47234c61292

[Raphael Gallais-Pou]

Waffle has two build systems.  In commit f162f8126ec4 ("cmake: deprecate
cmake in favour of meson"), cmake is not the preferred build system, and
fails when used.  Bump to latest version available (which has been
released a year ago) and switch to meson build system

Signed-off-by: Raphael Gallais-Pou <rgallaispou at gmail.com>
---
 package/waffle/waffle.hash |  4 +---
 package/waffle/waffle.mk   | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/package/waffle/waffle.hash b/package/waffle/waffle.hash
index 8968dd6fd36c46cb774897a22c1f3b3fc3aac588..ee35b129c05c89348cd9554f7152b875d021f0be 100644
--- a/package/waffle/waffle.hash
+++ b/package/waffle/waffle.hash
@@ -1,5 +1,3 @@
-# From https://gitlab.freedesktop.org/mesa/waffle/uploads/42030b1cc0f81fd738152104e1811919/waffle-1.7.0.sha256sums
-sha256  69e42d15d08f63e7a54a8b8770295a6eb04dfd1c6f86c328b6039dbe7de28ef3  waffle-1.7.0.tar.xz
-
 # Locally calculated
+sha256  46d3339d857098b31cd758a2fffec6bcee0b693ca1b23d9fbb52a344eb018b04  waffle-5f1f48287e806544d745e9a8f5aed47234c61292-git4.tar.gz
 sha256  630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b  LICENSE.txt
diff --git a/package/waffle/waffle.mk b/package/waffle/waffle.mk
index 87d44c4217b1db4b1694bcb28d7ff954cfc42895..5c8d0f051c8c7b763c19ce3ecb92c09e2c4865c3 100644
--- a/package/waffle/waffle.mk
+++ b/package/waffle/waffle.mk
@@ -4,47 +4,47 @@
 #
 ################################################################################
 
-WAFFLE_VERSION = 1.7.0
-WAFFLE_SOURCE = waffle-$(WAFFLE_VERSION).tar.xz
-WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/uploads/9eaadda4ec2ed1d8a26ddefd2cfd16be
+WAFFLE_VERSION = 5f1f48287e806544d745e9a8f5aed47234c61292
+WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle.git
+WAFFLE_SITE_METHOD = git
 WAFFLE_INSTALL_STAGING = YES
 WAFFLE_LICENSE = BSD-2-Clause
 WAFFLE_LICENSE_FILES = LICENSE.txt
 
 WAFFLE_DEPENDENCIES = host-pkgconf
 
-WAFFLE_CONF_OPTS = -Dwaffle_build_tests=OFF \
-	-Dwaffle_build_examples=OFF \
-	-Dwaffle_build_manpages=OFF \
-	-Dwaffle_build_htmldocs=OFF \
-	-Dwaffle_has_nacl=OFF
+WAFFLE_CONF_OPTS = -Dbuild-tests=false \
+	-Dbuild-examples=false \
+	-Dbuild-manpages=false \
+	-Dbuild-htmldocs=false \
+	-Dnacl=false
 
 ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND),y)
 WAFFLE_DEPENDENCIES += libegl wayland
-WAFFLE_CONF_OPTS += -Dwaffle_has_wayland=ON
+WAFFLE_CONF_OPTS += -Dwayland=enabled
 else
-WAFFLE_CONF_OPTS += -Dwaffle_has_wayland=OFF
+WAFFLE_CONF_OPTS += -Dwayland=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL),y)
 WAFFLE_DEPENDENCIES += libegl libxcb xlib_libX11
-WAFFLE_CONF_OPTS += -Dwaffle_has_x11_egl=ON
+WAFFLE_CONF_OPTS += -Dx11_egl=enabled
 else
-WAFFLE_CONF_OPTS += -Dwaffle_has_x11_egl=OFF
+WAFFLE_CONF_OPTS += -Dx11_egl=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_GLX),y)
 WAFFLE_DEPENDENCIES += libgl libxcb xlib_libX11
-WAFFLE_CONF_OPTS += -Dwaffle_has_glx=ON
+WAFFLE_CONF_OPTS += -Dglx=enabled
 else
-WAFFLE_CONF_OPTS += -Dwaffle_has_glx=OFF
+WAFFLE_CONF_OPTS += -Dglx=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_GBM),y)
 WAFFLE_DEPENDENCIES += libegl udev
-WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=ON
+WAFFLE_CONF_OPTS += -Dgbm=enabled
 else
-WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF
+WAFFLE_CONF_OPTS += -Dgbm=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
@@ -53,9 +53,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy)
 WAFFLE_DEPENDENCIES += mesa3d
-WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=ON
+WAFFLE_CONF_OPTS += -Dsurfaceless_egl=enabled
 else
-WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=OFF
+WAFFLE_CONF_OPTS += -Dsurfaceless_egl=disabled
 endif
 
-$(eval $(cmake-package))
+$(eval $(meson-package))

-- 
2.51.0