From patchwork Sun Feb 11 16:21:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 871776 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="h7QLoaeV"; 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 3zfYwB4XCFz9t5Q for ; Mon, 12 Feb 2018 03:21:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 197B925D78; Sun, 11 Feb 2018 16:21:44 +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 VPFiDi6fi7s9; Sun, 11 Feb 2018 16:21:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7A2FF26021; Sun, 11 Feb 2018 16:21:43 +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 E710C1C1FAF for ; Sun, 11 Feb 2018 16:21:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3A0E87142 for ; Sun, 11 Feb 2018 16:21:42 +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 sbfRxsBz9wOr for ; Sun, 11 Feb 2018 16:21:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7C4E286EE8 for ; Sun, 11 Feb 2018 16:21:41 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id b21so5703605wme.4 for ; Sun, 11 Feb 2018 08:21:41 -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=h7QLoaeValLiOcyjzmtpaC1Z7EZQtYub04rAfwWDUsr6eXVOwnLpNPwe9/O1hkUriT LZASjzH+JjYkIQr+ZH4mm2H0oP+nSmLinpBI1st442IbbB7v1fVSp0olONHHRzTBWmcD rGH23QrnZjFSWBtVCXSpvXNrPQzVEodnqeOmIKQV4Vq7fzSqHCpWKXE6OTYHmNkMxjYm OPaEsK9i1BjpY97FGOCZg2SNf2aoDrX3saTYDt1CORSrI/Ds8tSqYeK2C+QYcz9isIZn ENLyGHothvFAq5bgiG9syKdFeyehL4/VvTomp1Qiv7YCBs064HTRgjchDLoDrdI26qx3 OV4g== 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=IrerzI1hGhuSVvh6VejXGeVF90e/6hlG3RSnR64Yan8Sc7XBql6gUVgRLtSvJimpHK iI+MPpZ7BG+8/kA1twHd7VgGyNXHN0IMOxoDEMuT9jHFYN+p77K565xTofTHuSoKjOzK f7W+zHAlkO5d/uoHo1mkThkOGkhmxO4rb7xFKIlp52fnkCV/qrmMXjC5+pw9tWXpjL3R ndpQiKnQ4b6B7YM2SR325lYR6xcTjKT4qkkXyMqAHKa4VbTgbKA5uIjFbUY88I5gT+es OgXKmkNZ9A8idyIWfV8+OdYciV3nHxh1l6wCNi5upF0I5UB8FRm5muE811C6zBy8mhM6 +2Vw== X-Gm-Message-State: APf1xPCbeci3vGcPj9wDITpyx9a8HROiq++OCnB5pHicLeck+5hCgBWq PQpw7oggNK1TvaLQDxkqJwWgb9e4 X-Google-Smtp-Source: AH8x226t9z2gSXKLJdpMJJ5Uq35Zgppivope00lT47+03Brw7zENmuORs0tf3o2+AzBr7vgFvltw9Q== X-Received: by 10.28.202.6 with SMTP id a6mr1612222wmg.95.1518366099450; Sun, 11 Feb 2018 08:21:39 -0800 (PST) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id 1sm10935239wru.19.2018.02.11.08.21.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 08:21:38 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 11 Feb 2018 17:21:34 +0100 Message-Id: <20180211162136.15605-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH v2 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 Sun Feb 11 16:21:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 871777 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="VpZn7InV"; 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 3zfYwF7297z9t6N for ; Mon, 12 Feb 2018 03:21:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 63AE786EE8; Sun, 11 Feb 2018 16:21:47 +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 2ohJXJ26r6jY; Sun, 11 Feb 2018 16:21:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 24E198713D; Sun, 11 Feb 2018 16:21:46 +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 F23721C1FAF for ; Sun, 11 Feb 2018 16:21:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EDDF386EE8 for ; Sun, 11 Feb 2018 16:21:43 +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 tQ9BAHUrXy7t for ; Sun, 11 Feb 2018 16:21:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id AC4F88713D for ; Sun, 11 Feb 2018 16:21:42 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id f3so5722456wmc.1 for ; Sun, 11 Feb 2018 08:21:42 -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=t8fd+23KIuwfPYUozAGCsbsYZf86PysuPvaZuvgLVe0=; b=VpZn7InVcqWzvhKPfI63kHCybbQJqmcviW6666bNpYFA7djXE8YUxFSzAZJHCXGBbv SurdIWZjNuaeBEJfvZWlCTer6O6XzkYa9JsQkPD8iWjjchYvJ6m0f2ptR8wx06D8HJZ7 bVjPNxGbHq6r5rYfeRe+Inl9XrIzsO6q4qIm1bTveryw2oZhdbGks4X8bJ+XBCRiP6qm YfqBr+1nUSFT8I/ZaAzRgHsrZOu8d+UI1Zj1TfwdiP5HuwL57IIlnzkbRq0nHoJTIdI/ OYQpvE2ad0xcGa2CN2bVtcb2fKHHYCXVQtt4FSK6tpniN0NuCOODuYulvEQjR8dSlk+l iQgw== 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=t8fd+23KIuwfPYUozAGCsbsYZf86PysuPvaZuvgLVe0=; b=GRGyp6xKPkvdM7ZZNjvgfCmvHGEF2sMwy3n+NJGGk+EY+6gGi9dG9z0TJ7T1fTIvpi KWyDNJAg3w8r3a1YAVaYnKvpF0h45v/zVzOA1KzbMKWp2kSmR5XvvL+6fAZRMA5yMK7w CVg1TPsXwJPENXZG5hcMGdfpugNHmgzSQaDJMsAW0WgxEwOfHt2QCAVPNYs5tWzjo5W0 K8iEGkFTsiZu4gVs9Gb+fo1wZke9Wd7ZIOSViGxFiz37d6iNguTUiQRFI6kzx0YWHcEF fCY4ijQi/HpkX3skROOO2JrshqiWXN3Ef+Ph8I64yeibkkK6GQL8W2Kh+3IHi0Pv/SkX kd8A== X-Gm-Message-State: APf1xPBi41XTlzy1dgf67hrJSI6wX9MNF8qQU3JRVIYqM7D9fHWWpH0L 0+qoaKtfbFczNASLoe9dHfv4hw/z X-Google-Smtp-Source: AH8x227fHS/By5CkxGfdPqe1GPobYarkRZDUVLLnULOcxqh2Ak4i9ZT3J3++z376N6wR0DBzm5Sewg== X-Received: by 10.28.155.66 with SMTP id d63mr1379715wme.7.1518366100739; Sun, 11 Feb 2018 08:21:40 -0800 (PST) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id 1sm10935239wru.19.2018.02.11.08.21.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 08:21:39 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 11 Feb 2018 17:21:35 +0100 Message-Id: <20180211162136.15605-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180211162136.15605-1-romain.naour@gmail.com> References: <20180211162136.15605-1-romain.naour@gmail.com> Subject: [Buildroot] [PATCH v2 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 Tested-by: Valentin Korenblit --- v2: select xlib_libX11 if X11 (ThomasP) add OpenGL ES runtime dependency (ThomasP) --- 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 | 35 ++++++++++++++ package/waffle/waffle.hash | 3 ++ package/waffle/waffle.mk | 48 +++++++++++++++++++ 7 files changed, 182 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 293bd73797..0e19f6a94e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1519,6 +1519,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 19dda8aad9..0622ec49b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1167,6 +1167,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..ed30724214 --- /dev/null +++ b/package/waffle/Config.in @@ -0,0 +1,35 @@ +comment "waffle needs an OpenGL GL or EGL provider w/ an OpenGL ES provider" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBGLES + 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 + # OpenGL ES (1,2,3) libraries are loaded at runtime when needed + # in addition to LIBGL or LIBEGL. + depends on BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB 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 Sun Feb 11 16:21:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 871778 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.133; helo=hemlock.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="BWe0zlws"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zfYwM1yYfz9t5Q for ; Mon, 12 Feb 2018 03:21:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1C4068690F; Sun, 11 Feb 2018 16:21:51 +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 mdrswnobyn8l; Sun, 11 Feb 2018 16:21:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EA0F3868E7; Sun, 11 Feb 2018 16:21:47 +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 80A591C1FAF for ; Sun, 11 Feb 2018 16:21:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7B6E4294A5 for ; Sun, 11 Feb 2018 16:21:46 +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 F3XP9IgBJoXq for ; Sun, 11 Feb 2018 16:21:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by silver.osuosl.org (Postfix) with ESMTPS id E7DA526D8E for ; Sun, 11 Feb 2018 16:21:43 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id r71so5578426wmd.1 for ; Sun, 11 Feb 2018 08:21:43 -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=PaafBHdNwmTE2eQZyj94/aNbAVDCGo1XiWqskd4NZXI=; b=BWe0zlwsYRRDfHeqI8zzq2LPOJ7x67u0JH0vATV7VPKYyluH6XFpqN4xGaFC+pMjt5 F9NLANE7pYdGR6pisXF1LqK0oJyqDWvaCt4OukcU71KU4zMtALSHdNjCYCteAY2p/cJV GesTHqmnzkZRnKYUicAhXgwLcp6g0m/NK+LGKoQLzgVYY5M6zf23NbKO0AJpYAZZERDj cCelopOUB2owu60+i7RlBdPXFeGkEzHCuWDn/bi6VSJb/JLhPNSBQuP24sL6iq6X0zae skPhqG0l10cAotJHzPx3RL8wUCvgan1An3SelDZr1WIPPjPanUmIsQpW+VUAANi06+T3 NgUg== 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=PaafBHdNwmTE2eQZyj94/aNbAVDCGo1XiWqskd4NZXI=; b=dbnwPd1SIh87v4t0XNdDkhSQNovKWlG/nE1ttYNW/7hk3T/0y1Up6QP2jeSl7fd6Ud 1rDFYQC05KHVsT00xZmeXz4QWlFLXdymymvdjijTnnryoHs8jUN8ObC/ng21hwN260vM 3HCM5ZhoAOG530voVim7rOhJPwFmGcrowdGm0XQmtuQPI+qmULtv/ZSa1VtLNiKn3EhX 6uBIF9vYBwSTC6E7+xPjqtV+XRG4W+S12a7MnVtx1Whde67IZFVcBMQlhBufG2rGvKTO BltsjjXwi2vK14ZDR+sUb3HgrRGj7MP23rr75Wq5Z8oQ8ySs8FaE6L5u3WuyB6JTkhhG WsCg== X-Gm-Message-State: APf1xPCFhQmeMJpT+L0ECEUzK5cpEwgtsfhX8a4mSeO/VmSe3I0wuidl dZgRuy/B9SpOXk5mMYjXtLc4GvUA X-Google-Smtp-Source: AH8x227/vNSkJ5o3Og3FuNWVO03K0AQWfO6EYN+pI/6Ngn0akmlxOfhJ2Lery1C0Nf/a3FHTMtZPGw== X-Received: by 10.28.141.144 with SMTP id p138mr1704380wmd.58.1518366102061; Sun, 11 Feb 2018 08:21:42 -0800 (PST) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id 1sm10935239wru.19.2018.02.11.08.21.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 08:21:40 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 11 Feb 2018 17:21:36 +0100 Message-Id: <20180211162136.15605-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180211162136.15605-1-romain.naour@gmail.com> References: <20180211162136.15605-1-romain.naour@gmail.com> Subject: [Buildroot] [PATCH v2 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 Tested-by: Valentin Korenblit --- Bernd, I'm Cc you since you're probably interested by piglit to test new mesa3d version. v2: bump 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 0e19f6a94e..31831ef9ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1513,6 +1513,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 0622ec49b4..7e653301d6 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..cf5b46afae --- /dev/null +++ b/package/piglit/piglit.hash @@ -0,0 +1,6 @@ +# Locally calculated +sha256 7e9ba2d1282eab81bc9ac5dd6158190bc7015f063708926aa6bf6723f14f23d9 piglit-5153c0bd89ca78e4dd56cc0917930909fa085eb0.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..c33a8f9022 --- /dev/null +++ b/package/piglit/piglit.mk @@ -0,0 +1,69 @@ +################################################################################ +# +# piglit +# +################################################################################ + +PIGLIT_VERSION = 5153c0bd89ca78e4dd56cc0917930909fa085eb0 +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))