From patchwork Wed Mar 8 12:13:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47789 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 1673216E3C; Wed, 8 Mar 2023 12:16:13 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 50CAE16E31 for ; Wed, 8 Mar 2023 12:16:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshQ-00062C-QY; Wed, 08 Mar 2023 07:15:16 -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 1pZshD-0005sf-N4 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZshD-0008Pd-E9 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZshD-0007tv-9w for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 4/7] gnu: Add asahi-mesa. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61959 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61959@debbugs.gnu.org Cc: Roman Scherer Received: via spool by 61959-submit@debbugs.gnu.org id=B61959.167827765130235 (code B ref 61959); Wed, 08 Mar 2023 12:15:03 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:11 +0000 Received: from localhost ([127.0.0.1]:47983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgN-0007rU-5J for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:11 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:37446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgJ-0007qB-Kk for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:08 -0500 Received: by mail-ed1-f52.google.com with SMTP id j11so45345738edq.4 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277641; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=580/1/y21BwfjQuNb+tuERXNLbAUdvnBga2kzt1MGQ4=; b=anfUM0Iy+c0HJOPPHwtIxR0g+sDqAa7Stff6WMzDRMvUgjA1wcWH69MJyGd/V185AJ 06Q/i5+/laqkwCJi3GcDxNaGwWAewShoql+omjNb2STc3I6MT+icyfjjvNyvKEy6m8BW chSjAAcn7EGwW0ZY8nBEBMJe0TLlfz2nPLUKeA5p8Ky3as+0/BOuVKSDg9Mz/VyqX1Kj qXZ1QdReU9zNHM/gBoAAtMJrhm/w5ifi5aYqPuNpZkulMYB1vkFk5QXe/HuvU5eUPASs sVnMfNpjhMfdlRQoW9PzDEieD7AoTy5K8bG1oPPqG5gOvcULNIfRAXlFFDgRPyCKKrNr 8TSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277641; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=580/1/y21BwfjQuNb+tuERXNLbAUdvnBga2kzt1MGQ4=; b=CoZO1cmaTAr6h2ESrK98fk9m1QUh+lW1u0Jw7YVqZocmcSZjlzoMN8bYBQba/+DQOz BAgMwoMiPyO+2eW4OCgfZFxyq97O3e7DDF/skMj1bl9WiyYjuNxBGkv2fCnq+rMQX+YV HTw6MK2WTvW+QOEItsCYMWTX8TLd54YB8+thUcfhCdIUmX5F1n/c4Liimq+s8fwI/2rW OY+J9zPAX+pwu/B6ppOJODFUOzStQjS4pWpsEcMSbGhDvolz+ZbKG6v96Z+ijedhvZP9 Y42LRY5DS2Zk+rYW+NqEMDnKwTHX5qQS6TqlMWyelvv1TxUoKQd4zhz74IZVlKgjPa53 XUKA== X-Gm-Message-State: AO0yUKXWQu7gvKBbPnFZKe3hI7p1rlKf0cj2MX4R5lG35EJfkwlvpFv4 JnVi4AzVe+63pRsSe7SDSSm03O6UpORlQW6utAY= X-Google-Smtp-Source: AK7set+J8uhd2vtL4b+OM6B2wo3RlnKd5//XQ9xQLAdn8DOiO9ca+7tR9FzSJ4D/HyU7FtlrMloWog== X-Received: by 2002:aa7:cf10:0:b0:4af:70cf:b37e with SMTP id a16-20020aa7cf10000000b004af70cfb37emr16047344edy.10.1678277641673; Wed, 08 Mar 2023 04:14:01 -0800 (PST) Received: from localhost.localdomain ([2a01:598:b1a6:a6ef:9056:798a:7775:63bc]) by smtp.gmail.com with ESMTPSA id q2-20020a50cc82000000b004acbda55f6bsm8024473edi.27.2023.03.08.04.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:14:01 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:47 +0100 Message-Id: <25385bc6a85a4dc596bd07fde437666cbf81f75d.1678277362.git.roman@burningswell.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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 (asahi-mesa): New variable. --- gnu/packages/gl.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ae96032cd..3b3985df71 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -52,6 +52,7 @@ (define-module (gnu packages gl) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls) + #:use-module (gnu packages valgrind) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) @@ -612,6 +613,54 @@ (define-public mesa-utils ;; glxdemo is public domain; others expat. (license (list license:expat license:public-domain)))) +(define-public asahi-mesa + (let ((commit "0a12b60a6b4363315ca3789e7e289240704a26da")) + (package/inherit mesa + (name "asahi-mesa") + (version (git-version "20221229" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/asahi/mesa") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yjn55qy4890gi1s3dhzdhqqxrms4fzcibqr84a3vcc53ggiywmb")))) + (arguments + (substitute-keyword-arguments (package-arguments mesa) + ((#:configure-flags flags) + `(list "-Db_ndebug=true" + "-Db_lto=false" + "-Ddri3=enabled" + "-Degl=enabled" + "-Dgallium-drivers=swrast,virgl,kmsro,asahi" + "-Dgallium-extra-hud=true" + "-Dgallium-opencl=disabled" + "-Dgallium-rusticl=false" + "-Dgallium-va=disabled" + "-Dgallium-vdpau=disabled" + "-Dgallium-xa=disabled" + "-Dgbm=enabled" + "-Dgles1=disabled" + "-Dgles2=enabled" + "-Dglx=dri" + "-Dlibunwind=disabled" + "-Dllvm=enabled" + "-Dlmsensors=enabled" + "-Dmicrosoft-clc=disabled" + "-Dosmesa=true" + "-Dplatforms=x11,wayland" + "-Dshared-glapi=enabled" + "-Dvalgrind=enabled" + "-Dvulkan-drivers=swrast" + "-Dvulkan-layers=")))) + (inputs + (modify-inputs (package-inputs mesa) + (prepend `(,lm-sensors "lib") libglvnd libressl valgrind) + (replace "llvm" llvm-15) + (replace "wayland-protocols" wayland-protocols-next)))))) + (define-public glew (package (name "glew")