From patchwork Mon Dec 25 15:49:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 852830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="STURau8i"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z53TG4WGBz9s0g for ; Tue, 26 Dec 2017 02:49:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 280002FADE; Mon, 25 Dec 2017 15:49:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hD4SOoKNnrGb; Mon, 25 Dec 2017 15:49:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C326E2DB3F; Mon, 25 Dec 2017 15:49:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B7D971C0DFA for ; Mon, 25 Dec 2017 15:49:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B23DD2DB3F for ; Mon, 25 Dec 2017 15:49:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p6qKK2022DXw for ; Mon, 25 Dec 2017 15:49:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by silver.osuosl.org (Postfix) with ESMTPS id 5370727CF9 for ; Mon, 25 Dec 2017 15:49:30 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id f206so31993661wmf.5 for ; Mon, 25 Dec 2017 07:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=U8u7NbuuxmVYf+4rgjQDn1kic1WvSq+r/n0cI+O1GwI=; b=STURau8i6DCTpHBmdzEHod1NHo+d6wrqaZQRi+q0ximWCqCHc8uueBe2W0aowDqY84 IQ7OgLaBqDCsa9xR2CKvIAsLinwPPWCpCHlFKlnc1dOCiKfEUoTyx8DxIH8CyJu8dknI ssa6GojqH14wok6B3iMPQt9fC69pYw73+jsR72AuUa9e2RiY6Xdy2kUeFFm11niN+LCn gHrZiI8Y4352Ba6OaO65Y+qhQE9kmnuZxgPTgYs3bIgZ8Ps0OJKSFlT7tZArinU+MMDK NVL+JUsSaRuuSyVrmNQuL0UZ1p8Ljc1b1ex3aBZU9pLOQqsrA6ZSWWFpRRe6RTGSDDds A58w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U8u7NbuuxmVYf+4rgjQDn1kic1WvSq+r/n0cI+O1GwI=; b=bsQcV6vXrrRuFOlDWe6r9tyF4Rq7h3cWuBtSvqow1iVIIRlGIeCGf7A6x/SrV6XklK v9LAhkDrPaTMoV2JXTcYgZ8rpQBCzcYXPqa72HwqqBJXkpfaayizoY3T4GaI2GAginyP e6Df1lJLIF24pDOBA0c4WJdD/ALiNsv4QdRdKUO2qcwKRZACToMwpd6KTYcWlnaeP2GR TgjiJLbucCljD4PdFWm30usvzvh2889yi6sTgJb+pD1mGy9iKF7jvaGyGZ+J2B4Pv0/r kb8kNnToYmaGZS3pskE5Cc0veqQO3nec50CL/m6wszODYvVVk5D3PXSkNpqvX0gBx+cy /++g== X-Gm-Message-State: AKGB3mLGpDNH9AQ79If8FX5LQUKBjX18O1WrPaYVBqPxobsjOR8rmcIg 6URz9OdWuGimBKwfOvdTQ9PkNjeF X-Google-Smtp-Source: ACJfBour0gDcgHpI4jq65uxRtXc4oMvAyWNl+Rkr5jQve+YpcCptXg07/jgUjo6jwgePZMXF9UIzTQ== X-Received: by 10.28.109.6 with SMTP id i6mr18675144wmc.108.1514216968289; Mon, 25 Dec 2017 07:49:28 -0800 (PST) Received: from localhost.localdomain ([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf]) by smtp.gmail.com with ESMTPSA id m134sm13109049wmg.6.2017.12.25.07.49.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Dec 2017 07:49:27 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 25 Dec 2017 16:49:21 +0100 Message-Id: <20171225154923.18773-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH 1/3] package/python-numpy: add host variant for piglit X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" host-python-numpy is required by piglit buildsystem for crosscompiling. Signed-off-by: Romain Naour --- package/python-numpy/python-numpy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index d0d38371a3..35878ac129 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -31,3 +31,4 @@ endef PYTHON_NUMPY_INSTALL_STAGING = YES $(eval $(python-package)) +$(eval $(host-python-package)) From patchwork Mon Dec 25 15:49:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 852831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e1jGoQIg"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z53TL0xBBz9s4q for ; Tue, 26 Dec 2017 02:49:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F1F1A87ACE; Mon, 25 Dec 2017 15:49:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X_fgWE03S3-b; Mon, 25 Dec 2017 15:49:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B5EAE8724B; Mon, 25 Dec 2017 15:49:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 103321C0DFA for ; Mon, 25 Dec 2017 15:49:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0BEA72F5F1 for ; Mon, 25 Dec 2017 15:49:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DzqDBjyR+Oz1 for ; Mon, 25 Dec 2017 15:49:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by silver.osuosl.org (Postfix) with ESMTPS id 476EF2D1D4 for ; Mon, 25 Dec 2017 15:49:31 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id g130so33480557wme.0 for ; Mon, 25 Dec 2017 07:49:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJbFBeaUFSZyM6QbriaWnXy5IIY/WX5/KDG3iGFV6TM=; b=e1jGoQIgvKYOLvbXGYry3+z1OeGyeE8c7w7t/FaIt4fjnFnFL0ldipxku68w7LC7Lx x9/Vl4LQUuszNIyxL65z8N4ONmY3xIix4AYIYnRaArcXZPwnOBxtIIuzOgYti6ir/ul9 mSxvFrQ9KLP3jkC6+2E4Ify/dmdqAE+/p/0Sc6IDJ30PyWVbpAFFTJAjYSynFaBlM1TI yYmasl1LXGLcbIP0Ie+uzIfqMCTn9n34PTC53cz467fPNSyLUay5yIIbcU3Jv4YVLLxX vJSlGzkFHGXh1oVdf8r+IfgnOYHooi6+h4lEc2uDVA2BmE7zFe35z4qTC4iihiedLMqz /low== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hJbFBeaUFSZyM6QbriaWnXy5IIY/WX5/KDG3iGFV6TM=; b=qgf29aSmBHZEtlXctnXCz5Cks0pcicmxj2PHAmeitvj8FUjZ8XLYlCMX8t4YLHEIXY VBfO3RUTPKUdM41MwxFBgOHBI7m7ecVvkmFD0BeNS2SJhiLE8kWXR9w7d4oOj+pAPko1 tns55tT25DRZjl2i4RhxIvOFRx7Ik+W2UpcjmoYRYRKUs/Zeyu7g/ysMgI9RpBdiPVz7 0yxH0b6fXykCUcqM+h1BxrYaxMJDKgDUrZbd7G3Rd2XDUcBE7rK30UjXdqjC6CBWoN4W xV6PToWQzdggiE3p7o+N2tN130gfGhJ+7r1tgirMcsAR3kx1GlwZmP4A+Lw4K27EMM+D nwmw== X-Gm-Message-State: AKGB3mJIH8/0KagynZ004nsHMoeRdUOeMoyt2qg4Y78/mrNxYYnmKCPs AL8K9A+HZN4o9+9cuu/GA31bqooK X-Google-Smtp-Source: ACJfBouirRdT+3iYYy+KEIdd1BGB7Xciqrl/aXGRxGUo+gTK+fMJxqyfRzv8Xg+KorlbU5TutmrGZQ== X-Received: by 10.28.94.75 with SMTP id s72mr20054739wmb.112.1514216969271; Mon, 25 Dec 2017 07:49:29 -0800 (PST) Received: from localhost.localdomain ([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf]) by smtp.gmail.com with ESMTPSA id m134sm13109049wmg.6.2017.12.25.07.49.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Dec 2017 07:49:28 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 25 Dec 2017 16:49:22 +0100 Message-Id: <20171225154923.18773-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171225154923.18773-1-romain.naour@gmail.com> References: <20171225154923.18773-1-romain.naour@gmail.com> Subject: [Buildroot] [PATCH 2/3] package/waffle: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Backport an upstream patch fixing a build issue with musl toolchains. Add a new patch fixing build with Wayand without X11. Signed-off-by: Romain Naour --- DEVELOPERS | 1 + package/Config.in | 1 + ...-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch | 54 ++++++++++++++++++++++ ...rd-cflags-from-.pc-files-to-waffle-cflags.patch | 40 ++++++++++++++++ package/waffle/Config.in | 30 ++++++++++++ package/waffle/waffle.hash | 3 ++ package/waffle/waffle.mk | 48 +++++++++++++++++++ 7 files changed, 177 insertions(+) create mode 100644 package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch create mode 100644 package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch create mode 100644 package/waffle/Config.in create mode 100644 package/waffle/waffle.hash create mode 100644 package/waffle/waffle.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9f4f282203..6e2d312452 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1477,6 +1477,7 @@ F: package/supertux/ F: package/supertuxkart/ F: package/terminology/ F: package/upower/ +F: package/waffle/ F: package/xenomai/ N: Romain Perier diff --git a/package/Config.in b/package/Config.in index bd39a374f0..ae920c455b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1155,6 +1155,7 @@ menu "Graphics" source "package/poppler/Config.in" source "package/powervr/Config.in" source "package/tiff/Config.in" + source "package/waffle/Config.in" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" source "package/waylandpp/Config.in" 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 new file mode 100644 index 0000000000..ef54953e34 --- /dev/null +++ b/package/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch @@ -0,0 +1,54 @@ +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/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch new file mode 100644 index 0000000000..ffc1b5b8b1 --- /dev/null +++ b/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch @@ -0,0 +1,40 @@ +From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001 +From: Romain Naour +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 +MESA_EGL_NO_X11_HEADERS define to avoid including X11 headers. + +This define MESA_EGL_NO_X11_HEADERS is lost while building waffle +since CGLAGS defined by pc files are not used. + +MESA_EGL_NO_X11_HEADERS is defined in CFLAGS from egl.pc. + +Signed-off-by: Romain Naour +--- + 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 + diff --git a/package/waffle/Config.in b/package/waffle/Config.in new file mode 100644 index 0000000000..a9799ef43e --- /dev/null +++ b/package/waffle/Config.in @@ -0,0 +1,30 @@ +comment "waffle needs an OpenGL GL or EGL provider" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_WAFFLE + bool "waffle" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + help + Waffle is a cross-platform library that allows one to defer + selection of an OpenGL API and of window system until + runtime. For example, on Linux, Waffle enables an application + to select X11/EGL with an OpenGL 3.3 core profile, Wayland + with OpenGL ES2, and other window system / API combinations. + + Waffle's immediate goal is to enable Piglit [1] to test + multiple OpenGL flavors in a cross-platform way, and to allow + each Piglit test to choose its OpenGL API and window system + at runtime. A future goal is to enable the ability to record + (with another tool such APITrace [2]) an application's OpenGL + calls on one operating system or window system, and then + replay that trace on a different system. + + For more information, visit to Waffle's website. + + [1] http://piglit.freedesktop.org + [2] http://github.com/apitrace/apitrace#readme + + http://www.waffle-gl.org diff --git a/package/waffle/waffle.hash b/package/waffle/waffle.hash new file mode 100644 index 0000000000..5dfb976f2f --- /dev/null +++ b/package/waffle/waffle.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d662f6743f688dc5ea4b7d29f558eb54bd8f57350080f04a006693d22e5d1d5b waffle-v1.5.2.tar.gz +sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt diff --git a/package/waffle/waffle.mk b/package/waffle/waffle.mk new file mode 100644 index 0000000000..741bc8e349 --- /dev/null +++ b/package/waffle/waffle.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# waffle +# +################################################################################ + +WAFFLE_VERSION = v1.5.2 +WAFFLE_SITE = $(call github,waffle-gl,waffle,$(WAFFLE_VERSION)) +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 + +ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_HAS_LIBEGL_WAYLAND),yy) +WAFFLE_DEPENDENCIES += libegl wayland +WAFFLE_CONF_OPTS += -Dwaffle_has_wayland=ON +else +WAFFLE_CONF_OPTS += -Dwaffle_has_wayland=OFF +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_HAS_LIBEGL),yyy) +WAFFLE_DEPENDENCIES += libegl libxcb xlib_libX11 +WAFFLE_CONF_OPTS += -Dwaffle_has_x11_egl=ON +else +WAFFLE_CONF_OPTS += -Dwaffle_has_x11_egl=OFF +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_HAS_LIBGL),yyy) +WAFFLE_DEPENDENCIES += libgl libxcb xlib_libX11 +WAFFLE_CONF_OPTS += -Dwaffle_has_glx=ON +else +WAFFLE_CONF_OPTS += -Dwaffle_has_glx=OFF +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)$(BR2_PACKAGE_HAS_UDEV),yy) +WAFFLE_DEPENDENCIES += libegl mesa3d udev +WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=ON +else +WAFFLE_CONF_OPTS += -Dwaffle_has_gbm=OFF +endif + +$(eval $(cmake-package)) From patchwork Mon Dec 25 15:49:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 852832 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ka7ZooYX"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z53TN1wN3z9s0g for ; Tue, 26 Dec 2017 02:49:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7D2AD87AD1; Mon, 25 Dec 2017 15:49:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5eMh0NlGBqgU; Mon, 25 Dec 2017 15:49:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EA3B87AC1; Mon, 25 Dec 2017 15:49:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1CB581C0DFA for ; Mon, 25 Dec 2017 15:49:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 182D88724B for ; Mon, 25 Dec 2017 15:49:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2brzYD0YCmDH for ; Mon, 25 Dec 2017 15:49:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 365AA87188 for ; Mon, 25 Dec 2017 15:49:32 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id w68so20667137wrc.10 for ; Mon, 25 Dec 2017 07:49:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=McjpluKerRe1iU4yq6q4aFkexMvTm8V4sXotdJ+dKjU=; b=Ka7ZooYXrCcLH3FHH5Yknf9Wqyw+XQcQkzpudKNdZ4M/bOqnETDUzjfAiN5DMJVuyx yyt6RTPGpLIV6IHchdnNPFHx/H7AU+Wnal5ke+pMTHXr0ftYR75YKfQyUAUiV4DNRAag 5cRpAaIVMprTP4xb1FRvdhMpTZj/xIl8KshAIayAnEnGQ+5mhZAtyj87f4CX2071mJNx 3ujbcYGqa+XnwYKAJLxGhI81UM71oWUIKHyvbgEYtI4r41EsuwitjSKhcCXBwUohpH6f r2VxXPMHJiHa115UzZ2w9m7TZQHeFPXgbMZQEJwvUamj+mNvY1h7OgRClKI2qgpsYmJv jK3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=McjpluKerRe1iU4yq6q4aFkexMvTm8V4sXotdJ+dKjU=; b=Hp661I+MyhoqGS89erZuj8NSNrpzTixBOCk4R7BlSrJaezCPCW1pBsYQGmNmwRCeBN 6gCpM3yCRhN9Hsjpw9S0nRvO+3+nKYFCj/T9XVzTHDm8fG4Hai6ggicggehZAX1kE+WG B6LwoRx2INCiOvFZrYo+8YvZR6WGpFj0bYPM4N9+/nMreLMDi4x7/Q9Qr/03tApQTqWB GfVBX7Ok/ZWU4PNcw7gj+/Qym8sGDAxz9QpCovR1QLxcMnIwzeVV1Hgxx1fYaPb04wNK mn7A7mYuD+wAi6beWuZ4Cut34FPl0yFzYdfuEEV6tUD3eztjeEjZP9Y+9t+X31n4IyAW ExjA== X-Gm-Message-State: AKGB3mJrCmFCDCelq7EFpkR3eBARWRWQtuVy0n/nh8o04kmkOZbmbjgJ mx2uXSHOrhT2M81t7oFNpCIMUoCL X-Google-Smtp-Source: ACJfBosgy2jlpH0M/HkuCFxwqPnf0QbbVxYVPRQH374nNv/mWZJ3XGcG8jaXnhi1y89xJCxTLyLeIQ== X-Received: by 10.223.142.202 with SMTP id q68mr1449902wrb.262.1514216970266; Mon, 25 Dec 2017 07:49:30 -0800 (PST) Received: from localhost.localdomain ([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf]) by smtp.gmail.com with ESMTPSA id m134sm13109049wmg.6.2017.12.25.07.49.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Dec 2017 07:49:29 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 25 Dec 2017 16:49:23 +0100 Message-Id: <20171225154923.18773-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171225154923.18773-1-romain.naour@gmail.com> References: <20171225154923.18773-1-romain.naour@gmail.com> Subject: [Buildroot] [PATCH 3/3] package/piglit: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Piglit is an open-source test suite for OpenGL implementations. It's an python3 script based around several tools like glxinfo, wflinfo, dmesg. Even though waffle support can be replaced by freeglut, using pliglit with waffle is recommended since freeglut will be replaced by waffle. Signed-off-by: Romain Naour Cc: Bernd Kuhls --- Bernd, I'm Cc you since you're probably interested by piglit to test new mesa3d version. --- DEVELOPERS | 1 + package/Config.in | 1 + package/piglit/Config.in | 35 +++++++++++++++++++++++ package/piglit/piglit.hash | 6 ++++ package/piglit/piglit.mk | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 package/piglit/Config.in create mode 100644 package/piglit/piglit.hash create mode 100644 package/piglit/piglit.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6e2d312452..abbb99a022 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1471,6 +1471,7 @@ F: package/minetest/ F: package/minetest-game/ F: package/openpowerlink/ F: package/physfs/ +F: package/piglit/ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ diff --git a/package/Config.in b/package/Config.in index ae920c455b..b12227b684 100644 --- a/package/Config.in +++ b/package/Config.in @@ -113,6 +113,7 @@ menu "Debugging, profiling and benchmark" source "package/nmon/Config.in" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" + source "package/piglit/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" source "package/ramsmp/Config.in" diff --git a/package/piglit/Config.in b/package/piglit/Config.in new file mode 100644 index 0000000000..eaa19c17ba --- /dev/null +++ b/package/piglit/Config.in @@ -0,0 +1,35 @@ +config BR2_PACKAGE_PIGLIT + bool "piglit" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_PYTHON3 # python3 only script + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_MESA3D_DEMOS # glxinfo + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_PYTHON_MAKO + select BR2_PACKAGE_PYTHON_NUMPY + select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON3_BZIP2 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_XZ + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_UTIL_LINUX # runtime dependency + select BR2_PACKAGE_UTIL_LINUX_BINARIES # require real dmesg tool + select BR2_PACKAGE_WAFFLE # wflinfo + help + Piglit is an open-source test suite for OpenGL + implementations. + + https://piglit.freedesktop.org + +comment "piglit needs an OpenGL GL or EGL provider" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBEGL diff --git a/package/piglit/piglit.hash b/package/piglit/piglit.hash new file mode 100644 index 0000000000..a3b39f862e --- /dev/null +++ b/package/piglit/piglit.hash @@ -0,0 +1,6 @@ +# Locally calculated +sha256 e26070ab10bbe4583543d076a495731888e3be9933e4907a62f25b102ad65023 dl/piglit-75ba8aea0e6eff0bc30821df9640ee4053dd98b6.tar.gz +sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 diff --git a/package/piglit/piglit.mk b/package/piglit/piglit.mk new file mode 100644 index 0000000000..3fd90b2746 --- /dev/null +++ b/package/piglit/piglit.mk @@ -0,0 +1,69 @@ +################################################################################ +# +# piglit +# +################################################################################ + +PIGLIT_VERSION = 75ba8aea0e6eff0bc30821df9640ee4053dd98b6 +PIGLIT_SITE = https://anongit.freedesktop.org/git/piglit.git +PIGLIT_SITE_METHOD = git +PIGLIT_LICENSE = MIT (code), \ + LGPL-2.0+ (libpiglit*.so), \ + GPL-3.0 (tests/glslparsertest/glsl2/norsetto-*), \ + GPL-2.0+ (tests/glslparsertest/glsl2/gst-gl-*), \ + BSD-3-Clause (tests/glslparsertest/shaders/*) +PIGLIT_LICENSE_FILES = COPYING licences/GPL-2 licences/GPL-3 licences/LGPL-2 + +PIGLIT_DEPENDENCIES = host-pkgconf \ + host-python-mako \ + host-python-numpy \ + host-python-six \ + libpng \ + python-mako \ + python-numpy \ + python-six \ + waffle \ + zlib + +PIGLIT_CONF_OPTS += \ + -DPIGLIT_USE_WAFFLE=ON \ + -DPIGLIT_BUILD_CL_TESTS=OFF \ + -DPIGLIT_BUILD_WGL_TESTS=OFF + +ifeq ($(BR2_PACKAGE_XORG7),y) +# libxcb for xcb-dri2 +PIGLIT_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xproto_glproto \ + $(if $(BR2_PACKAGE_LIBXCB),libxcb) +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +PIGLIT_DEPENDENCIES += libgl libdrm +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=ON \ + -DPIGLIT_BUILD_GLES2_TESTS=ON \ + -DPIGLIT_BUILD_GLES3_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=OFF \ + -DPIGLIT_BUILD_GLES2_TESTS=OFF \ + -DPIGLIT_BUILD_GLES3_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +PIGLIT_DEPENDENCIES += wayland libxkbcommon +endif + +$(eval $(cmake-package))