Release notes for v1.6.1:
https://lists.freedesktop.org/archives/mesa-announce/2020-March/000575.html
Removed patch 0001 which was applied upstream.
Switched _SITE to gitlab according to release notes for v1.6.0:
https://lists.freedesktop.org/archives/mesa-announce/2019-June/000520.html
Added -Dwaffle_has_nacl=OFF to CONF_OPTS to disable nacl support, this
avoids adding a dependency to C++:
https://gitlab.freedesktop.org/mesa/waffle/-/commit/
6ca943584e593aec2bd4f9c66d91859e63e02d61#9a2aa4db38d3115ed60da621e012c0efc0172aae_27_26
Added support for mesa3d surfaceless egl:
https://gitlab.freedesktop.org/mesa/waffle/commit/
7318f22c4761035c03e99420edf3e92f07e06c9c
Added support for bash-completion:
https://gitlab.freedesktop.org/mesa/waffle/-/blob/maint-1.6/CMakeLists.txt#L189
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
--- /dev/null
+From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 24 Dec 2017 00:11:45 +0100
+Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
+
+When building mesa egl without x11 and gles2 the headers need a
+EGL_NO_X11 define to avoid including X11 headers.
+
+This define EGL_NO_X11 is lost while building waffle
+since CFLAGS defined by pc files are not used.
+
+EGL_NO_X11 is defined in CFLAGS from egl.pc.
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/waffle/CMakeLists.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
+index d76e029..2ff72c8 100644
+--- a/src/waffle/CMakeLists.txt
++++ b/src/waffle/CMakeLists.txt
+@@ -5,6 +5,14 @@
+ add_definitions(
+ -DWAFFLE_API_VERSION=${waffle_api_version}
+ -DWAFFLE_API_EXPERIMENTAL
++ ${egl_CFLAGS}
++ ${gbm_CFLAGS}
++ ${gl_CFLAGS}
++ ${GLEXT_CFLAGS}
++ ${libudev_CFLAGS}
++ ${wayland-client_CFLAGS}
++ ${wayland-egl_CFLAGS}
++ ${x11-xcb_CFLAGS}
+ )
+
+ include_directories(
+--
+2.14.3
+
+++ /dev/null
-From 117456752cf9ac1f24d3cfd917ad34f670c244b8 Mon Sep 17 00:00:00 2001
-From: Emil Velikov <emil.l.velikov@gmail.com>
-Date: Thu, 19 Mar 2015 22:26:11 +0000
-Subject: [PATCH] third_party/threads: Use PTHREAD_MUTEX_RECURSIVE by default
-
-PTHREAD_MUTEX_RECURSIVE_NP was used for compatibility with old glibc.
-Although due to the_GNU_SOURCES define the portable,
-PTHREAD_MUTEX_RECURSIVE will be available for Linuxes since at least
-1998. Simplify things giving us compatibility with musl which
-apparently does not provide the non-portable define.
-
-Inspired by almost identical commit in mesa aead7fe2e2b(c11/threads: Use
-PTHREAD_MUTEX_RECURSIVE by default) by Felix Janda.
-
-Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-Reviewed-by: Chad Versace <chad.versace@intel.com>
-(Romain: cherry picked from commit 3b9b8f5f6d1b99af43e95ec0868404e552a85b73)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- third_party/threads/threads_posix.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c
-index 5835e43..e122bf9 100644
---- a/third_party/threads/threads_posix.c
-+++ b/third_party/threads/threads_posix.c
-@@ -26,6 +26,9 @@
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-+
-+#define _GNU_SOURCE
-+
- #include <stdlib.h>
- #ifndef assert
- #include <assert.h>
-@@ -150,13 +153,8 @@ int mtx_init(mtx_t *mtx, int type)
- && type != (mtx_try|mtx_recursive))
- return thrd_error;
- pthread_mutexattr_init(&attr);
-- if ((type & mtx_recursive) != 0) {
--#if defined(__linux__) || defined(__linux)
-- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
--#else
-+ if ((type & mtx_recursive) != 0)
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
--#endif
-- }
- pthread_mutex_init(mtx, &attr);
- pthread_mutexattr_destroy(&attr);
- return thrd_success;
---
-2.14.3
-
+++ /dev/null
-From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 24 Dec 2017 00:11:45 +0100
-Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
-
-When building mesa egl without x11 and gles2 the headers need a
-EGL_NO_X11 define to avoid including X11 headers.
-
-This define EGL_NO_X11 is lost while building waffle
-since CFLAGS defined by pc files are not used.
-
-EGL_NO_X11 is defined in CFLAGS from egl.pc.
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/waffle/CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
-index d76e029..2ff72c8 100644
---- a/src/waffle/CMakeLists.txt
-+++ b/src/waffle/CMakeLists.txt
-@@ -5,6 +5,14 @@
- add_definitions(
- -DWAFFLE_API_VERSION=${waffle_api_version}
- -DWAFFLE_API_EXPERIMENTAL
-+ ${egl_CFLAGS}
-+ ${gbm_CFLAGS}
-+ ${gl_CFLAGS}
-+ ${GLEXT_CFLAGS}
-+ ${libudev_CFLAGS}
-+ ${wayland-client_CFLAGS}
-+ ${wayland-egl_CFLAGS}
-+ ${x11-xcb_CFLAGS}
- )
-
- include_directories(
---
-2.14.3
-
# Locally calculated
-sha256 d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b waffle-1.5.2.tar.gz
-sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt
+sha256 234e65bdd2dd8f7d3bc8e9ad1a7cc80fce78a1deed3a04fe7f1d2c2edac0cd8a waffle-v1.6.1.tar.bz2
+sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt
#
################################################################################
-WAFFLE_VERSION = 1.5.2
-WAFFLE_SITE = $(call github,waffle-gl,waffle,v$(WAFFLE_VERSION))
+WAFFLE_VERSION = 1.6.1
+WAFFLE_SOURCE = waffle-v$(WAFFLE_VERSION).tar.bz2
+WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/-/archive/v$(WAFFLE_VERSION)
WAFFLE_INSTALL_STAGING = YES
WAFFLE_LICENSE = BSD-2-Clause
WAFFLE_LICENSE_FILES = LICENSE.txt
WAFFLE_CONF_OPTS = -Dwaffle_build_tests=OFF \
-Dwaffle_build_examples=OFF \
-Dwaffle_build_manpages=OFF \
- -Dwaffle_build_htmldocs=OFF
+ -Dwaffle_build_htmldocs=OFF \
+ -Dwaffle_has_nacl=OFF
ifeq ($(BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND),y)
WAFFLE_DEPENDENCIES += libegl wayland
WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF
endif
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+WAFFLE_DEPENDENCIES += bash-completion
+endif
+
+ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy)
+WAFFLE_DEPENDENCIES += mesa3d
+WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=ON
+else
+WAFFLE_CONF_OPTS += -Dwaffle_has_surfaceless_egl=OFF
+endif
+
$(eval $(cmake-package))
projects / buildroot.git / commitdiff