From patchwork Sun Aug 2 11:21:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1339910 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BKJVm2CLmz9sRN for ; Sun, 2 Aug 2020 21:21:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6273D87EE9; Sun, 2 Aug 2020 11:21:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zZGfVBOt8Al5; Sun, 2 Aug 2020 11:21:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7E86D87E97; Sun, 2 Aug 2020 11:21:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 77B041BF41C for ; Sun, 2 Aug 2020 11:21:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7407D87E97 for ; Sun, 2 Aug 2020 11:21:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cV5caHmZsFqR for ; Sun, 2 Aug 2020 11:21:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by hemlock.osuosl.org (Postfix) with ESMTPS id A391987E7D for ; Sun, 2 Aug 2020 11:21:12 +0000 (UTC) Received: from fwd09.aul.t-online.de (fwd09.aul.t-online.de [172.20.27.151]) by mailout01.t-online.de (Postfix) with SMTP id 2C660431BA51; Sun, 2 Aug 2020 13:21:10 +0200 (CEST) Received: from fli4l.lan.fli4l (VrRX0rZTrhofBkyzUd22HjF57lFKUqB2XOGj6MatxC+KgBLQ-SpjtFNnrRgPcTFQNC@[79.214.192.177]) by fwd09.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1k2C39-1negF60; Sun, 2 Aug 2020 13:21:07 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:41970) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1k2C38-00070G-Fg; Sun, 02 Aug 2020 13:21:06 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Aug 2020 13:21:06 +0200 Message-Id: <20200802112106.956286-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-ID: VrRX0rZTrhofBkyzUd22HjF57lFKUqB2XOGj6MatxC+KgBLQ-SpjtFNnrRgPcTFQNC X-TOI-EXPURGATEID: 150726::1596367267-00010299-0A31ED86/0/0 CLEAN NORMAL X-TOI-MSGID: ba25616c-8c06-41ec-94eb-6b50e0d4ca15 Subject: [Buildroot] [PATCH v2 1/1] package/waffle: bump version to 1.6.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Release notes for v1.6.1: https://lists.freedesktop.org/archives/mesa-announce/2020-March/000575.html Reformatted hashes, 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++ as src/waffle/nacl/nacl_container.cpp is the only C++ file relevant for linux contained in the source code: 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 Signed-off-by: Bernd Kuhls Reviewed-by: Romain Naour --- v2: bump to v1.6.1 disabled nacl support (Romain) added support for mesa3d surfaceless egl (Romain) ...ags-from-.pc-files-to-waffle-cflags.patch} | 0 ...ads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch | 54 ------------------- package/waffle/waffle.hash | 4 +- package/waffle/waffle.mk | 15 ++++-- 4 files changed, 14 insertions(+), 59 deletions(-) rename package/waffle/{0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch => 0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch} (100%) delete mode 100644 package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch diff --git a/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch similarity index 100% rename from package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch rename to package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch diff --git a/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch deleted file mode 100644 index ef54953e34..0000000000 --- a/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 117456752cf9ac1f24d3cfd917ad34f670c244b8 Mon Sep 17 00:00:00 2001 -From: Emil Velikov -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 -Reviewed-by: Chad Versace -(Romain: cherry picked from commit 3b9b8f5f6d1b99af43e95ec0868404e552a85b73) -Signed-off-by: Romain Naour ---- - 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 - #ifndef assert - #include -@@ -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 - diff --git a/package/waffle/waffle.hash b/package/waffle/waffle.hash index f496927e32..84821312c1 100644 --- a/package/waffle/waffle.hash +++ b/package/waffle/waffle.hash @@ -1,3 +1,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 diff --git a/package/waffle/waffle.mk b/package/waffle/waffle.mk index 280e295cb3..3b28bb2998 100644 --- a/package/waffle/waffle.mk +++ b/package/waffle/waffle.mk @@ -4,8 +4,9 @@ # ################################################################################ -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 @@ -15,7 +16,8 @@ WAFFLE_DEPENDENCIES = host-pkgconf 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 @@ -45,4 +47,11 @@ else WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF 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))