From patchwork Wed Mar 8 12:13:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47786 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 48B5616E3B; Wed, 8 Mar 2023 12:15:44 +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 5251F16E31 for ; Wed, 8 Mar 2023 12:15:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshL-0005to-C1; Wed, 08 Mar 2023 07:15: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 1pZshC-0005sU-Nj for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15: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 1pZshC-0008Hy-8R for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZshC-0007tZ-35 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 1/7] gnu: Add m1n1. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15: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.167827765030206 (code B ref 61959); Wed, 08 Mar 2023 12:15:02 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:10 +0000 Received: from localhost ([127.0.0.1]:47976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgL-0007r7-UZ for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:10 -0500 Received: from mail-ed1-f50.google.com ([209.85.208.50]:33388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgI-0007pj-2L for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:06 -0500 Received: by mail-ed1-f50.google.com with SMTP id a25so65098539edb.0 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277640; 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=Q4Pa9TeWp4LcpO0dDrymevEd2F3vne1KM/SHiSfkzL8=; b=fG2CDQ+Ri68dIEsbJ2CxGn1EC/EFch9ryCsY9+LOahH1620M1xt/HQ9jI2iWYPWljp tSlv2EnaiLcQgW0kOai7Pik7gdH4TKhjgyjGmoaCiLgQOR0QS0eE9nRCZsUCComa86HT rafEZKuVc8g8YyLA8RGBw4mt+S05sshbBEWmUlBBGFAePdnMr+KxN59JDi883a5mD3Yp cpJ/8h9jd2//6PKVfS4GW91rzqoUT/fwdNln2EBSQv05navJTiYR5jk57TnH1OGAvHRm 2CFWC2GIDxS9hXzaTYmL4kP34DNY3V7nKkx9SJ4KZ0mNFhLhv6uk1+lYzxQWBH63G8Pv SZig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277640; 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=Q4Pa9TeWp4LcpO0dDrymevEd2F3vne1KM/SHiSfkzL8=; b=njv+ZOaoxDfVlGX4FBUyNKEfxxIxsyRXD1PLMgWclaEk+7k0aSLRSL90jt3JFBeA6h Ppw6PPJgJTb14SqJAd9B5vtB9bEWCiINeIH9WagFEJHLt1XnlMyoOxmLfK9V0L8zV2on AGly18GhtU+LTCQLd7WRmn+yRJvsc7wTLZpXWSmmRdgXse9RRwfPdyJ+kaENhNmC466d +ZMk1HiVvMDibMgbWkrCWU0/ikxHjirKQ5BCMV/LU2gDZSbykCbu/B+/bEBG4KmPr8d9 y1f8sY/JdwWbVRE7d8yaoDWBfVb0iJB7kXhE+gHS+qdfCSykR7iOmU5E5O9Y73IBG8P6 q8Lw== X-Gm-Message-State: AO0yUKVp2yJexdR+L6tYqubXZ2Q/7uLshaLy+sloLHxuqlN/xGIGsKeG IZNFAdh4S6BRq5SzGvUPlQsWDocfw0N36imhO9Y= X-Google-Smtp-Source: AK7set/+BSXOV37zvLfVZE+9+uILxEe5xe6qdqRZmgvyxeS4xR//LP+cWjhkd4jKNn5XZMFRgEX3GQ== X-Received: by 2002:a17:907:7a86:b0:90b:167e:304b with SMTP id mm6-20020a1709077a8600b0090b167e304bmr18267638ejc.45.1678277639843; Wed, 08 Mar 2023 04:13:59 -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.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:13:59 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:44 +0100 Message-Id: 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/bootloaders.scm (m1n1): New variable. --- gnu/packages/bootloaders.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ee47a9fad7..aa2fcc03dd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -623,6 +623,42 @@ (define-public dtc tree binary files. These are board description files used by Linux and BSD.") (license license:gpl2+))) +(define-public m1n1 + (let ((commit "46f2811351806aafb3d56e02c107f95ac2ea85e3")) + (package + (name "m1n1") + (version (git-version "1.2.4" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AsahiLinux/m1n1") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14chrqbs57v6i5vmf643svbi3s7h4fxrxly0bby7brf3w114nmpk")))) + (build-system gnu-build-system) + (supported-systems (list "aarch64-linux")) + (arguments + (list + #: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 Wed Mar 8 12:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47790 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 11E8916E3D; Wed, 8 Mar 2023 12:16:17 +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 EAE1316E3B for ; Wed, 8 Mar 2023 12:16:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshM-0005x1-0G; Wed, 08 Mar 2023 07:15:12 -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-0005sd-BV 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 1pZshC-0008Ib-KY for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZshC-0007tg-GD for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 2/7] gnu: Add u-boot-apple-m1. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15: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.167827765030213 (code B ref 61959); Wed, 08 Mar 2023 12:15:02 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:10 +0000 Received: from localhost ([127.0.0.1]:47978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgM-0007r9-9R for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:10 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:36593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgI-0007pk-BZ for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:07 -0500 Received: by mail-ed1-f52.google.com with SMTP id da10so64949513edb.3 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277640; 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=EaLCblxJu7mJ231cd+CGCTQN98M8/d7RtaQPZIheIDc=; b=4nelbP7za+DcIH4iTJotieOjDveFhe1zhscK3SxBg2rQR71ZS7AZnRsWLPuXL6+jKw udPRNmw7zVuCsxAYlR+EdVoy8HMOg6YFGj12p/ZjVefAURg9LLjXeWe7C6AioWB4rpi9 lAFtj1+9P7YdJAo9yfWbU+/zEJFei5mSnOzz5WmWSOqg7jJjDEUpUJHdqJAuxUVB+cut hZfRcCYLsQ24tHpG4XGrVVLF6slmmcjI+TEhSwyjCX9AFRdk/okrzJJz+OVclr62+ZKs mCEkNYNotlEPn3gkTwbbaF2K1Y28YXbWq4QOJtaptKmJkPko+WGGJINQNM+uBQQUBTLT /EnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277640; 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=EaLCblxJu7mJ231cd+CGCTQN98M8/d7RtaQPZIheIDc=; b=Dffsq94hmhwWvO4Zt1Lnj7dbcsXmBOzl3N2vrQO+JcqQj1yfupJsZtX01uI9zUZw+M 2pBrotK07VHKwHoqU2ROSK/M7CsnK/S6JkRQZmfLIPO3rQ9XIiY2TWEsTUTuPY352Sdz j9TDEEbh99d59HYaiDkLKLxNXkKzqiiMC4c7b37HovEPjeb61iavEjvLgrr2nqA4xkvw aHovfd9FiVJM02EUfSLgvOGe65lToM+9XbFJaFiA1CUP4QD6ghP9kiVHiqtX5I7e+qdr p1ROnEDTFzHqmY39pHM5oH13aGa6n/zRQDesRzFxjgfaIQzo6u0jWAb75VEvx9D5kIs8 7M3Q== X-Gm-Message-State: AO0yUKXAl9ww/Rh3vQ1biuv8T5ncZkg7tSdT7OJT4H7prH0sFJgDjjuZ Y+DEUDx7g8sk38HPEatNtH7Ys7ESDgANGcT603Q= X-Google-Smtp-Source: AK7set+GY/J+fEX6syJ5QzSGp8XkdBvQ3SPktbU4vnxsM5ySfoQ2RyEvdaj0B6HWnOv/cykv2XyYJQ== X-Received: by 2002:a17:906:4fd5:b0:8b1:78b8:4208 with SMTP id i21-20020a1709064fd500b008b178b84208mr21118106ejw.1.1678277640406; Wed, 08 Mar 2023 04:14:00 -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.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:14:00 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:45 +0100 Message-Id: <222fe3be44b74b914e974eceb9d2543fbef63bc4.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/bootloaders.scm (u-boot-apple-m1): New variable. --- gnu/packages/bootloaders.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index aa2fcc03dd..fc4ce4d908 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1032,6 +1032,29 @@ (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")) + (commit "54409548c3aa8cf4820f1bda69a26bb603a0a5a4")) + (package/inherit base + (version (git-version "2022.10-1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AsahiLinux/u-boot") + (commit commit))) + (file-name (git-file-name (package-name base) version)) + (sha256 + (base32 "1m1w6ajzsfpb59abncz3sa9b1waqjsnh2vm7js2n22xiw4km7nzx")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (delete 'disable-tools-libcrypto))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (prepend libressl)))))) + (define*-public (make-u-boot-sunxi64-package board triplet #:key defconfig configs) (let ((base (make-u-boot-package From patchwork Wed Mar 8 12:13:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47787 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 62DDD16E3C; Wed, 8 Mar 2023 12:16:02 +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 D067216E31 for ; Wed, 8 Mar 2023 12:16:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshQ-00061N-Hh; 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-0005sc-Ao 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-0008MV-29 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 1pZshC-0007to-UT for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 3/7] gnu: libdrm: Update to 2.4.114 and adjust renamed options. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15: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.167827765130227 (code B ref 61959); Wed, 08 Mar 2023 12:15:02 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:11 +0000 Received: from localhost ([127.0.0.1]:47981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgM-0007rL-N2 for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:11 -0500 Received: from mail-ed1-f43.google.com ([209.85.208.43]:36588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgI-0007q0-TZ for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:07 -0500 Received: by mail-ed1-f43.google.com with SMTP id da10so64949638edb.3 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:06 -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=PSUJ/Ugj1pqiTsbjQAoXiLFbS2bLGgq1e4WIpnsD4nA=; b=OIwTS4PYnpB+Z/Oz+6vJn7vSJdCh6uOrcSe6MPAzEuuT6hKWOqw4Pb9DuzJyqDzYBf uICrMqLLf63O4oQqFGw/4IIQi1hbAwjzZMj6EcA5mOnRS+0PZPYYn1VzoGnGfEzq/F/E SbbYQTZHRLe0iXXBa+fexR+5JoSsuvJ9i/yvYUhZneXDjUdtDotW9pFCSebZqZa7qLzD xhSBImJ9fbmmjYBlvjXsdlft9Kijn7cs0T+3ivHEGRiy676Y/ZFVvJ35HI+jfnUcJQ2R /4Wz4qwzxrEz4/mikl/svTVJsolKJvUAuCPUP84EXQHREHsxeWhv99hP7M7u7cAOhTMS LAvA== 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=PSUJ/Ugj1pqiTsbjQAoXiLFbS2bLGgq1e4WIpnsD4nA=; b=lQvbUoovOYWtfZsWXdQz4e+zJv/pOMJxFaJ339RPD4w5XKcpbLyeUi9cDpgVf/90CW Ph0FW/OyAgWenKx4Q3ixfU0hGi3SDFWVTQ7lIyZ5r0yg+adQB2F8HbQ0f2TSJ9dIX+Uk P/9SkYoUWiFg9MLWqWNQpC+t37X2DQh6Xb62z1IgwOg5K7X5/Hni5BgHwCbC8+BZbqvk bMRbeH26flQm53aXR0pDaX2Y6mwZC+HZoFwopdFsrz4zj/rCtJjO42wimBFU/L5etqhE OcoO7tuFq2TtfPS//XohVPygsLHJ1xGMDt6v5YV/dQcVMs2HPxf++/HrM2I8zLDHdPlI UnCg== X-Gm-Message-State: AO0yUKUCBuGyqxHJq5oLX9rnESVtjiyfdlbgn5CeAnGu1kLsvExTmx2Y mVxb4aN2XxSBC67WxIUAC4/e/xxVJsrSffWnBBU= X-Google-Smtp-Source: AK7set9xHKBViSV3VSkwYyx9c9AvVUJPs+1SDEE1wRW5ahYOdoVMWs6TPqdQv0E2DXv/Z3DIfhZUEw== X-Received: by 2002:a17:907:6d91:b0:878:58e6:f1eb with SMTP id sb17-20020a1709076d9100b0087858e6f1ebmr22024867ejc.23.1678277641070; 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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:14:00 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:46 +0100 Message-Id: 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/xdisorg.scm (libdrm): Update to 2.4.114 and adjust renamed options. --- 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 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") From patchwork Wed Mar 8 12:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47785 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 DB27616E3B; Wed, 8 Mar 2023 12:15:43 +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 9AE8516E3C for ; Wed, 8 Mar 2023 12:15:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshM-0005xS-K1; Wed, 08 Mar 2023 07:15:12 -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 1pZshE-0005sh-68 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-0008Sn-Rw 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-0007u2-N6 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 5/7] gnu: Add asahi-mesa-headers. 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.167827765130241 (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]:47985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgN-0007rc-Hh for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:11 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:46067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgK-0007qD-4y for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:08 -0500 Received: by mail-ed1-f52.google.com with SMTP id cy23so64740123edb.12 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277642; 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=e+56MBUBP0uX8Xq7KclIMK+buL1/3WgVBExsldCHBWM=; b=Gkabc4FUA0zByL/UWj8rirgRijTR6RzM0PuORSmim1za60269Tal2LiLcnL2uB1ooM tRjtn8j86OzY74S+J1x80B2NOvGd1Nh3pX9kQgzblzu632c3O8miQzFDaMXXGOCwyjin WTcOXNkcsdwydWw4uUrO/pauO1cp12Ydm4P1CVnnTI5glu6Y1HsuZoccdNV7e2CpuYZg 1kaLL5R+x9XfiGjtyFekKgXSuh+5GHjO2RWdhLQFZoHUpP6RDVUYFStq86Fx9mirEcaC b1Hv55oPfOLck0piwpQakoOf/x0AqEVPrJjH0fuFvKseMxiG1Uk/F97LuYV+RHMaj46d dHUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277642; 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=e+56MBUBP0uX8Xq7KclIMK+buL1/3WgVBExsldCHBWM=; b=r4Yrkgbc9+blCoF8cwFKQLDEhzaegRp/2IiIpxyCPb9CiWzqxITyAEYAQhXCBaVo8E hKt/0RFjO20flIxNL0gUBr3gqjOpP7+q1fjl14U4OtevKz7+Z1d5BSPNuDopNQ2oHQD5 1HcVKKJWvAILU+xQcsFF0fMwWNPhQwN1G99q445sRiOlD+06up6gSLCZV65trNcVPaiL tacOMwRlHJtiPooievsKYiI3E/UykKE1YQWXeaf4be7d86FOP3B1kLU9GPD6Cu8T6qSo eU7gsUxK/DXoXpwDJSD+HpbXWKGuwSyJfZg3OuQ+hVzGzKC4HN0rNkA9l3ujlflrWYa+ ILXg== X-Gm-Message-State: AO0yUKWDqvHLiJugNR4S8WS+URDNx1yNn42qOtSaU9oc+i+cmV23hTf0 zRsLqxd7demBLUlLJOFzVdQBg+ZGv5L+NWTr5gw= X-Google-Smtp-Source: AK7set+MkXwxVe1sTk3llJ99dQJwUMBsXzVodniN+RL4qTBVWmjrAudXWPMqQBAHiktGQMTOGpK4/w== X-Received: by 2002:a17:907:7f0b:b0:888:7ac8:c0f4 with SMTP id qf11-20020a1709077f0b00b008887ac8c0f4mr17710501ejc.25.1678277642324; Wed, 08 Mar 2023 04:14:02 -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:48 +0100 Message-Id: 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-headers): New variable. --- gnu/packages/gl.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3b3985df71..490b1051d2 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -661,6 +661,12 @@ (define-public asahi-mesa (replace "llvm" llvm-15) (replace "wayland-protocols" wayland-protocols-next)))))) +(define-public asahi-mesa-headers + (package/inherit mesa-headers + (name "asahi-mesa-headers") + (version (package-version asahi-mesa)) + (source (package-source asahi-mesa)))) + (define-public glew (package (name "glew") From patchwork Wed Mar 8 12:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47788 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 D99CE16E3E; Wed, 8 Mar 2023 12:16:11 +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 78E9716E3C 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 1pZshM-0005xE-A7; Wed, 08 Mar 2023 07:15:12 -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 1pZshF-0005tL-0x for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:06 -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 1pZshE-0008Sy-Mz for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZshE-0007uJ-HL for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 6/7] gnu: Add asahi-mesa-utils. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15: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.167827765730262 (code B ref 61959); Wed, 08 Mar 2023 12:15:04 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:17 +0000 Received: from localhost ([127.0.0.1]:47989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgT-0007rx-4l for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:17 -0500 Received: from mail-ed1-f54.google.com ([209.85.208.54]:46922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgM-0007qL-Ew for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:10 -0500 Received: by mail-ed1-f54.google.com with SMTP id k10so40974692edk.13 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277643; 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=HPvCmhJ0ZHni5pIE3P2KP3KmE4npRxzaAMShkWeyybk=; b=k7TNGD0oGP8U8pOgF+Ri0Rdie+j9br/q4tjXi+w6XoKccoxq8sFAEO4BlQGb3BCgcG 5c68kOGhzEGehKLERVSNay7hRXT0f0bP72wTP2vzaOBsw3QAyV+YlBX1Cq27JFCO0r94 zbwhKSrt6ByCtOF2LLONLAOdPZAykcakpE2NXzJu23Aa6oqzMYNpuujU2XnKjWRKU0Ji zc+D8BNn8+fymcPpPnaoiqsR+Z2b/gNqBGasLTs99nJV+51H0pVx06WYuCuhvma0fcaD akPo/+7mkqpXCiTw+DQGHz2SZ/QSD39YhSaW9uU1nCsVDwIbZwfz0Ohvqc25mfA6NiT2 zqhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277643; 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=HPvCmhJ0ZHni5pIE3P2KP3KmE4npRxzaAMShkWeyybk=; b=EAImcS3THvYI2dTvCkYkqfcYf5VyTdCnvqhz2tbNZoN4jcY+uejPzFMmLROg5JXJ0e jDJ5hmB0H7n1kvPj06ZQ2tQULh81kd98SXHGXU3tl1nYHCglFrSPiCWQpWtoXI/sKrE3 vmBOXUde61m0bHhunv0mKHAk1Q6koKvkjR3kArzZHQ2nUvupiX01Lp9L6eYY7qlxNV6+ 6cG1jPBzzVe9QAviLYZA2O6sc0qo8NNkb/vn2csJBlaR4WGfqBcMrUaYlGhptxhKHaQp B/JppwB1XOoy4vjIxqVAUWL4zbDXXsBGCkS/9nd7g+dwcPNxxpdjmyj1goTVkMbXo0an dS1w== X-Gm-Message-State: AO0yUKUAt/ZHwYwkB6vU0ZaOEOxIXAzV1NMWtRWeoMrMtTlnwSbP2NmG 7S9RpRCQFrA0nM6oDp2QBE/48zDSWMKPo9mc3IE= X-Google-Smtp-Source: AK7set/thLUexNYnu2CWMWcKscS828dBQ4aPZfK/qy3gfFrtL62vO2mASiqgzoBUAV/PX/WL9ZjpKg== X-Received: by 2002:a05:6402:205c:b0:4cf:350e:344c with SMTP id bc28-20020a056402205c00b004cf350e344cmr15465330edb.28.1678277642942; Wed, 08 Mar 2023 04:14:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:14:02 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:49 +0100 Message-Id: <3d63a47fa64b556e1be9dc91f78188342d1865bc.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-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 490b1051d2..0b4c11db7b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -667,6 +667,21 @@ (define-public asahi-mesa-headers (version (package-version asahi-mesa)) (source (package-source asahi-mesa)))) +(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 + (modify-inputs (package-inputs mesa-utils) + (replace "mesa" asahi-mesa))))) + (define-public glew (package (name "glew") From patchwork Wed Mar 8 12:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 47784 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 9CC3D16E3C; Wed, 8 Mar 2023 12:15:38 +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 68F7A16E31 for ; Wed, 8 Mar 2023 12:15:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZshM-0005xV-ML; Wed, 08 Mar 2023 07:15:14 -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 1pZshE-0005sj-I9 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 1pZshE-0008Ss-94 for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZshE-0007uC-4f for guix-patches@gnu.org; Wed, 08 Mar 2023 07:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61959] [PATCH v4 7/7] gnu: Add asahi-fwextract. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 12:15: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.167827765730256 (code B ref 61959); Wed, 08 Mar 2023 12:15:04 +0000 Received: (at 61959) by debbugs.gnu.org; 8 Mar 2023 12:14:17 +0000 Received: from localhost ([127.0.0.1]:47987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgS-0007rt-SF for submit@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:17 -0500 Received: from mail-ed1-f46.google.com ([209.85.208.46]:33406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZsgL-0007qH-82 for 61959@debbugs.gnu.org; Wed, 08 Mar 2023 07:14:09 -0500 Received: by mail-ed1-f46.google.com with SMTP id a25so65099125edb.0 for <61959@debbugs.gnu.org>; Wed, 08 Mar 2023 04:14:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678277643; 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=lR/2YDPsu/Hni8jrBGZ7aUJigZG2n8K9V/iF2ycg7BI=; b=3hzdkcE7Q+dfW7n4rcssPKAeYTAevRigh0vyunmbxlZo9tO6KVFF3P8Z7+XGrZGrs2 /DA9Hbq7cUrsMFaBENs8CayoTNGgyIsmZUncZNWiF8txoeC/cQkqfYVJ5UIgDYlDEfg4 6MaYo/YI/vQcslx3DXOkeY/JyTfhqkUEclrwvfq9u05QH8fEfv85QSryAaDGwlSFbVEn hM9JYHJWxxbuJMgqXZjmNTongj1OkuKq5iwnet78r7hPLWPeZ7ubBgt13fIMezwK1san L78HpQMXyi1T6mnCrrEvdK+/UHi10XOFg2oNVJN+w8TENItjvK6zo9TXbauEcEmpn86M U9JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678277643; 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=lR/2YDPsu/Hni8jrBGZ7aUJigZG2n8K9V/iF2ycg7BI=; b=Zryy5SRmWPlvYYtW/xXmfb1qvXMMcemKneez5+FzPH6qG0bYoqHrRkvU60W5CfDKp+ 4fWT5qjj4aj2lXD/ugmbjcQu3Rw5tz8A5qgtP9ePfRc7iVGKOp3kZwoaKsPWT3bOfUFH /tQu0pw8ImoRJtASgNFZ7MYh/h22xI96VDLgqXNNI3PLlXdBk5n705ysbSqev48jWqe3 tklm/38Gzuv/BEHvUulfCXNfHlWM0+4ak77N+SoXekIjnUHJM6koY1aR8B3umuhKw3R3 d88a6nVkNbasVB56mgdkujIHw4XlZcrWWLUCf+hllzdIkId0iOFTOr+VDpcMQ7GWaISz HEuw== X-Gm-Message-State: AO0yUKXQF5wzy4HLyjdHAzNUtUwwDSae5zd0M3lTkyG2WXcEPjMq5Hny FxZICUhwAriH848KJmlCuq1mRseluY15gl9+0Ic= X-Google-Smtp-Source: AK7set+fknhli1wbEfQPKf5NgTOEfrAO0CY19mFXxUpneyuOk2AjBB/bwoTCawFG5xvF2rkrscNGdg== X-Received: by 2002:a17:906:2f0c:b0:878:61d8:d7c2 with SMTP id v12-20020a1709062f0c00b0087861d8d7c2mr17629954eji.39.1678277643407; Wed, 08 Mar 2023 04:14:03 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:14:03 -0800 (PST) From: Roman Scherer Date: Wed, 8 Mar 2023 13:13:50 +0100 Message-Id: <162674841f20639847efd335ebfb4d530446440d.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/firmware.scm (asahi-fwextract): New variable. --- gnu/packages/firmware.scm | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index a876aa727a..0d52349240 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 pyproject) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -77,6 +78,47 @@ (define-module (gnu packages firmware) #:use-module (gnu packages xml) #:use-module (ice-9 match)) +(define-public asahi-fwextract + (let ((commit "0ac64c9ce1c460f4576162a82d239d7e8688a79e")) + (package + (name "asahi-fwextract") + (version (git-version "0.5.3" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AsahiLinux/asahi-installer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kj9ycy3f34fzm9bnirlcw9zm2sgipwrqzphdg5k099rbjbc7zmj")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "vendor") + (with-output-to-file "entry_points.txt" + (lambda () + (format #t "[console_scripts]\n") + (format #t "asahi-fwextract = asahi_firmware.update:main"))))))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'create-entrypoints '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")