From patchwork Thu Jan 25 08:56:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59385 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6EA7F27BBEA; Thu, 25 Jan 2024 16:15:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C61CC27BBE2 for ; Thu, 25 Jan 2024 16:15:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT2NX-0005GG-KF; Thu, 25 Jan 2024 11:14:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rT2NV-0005Fm-8o for guix-patches@gnu.org; Thu, 25 Jan 2024 11:14:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2NV-0002U3-0T for guix-patches@gnu.org; Thu, 25 Jan 2024 11:14:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT2Na-0007Su-U9 for guix-patches@gnu.org; Thu, 25 Jan 2024 11:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68712] [PATCH 1/2] gnu: Add waffle. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68712 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68712@debbugs.gnu.org Received: via spool by 68712-submit@debbugs.gnu.org id=B68712.170619926528549 (code B ref 68712); Thu, 25 Jan 2024 16:15:02 +0000 Received: (at 68712) by debbugs.gnu.org; 25 Jan 2024 16:14:25 +0000 Received: from localhost ([127.0.0.1]:48956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT2Mz-0007QN-Cb for submit@debbugs.gnu.org; Thu, 25 Jan 2024 11:14:25 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:60525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT2Ms-0007Pl-Jo for 68712@debbugs.gnu.org; Thu, 25 Jan 2024 11:14:19 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a2f22bfb4e6so748332466b.0 for <68712@debbugs.gnu.org>; Thu, 25 Jan 2024 08:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706199246; x=1706804046; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZWNgE++VI2egFdGREQo/OYeTmBxagK4N1UZ9bwXNaRs=; b=Xv1xYYkEu2A27EtV5a5M8W0GHc8VXc8FI45vm+7RH2W/lIT53Mo9UfAOxXUEwdix/t g6nZcFkx1yA3d12scuZxSKjU4fv4duaxm1Q9pp/04vEHItWpSroJHdT6XAutoYhR+Iap q2T2c8f+apcTNUbOstsfD7vRsrovxmkzgAuPcJhrpdZxdLXSxi5Sff+Sugaj1gpKcylT 95JfXW0z0VnLIS6MnZ7rV3JYhjKaAaj7wgsr1EkPP4y4dCjc1WmUXp3jxZP+fQD3dHyi uKC6kIfbZhmVgHE95VsFcvwS3tx6WQ6WD2m6O8Z6FGawEmDEqCFI1S1fbfsuufsTJPQJ oFRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706199246; x=1706804046; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZWNgE++VI2egFdGREQo/OYeTmBxagK4N1UZ9bwXNaRs=; b=nur4g3gAIRqnL2TdLX7puQ8ujzv/zvzbXfxRkunAIN6X2LOG9vTuuSL9/bIEGLCeiK Kv1HzQ7TYa/dFu2wkgGaqqQjppBhvMOSzaZsUPkxYyDojknBexivcYixw2mbeKoppUyf jyvA3+XswavAA08kIY1kOdFr/mSr+51zMpLvR39qWkq+j4Ro2hZ46UQSo+ivzgP03fHF dx5YLREz6u8IAh3mGg6tS/x4sAigjWyHyvm6xdNcdZ1mdtMB7GiVhM5WXbQ9TECYfZ6u 7ZIoUdYLls0sgeKJzIpdPstnuBfp9uqAl03blDiMC0VXjhLFa35l2cEWOjooO5zPWECB g/nw== X-Gm-Message-State: AOJu0YyNv/FisAU3OplTH/rGabK0SEBbLewVLjJPmbcxtrUQYx8xrvAM UPOLptietaseEZ1pLeMpOaB0Ax6lNAdVQnGRO0UGi5OQNnaLD7W1ZlPDT3Bdnrc= X-Google-Smtp-Source: AGHT+IEOdkGIhqX05Pcud3eLZRp9SBkvhHjp9erix30GdQs1JZq+xEpZz4HCpRqB9ZxkrWvivLUjyA== X-Received: by 2002:a17:906:c792:b0:a2c:b5a1:f8 with SMTP id cw18-20020a170906c79200b00a2cb5a100f8mr1075075ejb.37.1706199246295; Thu, 25 Jan 2024 08:14:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tj3-20020a170907c24300b00a2fde3a8097sm479456ejc.74.2024.01.25.08.14.05 for <68712@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:14:06 -0800 (PST) Message-ID: <824a8a7f39e9d9ea5748b20eb8c9e7472a9bf1c2.1706174426.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 09:56:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (waffle): New variable. --- gnu/packages/gl.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 49dc878c02..35fb1e618c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ (define-module (gnu packages gl) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -1217,3 +1219,32 @@ (define-public glmark2 "glmark2 is an OpenGL 2.0 and OpenGL ES 2.0 benchmark based on the original glmark benchmark by Ben Smith.") (license license:gpl3+))) + +(define-public waffle + (package + (name "waffle") + (version "1.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/mesa/waffle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mrw0arlrpm83cwaz7rnimkkjv3a134rcmi1h512y2g4yjzhnm8r")) + (modules '((ice-9 ftw) + (guix build utils))) + (snippet #~(with-directory-excursion "third_party" + (let ((keep '("." ".." "meson.build" "threads"))) + (for-each (lambda (f) + (unless (member f keep) + (delete-file-recursively f))) + (scandir "."))))))) + (build-system meson-build-system) + (propagated-inputs (list mesa wayland)) + (native-inputs (list cmocka pkg-config)) + (home-page "https://waffle.freedesktop.org/") + (synopsis "Choose OpenGL API at runtime") + (description "Waffle is a library that allows one to defer selection of an + OpenGL API and a window system until runtime.") + (license license:bsd-2))) From patchwork Thu Jan 25 09:19:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59386 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F265627BBEA; Thu, 25 Jan 2024 16:15:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3960127BBE2 for ; Thu, 25 Jan 2024 16:15:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT2NW-0005Fy-LH; Thu, 25 Jan 2024 11:14:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rT2NU-0005Fc-PZ for guix-patches@gnu.org; Thu, 25 Jan 2024 11:14:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2NU-0002Ty-H7 for guix-patches@gnu.org; Thu, 25 Jan 2024 11:14:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT2Na-0007Sg-Cm for guix-patches@gnu.org; Thu, 25 Jan 2024 11:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68712] [PATCH 2/2] gnu: Add piglit. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68712 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68712@debbugs.gnu.org Received: via spool by 68712-submit@debbugs.gnu.org id=B68712.170619926128536 (code B ref 68712); Thu, 25 Jan 2024 16:15:02 +0000 Received: (at 68712) by debbugs.gnu.org; 25 Jan 2024 16:14:21 +0000 Received: from localhost ([127.0.0.1]:48954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT2Mu-0007QA-VG for submit@debbugs.gnu.org; Thu, 25 Jan 2024 11:14:21 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:46104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT2Ms-0007Pn-Le for 68712@debbugs.gnu.org; Thu, 25 Jan 2024 11:14:19 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a30f7c9574eso288919066b.0 for <68712@debbugs.gnu.org>; Thu, 25 Jan 2024 08:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706199247; x=1706804047; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=vybAa0YzCJWUm/NXOe7S3U9Hr3j2ZT+jorpxTj16vLc=; b=SyZe0+E9SQjJXFQp4bRWbgc3Df36h91CYSB0PSXRnow9Tf+ldbobh0en/NxDnWuBKQ Ux1HUDvImSgfJrqmZYY+MznXFYdxkiP5ESm9j+pVlFdH5aJQEHU9VfjKu1M0EgCJnl5E C45FZSl4bXV7P9QS7fj1ZFAQis/vh0/gfX/jb/GKRql/UtS3bPuSY0xdqO6+rbYxIL7a kduKhCgfD+9YvJ2p85qsL8ckGrK9FsZbbbK1e9KgPH75/O4rBUythhYL/bktLf29Gxi9 7ngdYYO6U8J2eA5kwamQqgBk8qxOMjISmCdpRUsXHmgYmQfD3OCMIy86xUHoD6Ae3LDb GY8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706199247; x=1706804047; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vybAa0YzCJWUm/NXOe7S3U9Hr3j2ZT+jorpxTj16vLc=; b=ilVZU6CSJO9a94z88YDfZM75aCt7ELJRSjnSJKKGcsxTpea1a9nG4rg90VluQEbyTM IkpEM08Sz1DMixGAfaIuNDxxDaT1RFBLoHWHcoCJUriPOAbyElzE07FBmS1IqoyswviT jVwo7Jo1ty6bRq1wgZstYVW1XUk6HBO1ERwU0FI3+AD18BRpTAk/p+fiflvc9SqRNo7I VQeBGKKvYRT6SVB38mPc0rgT2qzwtFa5RdA/rXtbIwY1PnwelZJX3r/gpqapzg/9cZK8 k4ALDrpQ4LvK7IYuMknqi7sJTqZQAf0SCV+MgVlNQqHggLsZCVEMw23uMa9p/0gVP8Mw MYuw== X-Gm-Message-State: AOJu0Yz9Xjoxm11CbT8j0WVDNgnuzMCohnB2i0QMj1fGfmfsRjkfflEi v6jK0cuO4ljLzNaMi/r9mD9yEgVeOXfCvFln1yq7GgxmOHkRx/8NyRcSwkXt6H8= X-Google-Smtp-Source: AGHT+IEL4WvhJEfy9ru+pt0nMwPxkUQxogvCv8DHhmprgS40FAgzMDtbWbGOyJRnhVBWmX89RgDz6w== X-Received: by 2002:a17:906:712:b0:a26:c9e6:d5e0 with SMTP id y18-20020a170906071200b00a26c9e6d5e0mr444244ejb.74.1706199246868; Thu, 25 Jan 2024 08:14:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tj3-20020a170907c24300b00a2fde3a8097sm479456ejc.74.2024.01.25.08.14.06 for <68712@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:14:06 -0800 (PST) Message-ID: <8ecf33f93cb6858219a8349837e3e22cabaa4f69.1706174426.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 10:19:29 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (piglit): New variable. --- gnu/packages/gl.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 35fb1e618c..f8dc8c1d9d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -1248,3 +1248,55 @@ (define-public waffle (description "Waffle is a library that allows one to defer selection of an OpenGL API and a window system until runtime.") (license license:bsd-2))) + +(define-public piglit + (let ((revision "1") + (commit "814046fe6942eac660ee4a6cc5fcc54011a49945")) + (package + (name "piglit") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/mesa/piglit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bzaalcxskckfnwprw77sbbmfqi59by2j8imaq8ghnlzhlxv7mk7")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DPIGLIT_SSE2=OFF") + ;; Tests are not invoked through cmake. Instead, there are + ;; pytest/tox-based tests for the framework, but they require + ;; unpackaged plugins. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "framework/" "\\.py$") + (("'wflinfo'") + (string-append "'" + (search-input-file inputs "/bin/wflinfo") + "'"))))) + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (wrap-script (string-append (assoc-ref outputs "out") + "/bin/piglit") + `("GUIX_PYTHONPATH" prefix + (,(getenv "GUIX_PYTHONPATH"))))))))) + (inputs (list guile-3.0 ; for wrap-script + libxkbcommon + python python-lxml python-mako python-numpy + glslang vulkan-headers vulkan-loader + waffle)) + (native-inputs (list pkg-config)) + (home-page "https://piglit.freedesktop.org/") + (synopsis "Test OpenGL implementations") + (description "Piglit is a collection of automated tests for OpenGL and +OpenCL implementations.") + ;; A mix of licenses for various tests + (license (list license:expat + license:bsd-3 + license:gpl2+ + license:gpl3+)))))