From patchwork Sat Mar 4 14:46:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10642 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 2E87516D48; Sat, 4 Mar 2023 14:47:49 +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 D402016D1D for ; Sat, 4 Mar 2023 14:47:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTA9-0003b0-9l; 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-0003Zk-AM 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 1pYTA6-0001hB-LP for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYTA6-00028I-JE for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 1/7] gnu: Add m1n1. References: <20230304144415.9644-1-roman@burningswell.com> In-Reply-To: <20230304144415.9644-1-roman@burningswell.com> Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 14:47:02 +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: r0man Received: via spool by 61959-submit@debbugs.gnu.org id=B61959.16779412138128 (code B ref 61959); Sat, 04 Mar 2023 14:47:02 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:46:53 +0000 Received: from localhost ([127.0.0.1]:35644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYT9w-000272-KO for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:52 -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 1pYT9v-00026l-Im for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:52 -0500 Received: by mail-wr1-f54.google.com with SMTP id q16so4837020wrw.2 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:46:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941205; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Qeo6OY0MPgVJrlpTwZ5L5YDR3iX3qMU1F45KsZIUC1g=; b=RjpQGAM2wYxU86DactU3hiff4N6UegLv65BTAyqSbCfAc8srhNzhxWQfZQ26+aZWBz TmCoIJs3S2iZRzkjU3m7o/izzrOi63R7/glpOGo2EEGVDjwePIEKnkZx69IGIQcOHdk4 tZN9fOR+YAHe2WYwmvFisBhzwYJF8aLzrnz9tnKI/J+3v/kmtQfyUZFtYsvP2DLAyxDy dpZUJgWIbVy3ZcDK8L4KiDzlfrcSu/5Edmu7b0NWS9T2k3TGiWc24dymljvk9C31mvzU ZFQw1yFeHPojFk4zxbvrgjBcrZVmoP8D2aCO3Pnqdsaf1Poi4DmMgaMo57sRyGFjng5Y pcXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941205; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Qeo6OY0MPgVJrlpTwZ5L5YDR3iX3qMU1F45KsZIUC1g=; b=plaxvWqujVjVPR/eFFOxKwuXbq4tyWxH+rs62MTL3NadVcy/H/LWXF6Arg8p1MwEmx H302fZI0SrI6cvTAu59TXqkevgGBuT8DGv9z/yV4oUABHW+iMsuVlZJQUlNgbiY8yDxs 9cQEp7R3gB0Zx6C2GauSv4L8jvvBYXJWh2gNBtiSphY0RNLpQklUsHIy4XX6UMBIETpV zW2NERbX9MiQDBMT+rcjyU6eEC7zqJ4UY9GiI87hdD0YzNbaut4JWRtMdDH1D1aInwfv 9OJIDtfnGDDqY/mY0k2aAosWzZYIQiU5tgVcYrAriPD0RVFZGu9AVsUW6cGUdtT75p3P /EyQ== X-Gm-Message-State: AO0yUKWo/jbH827P7CMdUHRA/BeYYwxfuuUw/mkwQnJVd2rEVeHRNytW MGMuP3wLfDX7bVEXbaqONkSPhLIb4kLIKgVtmRE= X-Google-Smtp-Source: AK7set+XPraq97ZN8NDneNu2pzo4SG6H15rhMDT4ktkSW8aWNYk3ZtnjA9sTP4hA0/+EOCX0GFkY9g== X-Received: by 2002:a5d:408f:0:b0:2ca:ad16:de8 with SMTP id o15-20020a5d408f000000b002caad160de8mr2783450wrp.71.1677941205231; Sat, 04 Mar 2023 06:46:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:45 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:34 +0100 Message-Id: <20230304144640.9913-1-roman@burningswell.com> X-Mailer: git-send-email 2.39.1 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 From: r0man * gnu/packages/bootloaders.scm (m1n1): New variable. --- gnu/packages/bootloaders.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ee47a9fad7..d02161ab1f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -623,6 +623,38 @@ (define-public dtc tree binary files. These are board description files used by Linux and BSD.") (license license:gpl2+))) +(define-public m1n1 + (package + (name "m1n1") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/AsahiLinux/m1n1/archive/v" + version ".tar.gz")) + (sha256 + (base32 "1pymb7ip77z8md1pxqm3micq2yns1v6b97mayaa2q1s8sinv00jg")))) + (build-system gnu-build-system) + (supported-systems (list "aarch64-linux")) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "RELEASE" "1"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") "/libexec/"))) + (mkdir-p dir) + (copy-file "build/m1n1.bin" (string-append dir "m1n1.bin"))))) + ;; There are no tests + (delete 'check)))) + (home-page "https://github.com/AsahiLinux/m1n1") + (synopsis "Boot loader and experimentation playground for Apple Silicon") + (description "m1n1 is the bootloader developed by the Asahi Linux project to bridge +the Apple (XNU) boot ecosystem to the Linux boot ecosystem.") + (license license:expat))) + (define %u-boot-rockchip-inno-usb-patch ;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled. ;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4 From patchwork Sat Mar 4 14:46:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10644 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 BF87216D4A; Sat, 4 Mar 2023 14:47:53 +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 autolearn=unavailable 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 0AF1216D48 for ; Sat, 4 Mar 2023 14:47:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTA9-0003b1-9x; 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-0003aH-Jn 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-0001ia-BL 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-00028Q-2F for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 2/7] gnu: Add u-boot-apple-m1. 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: r0man Received: via spool by 61959-submit@debbugs.gnu.org id=B61959.16779412168156 (code B ref 61959); Sat, 04 Mar 2023 14:47:03 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:46:56 +0000 Received: from localhost ([127.0.0.1]:35649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA0-00027M-0v for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:56 -0500 Received: from mail-wr1-f44.google.com ([209.85.221.44]:42927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYT9x-00026p-3N for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:53 -0500 Received: by mail-wr1-f44.google.com with SMTP id j2so4804534wrh.9 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:46:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941207; 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=Fy22jyumgaGIHjCRN1Q8te0OfhJbOyzCGpP6mnizXCA=; b=zet8nn97n/esqbOFrgUgAIYbJBptbuRYXhYyBsHzYSvWs9Q7qapSvvXcDobegu9H4s kxmGsix7s0KvJTTc01sVABtseRnvUC0TYNE1HuGA0tZMNdx47ZrPD/6YKlB2RXZfFRfb RYXUQvqdWWKyrjEtBbasO/1BiEQvCGjL4+IXecBU3UZN5bTjAgObV94Wl3jyVUb2+VBi n0bveE3dyAttToQWbevt6l9O1mBZE6vq8UnbSipUXjypnGq0DZYBxuDSQbOSSj4V0/MT uC1S6C69IgX2BBQfu4mkzpn4ONyyDCNrMD8b8Qr0LfojKX6h1j2cqSgBQO4ihCDrSXIG EoMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941207; 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=Fy22jyumgaGIHjCRN1Q8te0OfhJbOyzCGpP6mnizXCA=; b=N1o8Ttp9milMf9j1PpJDzW1eYYkt1A6o7aSk5QZXhfn+EJC7MwWSr0ulro2p++Tebh FZuSY8XdsIq1hc+TgVqcWFeKs8+rht8D5LnXOdMN70vHIdWpkcsskioXCksFwvaOzi5A Qdi1HYFpWWuO53PQHXiNuAq6Ex83jXG976NYZKX/uJYhfO/HXIVH24UOk0/JsWLAXPUS /NFxzu8y1jVfA9XYQQPLGW5REQ7q+w6ABZpauq/9/cZ/tvogmebH39vLSB08iLoDtmnt fP+YFug/hak0R4qd6Qs9Nf9E+wahSqfk5fm43owLur80/7Vw1tVLsEQWrwu0ta1LNnMY Wz0g== X-Gm-Message-State: AO0yUKXR4odTkyqHn/rKxCBPRG/8i5mia94NfXP2s7kQr070KUHP73eU TydrxMyxWkD46PM2fY/7W0NsHsnxlgsp3wA+hu4= X-Google-Smtp-Source: AK7set+OC7F9lPbpt8tZKKyiIK2vr/huDEUYxev0ljrCOpUwO/LWMqh81qbNCh0gZlrW6f4JAstHgw== X-Received: by 2002:adf:e0c7:0:b0:2c8:37a:59c2 with SMTP id m7-20020adfe0c7000000b002c8037a59c2mr3314625wri.63.1677941207100; Sat, 04 Mar 2023 06:46:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:46 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:35 +0100 Message-Id: <20230304144640.9913-2-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 From: r0man * gnu/packages/bootloaders.scm (u-boot-apple-m1): New variable. --- gnu/packages/bootloaders.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index d02161ab1f..bb2f5639bc 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1028,6 +1028,28 @@ (define-public u-boot-am335x-boneblack (define-public u-boot-am335x-evm (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf")) +(define-public u-boot-apple-m1 + (let ((base (make-u-boot-package "apple_m1" "aarch64-linux-gnu"))) + (package + (inherit base) + (version "2022.10-1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/AsahiLinux/u-boot/archive/asahi-v" + version ".tar.gz")) + (sha256 + (base32 "02x90h89p1kv3d29mdhq22a88m68w4m1cwb45gj0rr85i2z8mqjq")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (delete 'disable-tools-libcrypto))))) + (native-inputs + `(("openssl" ,libressl) + ,@(package-native-inputs base)))))) + (define*-public (make-u-boot-sunxi64-package board triplet #:key defconfig configs) (let ((base (make-u-boot-package From patchwork Sat Mar 4 14:46:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10643 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 211A516D4E; Sat, 4 Mar 2023 14:47:52 +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 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 700B016D1D for ; Sat, 4 Mar 2023 14:47:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTAA-0003c7-JF; Sat, 04 Mar 2023 09:47:06 -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 1pYTA8-0003aY-5S for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47: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 1pYTA7-0001ip-Tl 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-00028m-S0 for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 3/7] gnu: Add asahi-fwextract. 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.16779412198177 (code B ref 61959); Sat, 04 Mar 2023 14:47:03 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:46:59 +0000 Received: from localhost ([127.0.0.1]:35654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA3-00027p-0V for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:59 -0500 Received: from mail-wr1-f47.google.com ([209.85.221.47]:39672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYT9z-00026s-L2 for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:56 -0500 Received: by mail-wr1-f47.google.com with SMTP id g3so4821927wri.6 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:46:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941210; 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=Wiiv1QhaTzVFgcehQ4tmzhFWR2lBL5/RDYWUuEcFN7s=; b=b71qj4PLb+nUkeLZ+lIr3tYbypKACRI0pWCwqOoAB5kbFH+O8//n2YHQnm/kLVVN2l b5LG08GVxxE7tUFgy6wjpcEiOeCySUcxhBucKnr+u6+XaCmWYKS7zxK0oe8rO5zT09XQ 4Lc/flXvHfvC42mq5rPD3Scr+A+37bVqWI8nR0CTABW/bRSiHRWCHH/fYZQbARwNcXz2 lzJzhSxNc+JuNiNYMFSbXcOcPPGaRU20e+/0lGhppaX+PqlEbg+gYhJbR6i5/HQ3x7Vu sst4FJP3mENK2dHmHANM/AkI3wfhYXOfgMmsiNlI7XfaeQtJ5x27QXSz8qPNV7QoUEvt R1/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941210; 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=Wiiv1QhaTzVFgcehQ4tmzhFWR2lBL5/RDYWUuEcFN7s=; b=iRZtqMjeFrdC5RfBUot5rjVgCq1bJjMRlUhUnKeCKToCx5wFDIREXmLSWBpM6Wo71/ Sf3GdMNPh63z4OiP5O4VpSoPASXEYtXMUsCAccI6jLyXbkApEXaixZQBhEPjZpRxn/a7 +0dfr5VmRzibFOaVO0UXVIEmxKOxiCL3x1BOtBBPPvq1KXVU2R2Lfe7ree80KOJUHF5d Oyceb9F8foD42hxgzrza5jxIjNBKGhyPPgp7LX1cogOsUn0BRJ6lVYdcwgAuUvO0GZrz cMsbWX6kcUwpX1Oqv8tR8Lhd804NrQPQ7HM5MM1n7ZVziCawDVO+ptfsN9KnOz6bIDNu xYnQ== X-Gm-Message-State: AO0yUKXePgFitVRE00j1qPQecwMt7VvVeghJIm/eVt7O9q0GqVzX4Wu0 BLOAFO+ALj5K2SAjdUMOO4s3d7s9LG49FrrD5OQ= X-Google-Smtp-Source: AK7set/Cd8/YuF7YyQrJn4HOA2Lp3ZAAj19GXbRixyYxSk6sPAZMkHhdo9gXMbJNpuFUrbgq/aSTgQ== X-Received: by 2002:a5d:4347:0:b0:2c9:1a3f:d5f8 with SMTP id u7-20020a5d4347000000b002c91a3fd5f8mr3142721wrr.41.1677941209686; Sat, 04 Mar 2023 06:46:49 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:49 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:36 +0100 Message-Id: <20230304144640.9913-3-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/firmware.scm (asahi-fwextract): New variable. --- gnu/packages/firmware.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index a876aa727a..3e3cfe96a9 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -34,6 +34,7 @@ (define-module (gnu packages firmware) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -77,6 +78,40 @@ (define-module (gnu packages firmware) #:use-module (gnu packages xml) #:use-module (ice-9 match)) +(define-public asahi-fwextract + (package + (name "asahi-fwextract") + (version "0.5.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AsahiLinux/asahi-installer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kj9ycy3f34fzm9bnirlcw9zm2sgipwrqzphdg5k099rbjbc7zmj")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-vendor + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively "vendor"))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/asahi-fwextract") + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "lzfse") "/lib")))))))))) + (inputs (list lzfse)) + (home-page "https://github.com/AsahiLinux/asahi-installer") + (synopsis "Asahi Linux firmware extractor") + (description "The Asahi Linux firmware extractor transform the firmware archive +provided by the Asahi Linux installer into a manifest and CPIO and TAR +archives that are compatible with the Linux kernel.") + (license license:expat))) + (define-public ath9k-htc-firmware (package (name "ath9k-htc-firmware") From patchwork Sat Mar 4 14:46:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10645 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 E571E16D48; Sat, 4 Mar 2023 14:47:56 +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 autolearn=unavailable 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 B4D7316D1D for ; Sat, 4 Mar 2023 14:47:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTAA-0003cB-RT; Sat, 04 Mar 2023 09:47:06 -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 1pYTA8-0003ak-Ll for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47: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 1pYTA8-0001iv-Dh for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYTA8-00028y-Bm for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 4/7] gnu: libdrm: Update to 2.4.114. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 14:47:04 +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.16779412198184 (code B ref 61959); Sat, 04 Mar 2023 14:47:04 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:46:59 +0000 Received: from localhost ([127.0.0.1]:35656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA3-00027v-D7 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:59 -0500 Received: from mail-wr1-f47.google.com ([209.85.221.47]:45604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA1-000271-NP for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:46:58 -0500 Received: by mail-wr1-f47.google.com with SMTP id l1so4787252wry.12 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941212; 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=plDTHfcPgOypw65yi6Ce2nDGZ7ZqgdjyqxlORA6GLiA=; b=yMP5PiW3H4slvXOw5dQW9lo7epQgkoEJ8i9g21QmEreVYD3h8fUefImfBscrcWQdoY hMeNYTvDhbsCrCEYgb6kTuIkpk0HekMuB5AXWYV+z9D7KK0X7lMEH4lRH8SBzxARq9bp HSv+ooh6g1193ebGgtOQmNIJkHK5qldLmWsusqRcGDGnzxFeHhglkGPa0I4ywd41Apee plueGPVsJ48hJ/sGYgIdQfPXbuJBO9We1D6dGroHK97UoDD8dLiBEKaVTtbGXPv24lzJ 9XSsYngJJv8wBpihdmaoFx9MkintzpssPq7RakC+JmBSaO9fUOErerRHLmuSK5vEFj5w Lk9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941212; 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=plDTHfcPgOypw65yi6Ce2nDGZ7ZqgdjyqxlORA6GLiA=; b=N4L49YPkZRat500M/xtDRyKVIB2kljg1Lj2I4KDLz3By+3dy8KiTaNuGbobpObNqWh 19I92Zg+iL71CM4laCu45DmuXT7ux2j1gm8mOxsTx4pluuiieMiJ1yfrMkOB/ugX1k+a /dYIe+erMTf1PPkZ9YH6uX8KgkQU17nnJ4Tw9tSIQ3LXEjZdY1n7I41XU7tZO4e2dTXf 6bWxwiPGFtefT9QLoWoqU92MwlpQ/3LmAYOcP9p9J26xex2Plxb8W1dN2R5bIxMt+bAB LZgyO6S6n7oAdElBtG5d7G82kosT34EsVUjK+a+cwxDbQXRYjdGOfwHXvVBHw/BPzZma lawg== X-Gm-Message-State: AO0yUKUnr+WhN9pcj91us6RPpcBuQAqTqrJb1vpsPKFFVbx4KDz4Fqyz bnTcOe7a+AQnlMOhgCuONimXpHsaWuwfUW7WrGM= X-Google-Smtp-Source: AK7set+r13avy+u8QRiw5WZCufbJ7pmj33dvonlobjo23/SNUYT7thq8oKp/IenGNsClXAUfDmGhug== X-Received: by 2002:a5d:638d:0:b0:2c7:f56:28e1 with SMTP id p13-20020a5d638d000000b002c70f5628e1mr3776823wru.0.1677941211836; Sat, 04 Mar 2023 06:46:51 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:51 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:37 +0100 Message-Id: <20230304144640.9913-4-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/xdisorg.scm (libdrm): Update to 2.4.114. --- gnu/packages/xdisorg.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ec5cdbdc28..77c88c9987 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -709,7 +709,7 @@ (define-public pixman (define-public libdrm (package (name "libdrm") - (version "2.4.107") + (version "2.4.114") (source (origin (method url-fetch) (uri (string-append @@ -717,16 +717,16 @@ (define-public libdrm version ".tar.xz")) (sha256 (base32 - "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65")))) + "09nhk3jx3qzggl5vyii3yh4zm0npjqsbxhzvxrg2xla77a2cyj9h")))) (build-system meson-build-system) (arguments `(#:configure-flags '(,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") - '("-Dexynos=true" - "-Domap=true" - "-Detnaviv=true" - "-Dtegra=true" + '("-Dexynos=enabled" + "-Domap=enabled" + "-Detnaviv=enabled" + "-Dtegra=enabled" "-Dfreedreno-kgsl=true")) (_ '()))) 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") From patchwork Sat Mar 4 14:46:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10640 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 0B97216D4C; 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=unavailable 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 ABA4216D48 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 1pYTAA-0003bw-6r; Sat, 04 Mar 2023 09:47:06 -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 1pYTA9-0003ar-0y for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:05 -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 1pYTA8-0001j1-PZ for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYTA8-000296-NA for guix-patches@gnu.org; Sat, 04 Mar 2023 09:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 6/7] gnu: Add asahi-mesa-headers. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 14:47:04 +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.16779412238215 (code B ref 61959); Sat, 04 Mar 2023 14:47:04 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:47:03 +0000 Received: from localhost ([127.0.0.1]:35659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA6-00028O-Ld for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:47:03 -0500 Received: from mail-wr1-f51.google.com ([209.85.221.51]:41793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA5-00027S-E1 for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:47:01 -0500 Received: by mail-wr1-f51.google.com with SMTP id f11so4810594wrv.8 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941215; 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=bYsM1jTUnawPBswf6lDB+sWiGRhuJXfmZVwdXXI07X8=; b=DX+7zlALTPcAVShLIwQZXb9QNBJixNgXv5gTsgQN6tKDKKDZBtn5GGH1a3KqxrIy8q FI/XMdivh3tY92BfUkjvOe6lEbPee3As08VrR71L2TK2fpdK/LmIiyF2qmDZBwT/Q1O0 EwRanw+rMiDqPo680PoIM1jXOp2fcIXXMSMKWobOO5gN6r68AylTLgjE/QrlBfDa0psM W6VBYGlyVW/PvRh05F3KmsC4S7khXCls+YXI4oeQPvdt71dwHPk6xGlQdPLa8aSGvY0N 1xPDfr0J8TUO0TqcylWd9gkU9ZoAb3tXPU4hKmZrE3QWtR1scfM2zVFZ8Fs7Sgt7EHDr T1KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941215; 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=bYsM1jTUnawPBswf6lDB+sWiGRhuJXfmZVwdXXI07X8=; b=Kc1u5XPLHHkhkqDR0wVO0OEQ6TJgNYqRUkfDKf8z6Lh4dih3BoYw6+dIOEm0oR9xSN lDjSSsMLCn8Lbv1T11NLsqhpCFzV92Y8M/e1pRws/b9rZ7FavwZdX5ZGvu+nMjE+E3Cf E1nMPZRc4bWOZ2GUDnA3mdy6zjrQRRPyrV/Uw+XUedjvWgshuS2cU/MIQWMsCGKN9buH fmLjejGQxA2LhnSYTmflgSncobRK2xEblTnVHfKuk4d/2PBZpw3zx28WNUywP9Ptg2yz 3tvAvBbgz8Go9izIie3S9PlSRGcHMbLZ+DU6irpa09fjY7PksMonkAvUn9miTNCgJALH Vz/A== X-Gm-Message-State: AO0yUKUEOOG8Ziqk38uwdL7wxjfrptZ5VEy7kTMJtrnmNx+q+S3jk02z TNyg2v/h6qBXnJVXITZKzew6Iv/tLANnQ+ODgBU= X-Google-Smtp-Source: AK7set/ZCnzNZkUQcZ3Prh4Z6DevOLJYJAV0RchSlwpq/BLjl1ekWrDF8MQNonjazsPPkOzar6gmGQ== X-Received: by 2002:adf:f28c:0:b0:2c5:7de8:212b with SMTP id k12-20020adff28c000000b002c57de8212bmr3288725wro.45.1677941215626; Sat, 04 Mar 2023 06:46:55 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:55 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:39 +0100 Message-Id: <20230304144640.9913-6-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-headers): New variable. --- gnu/packages/gl.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fd4ae587b9..6a9dc41832 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -663,6 +663,19 @@ (define-public asahi-mesa ("wayland-protocols" ,wayland-protocols-next) ,@(fold alist-delete (package-inputs mesa) '("llvm" "wayland-protocols")))))) + +(define-public asahi-mesa-headers + (package/inherit mesa-headers + (name "asahi-mesa-headers") + (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")))))) + (define-public glew (package (name "glew") From patchwork Sat Mar 4 14:46:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 10646 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 3613C16D48; Sat, 4 Mar 2023 14:48:24 +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=unavailable 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 35DB516D1D for ; Sat, 4 Mar 2023 14:48:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTBC-0004BL-D9; Sat, 04 Mar 2023 09:48:11 -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 1pYTB5-00049y-2H for guix-patches@gnu.org; Sat, 04 Mar 2023 09:48: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 1pYTB4-0001xE-8x for guix-patches@gnu.org; Sat, 04 Mar 2023 09:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYTB4-0002Cn-7I for guix-patches@gnu.org; Sat, 04 Mar 2023 09:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH 7/7] gnu: Add asahi-mesa-utils. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 14:48:02 +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.16779412258273 (code B ref 61959); Sat, 04 Mar 2023 14:48:02 +0000 Received: (at 61959) by debbugs.gnu.org; 4 Mar 2023 14:47:05 +0000 Received: from localhost ([127.0.0.1]:35668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA9-00029I-42 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 09:47:05 -0500 Received: from mail-wm1-f43.google.com ([209.85.128.43]:51944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYTA7-00027j-Bd for 61959@debbugs.gnu.org; Sat, 04 Mar 2023 09:47:03 -0500 Received: by mail-wm1-f43.google.com with SMTP id az36so3194677wmb.1 for <61959@debbugs.gnu.org>; Sat, 04 Mar 2023 06:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1677941217; 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=kRJH1cCywc7cNK8F0dCYhWA92BAtG5rP3fUDA5Hesds=; b=1qC4u5xJaL8xAFlj5rYq7N1xfW89GzJx2wIv/rwUxpcc6o9aOj3bM4/1h0cE9qK28b kYm/R1pFSJDMk3hg3RBwmxqRVbYDByDMNo2CBDCnaPKJ/zLdu3nGQd5+/3gb11tvo28y lb78/eN38IPBub5xByd1v5CU0n1r8AF4ANscGVdptkNx3mZ2TJGwAzeccwt4sI1fcoXo bH3Hkuwfx0XhhCPe2jPmhVV8GVWOjerkOXkeS3U/3AgwzLsW1Qv9to495tmyUrQB2xkw zRAZttcjCao+L6FG1AHVJnNX0fX837UTEzIk4tSm/jl7obLP7FRAHjt0Ndo0J28Wftom ghjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677941217; 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=kRJH1cCywc7cNK8F0dCYhWA92BAtG5rP3fUDA5Hesds=; b=HQCObwyorhOV/JX4k7+AJf9QwblZh/Q5iZTeowOXUAO/x5uJXLVmqE8VxUqzYOPieQ YlKRHqkwJg499FZA6hXzvCLKDNKo8fq7lOvmXQXGspaWScK7Oa+Am9X+VnNtHDQDLjhO O6T3SxbEnJZfH6cBUSNiaivWcArIOmde2RHsUSFgzZQ3j1d0MpTYkV9UWd3uzj/HsXr5 HzhEGjuLmrN6NIej/mQWKFthqcmWoMhhCJYKaU4KypbfdsbaymGFIFWH844/Ibj4K8qO YXBlLhNaQdEee6/fB3j2ZOkYUc+ElKUUvS8r1MthT7vQO1pKahiUvNJLyTqgovE6SqHo 6MSA== X-Gm-Message-State: AO0yUKXEVAT37Y+h0UkcsyHLX0vSyczf5vw0QlLppOezevUJxP3i72YD aA5HIZOHhfg143UTxeCtyHEq9fU9CxEidd2WdQc= X-Google-Smtp-Source: AK7set+7QrCH8NkSrxsF9sdHDU+I7L5hBix7rbxohrR4gI0J6E8FDG1gEXOwmauEz1lYB6B1H1QSVg== X-Received: by 2002:a05:600c:4509:b0:3eb:29fe:7343 with SMTP id t9-20020a05600c450900b003eb29fe7343mr4407572wmo.33.1677941217318; Sat, 04 Mar 2023 06:46:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 06:46:57 -0800 (PST) From: Roman Scherer Date: Sat, 4 Mar 2023 15:46:40 +0100 Message-Id: <20230304144640.9913-7-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-utils): New variable. --- gnu/packages/gl.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6a9dc41832..e2cc11a711 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -676,6 +676,21 @@ (define-public asahi-mesa-headers (sha256 (base32 "1gg0msrx2d2mgif4jqljns8nqf29nazqpxcxmjaa50yf50n6n05p")))))) +(define-public asahi-mesa-utils + (package/inherit mesa-utils + (name "asahi-mesa-utils") + (version "8.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://archive.mesa3d.org/demos/" version + "/mesa-demos-" version ".tar.bz2")) + (sha256 (base32 "1hdaf7pnh5h4f16pzrxqw3g5s37r5dkimsy46pv316phh05dz8nf")))) + (build-system meson-build-system) + (inputs + `(("mesa" ,asahi-mesa) + ,@(fold alist-delete (package-inputs mesa-utils) '("mesa")))))) + (define-public glew (package (name "glew")