From patchwork Sat Mar 4 14:46:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10641 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 8D4E816D48; Sat, 4 Mar 2023 14:47:47 +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 9EE1116D1D for ; Sat, 4 Mar 2023 14:47:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTA9-0003bL-JR; Sat, 04 Mar 2023 09:47:05 -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 1pYTA7-0003aM-Q4 for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:03 -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 1pYTA7-0001if-IG for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYTA7-00028f-FZ for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 5/7] gnu: Add asahi-mesa. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 14:47: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.16779412178162 (code B ref 61959); Sat, 04 Mar 2023 14:47:03 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:46:57 +0000 Received: from localhost ([127.0.0.1]:35651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA0-00027U-K7 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:56 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:35638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYT9y-00026l-Dw for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:54 -0500 Received: by mail-wr1-f54.google.com with SMTP id q16so4837188wrw.2 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941214; 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=gvhFuErGOzz9CoJKjYL/bLBoNKrPWXopfl75QPrxg10=; b=bt+FeSka7ayJBwEnGOFT7KsbUvEl8Wyl8WUet2rBu18AFa5y35i7KK+4CCgU+/+UVH NKNVj3CMniZ8AW69JQzN/D3lggv6uwkDby4/yN1F0Iea4TiUS6S/Ht6HFSVlIpqaf6FZ DkoX/q2ACKc6Z0KYd6012MnnvgseID2lzvZAuiz2vwVsrpntbO3LG+vyUg9jjwvtN8a4 lIXSvpuodBVho5G5KZ2dqYsO+NUFIFC6kLjmafYmuhsxjXh8Iewt+YaS8YIOXH0ggv9G xVFKhNcm0aFEoOxm6wX/ukLRFKSLHokaL18Y4hhSSv5R00G2ivLG/E0OqNWB+6J7/Ikv xSuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941214; 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=gvhFuErGOzz9CoJKjYL/bLBoNKrPWXopfl75QPrxg10=; b=Zz7pLMhdt79ZUn9FgFVnYd/P8r3nfQ1A0o144mOdekNnqUUkX5wmdx13pyfNPEliNo Fmfpuh1KCb/kpeQum4vhzvmBXd9btGQguZE5Mqp51pF57ZO5Cf71ttv1/nsrUf0FfXic U9mSXzNIGjShOcEVwfxUL1ASRI2PbdILeAqCgeeDppu6xKqIZtOx7q5NNXoDIoYAfxTX I2A4kHYx1Bq7cvLwwCXfk9n8xwI2QzT7m1chH1azF6t29kDN+W8yAjkWCppl+43jUNzu /PdY9Wh0xBl3Z9Ki6j/uyKSgw2o4SMjyCPghFJ+l7lgU+mTwMjAwJcSalmFSHhce2k6y AJLw== X-Gm-Message-State: AO0yUKUg9DbU3Btj17Dh2KTBEcLsc90e6xH+LAQ8Dqhi0Gl7PH/EdjUz AnhYUfIhCysdm7NOtW4ySV6S09mHeBaCSJzP4yk= X-Google-Smtp-Source: AK7set/GRAXsXbh65M0QnT8Re8VdX6oKavVIRG/Lhu80a2+Oyms3iEbH9jm8lyjnkJEaJlotvc9JQw== X-Received: by 2002:adf:dcd2:0:b0:2c7:1aaa:c5d8 with SMTP id x18-20020adfdcd2000000b002c71aaac5d8mr3837601wrm.46.1677941213744; Sat, 04 Mar 2023 06:46:53 -0800 (PST) Received: from localhost.localdomain ([2a01:598:b1ad:1fff:8e8b:b210:246d:cd7a]) by smtp.gmail.com with ESMTPSA id w12-20020a5d608c000000b002c552c6c8c2sm5202444wrt.87.2023.03.04.06.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:53 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:38 +0100 Message-Id: <20230304144640.9913-5-roman@burningswell.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230304144640.9913-1-roman@burningswell.com> References: <20230304144640.9913-1-roman@burningswell.com> 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 | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ae96032cd..fd4ae587b9 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,56 @@ (define-public mesa-utils ;; glxdemo is public domain; others expat. (license (list license:expat license:public-domain)))) +(define-public asahi-mesa + (package + (inherit mesa) + (name "asahi-mesa") + (version "20221229") + (source + (origin + (method url-fetch) + (uri (string-append "https://gitlab.freedesktop.org/asahi/mesa/-/archive/" + "asahi-" version "/mesa-asahi-" version ".tar.gz")) + (sha256 + (base32 "1gg0msrx2d2mgif4jqljns8nqf29nazqpxcxmjaa50yf50n6n05p")))) + (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 + `(("libdrm" ,libdrm) + ("libglvnd" ,libglvnd) + ("llvm" ,llvm-15) + ("lm-sensors" ,lm-sensors "lib") + ("openssl" ,libressl) + ("valgrind" ,valgrind) + ("wayland-protocols" ,wayland-protocols-next) + ,@(fold alist-delete (package-inputs mesa) + '("llvm" "wayland-protocols")))))) (define-public glew (package (name "glew")