From patchwork Fri Sep 6 15:08:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67671 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 16AEC27BBE9; Fri, 6 Sep 2024 16:09:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 62FBF27BBE2 for ; Fri, 6 Sep 2024 16:09:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaaB-0002IG-7z; Fri, 06 Sep 2024 11:09:07 -0400 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 1smaa7-0002HQ-JH for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaa6-0003Xa-WF for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=K62tQnT6x8qIfj1/z3bDDlMi8R1oN7YlMo6nQ8Ks9A0=; b=F8ccBZ+NAHpZroEtkOOkHruCJykHLVQBmB0M4n8I4G1z0pwJ2PowkHbmld5bs85yVTi5fk7kRBSUjmGv0VYdqnJeSWb/4KEXsZr3EckPT36XXL1IfG9OKDE51bAHclu12MnbJhBfgjsN9LQRsMR26cRgHUD3NCoi4kC+/qEGatVYopqY47GlDS7lWfsamjN7+wXQBRLMKFKphGiskpuOG8V5D07kGbeeCqFvQ2YEzkHCAvZo6M7Ti3bECdNNd1pPqbXn1rKMbc6ofBpTuSLjKrqNi5ljlQLe1Igk1OdJMquiCDt3dFaHYel8oguhCZFclaip9n64tQCNkd3Fj5/lwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaa6-000561-FG for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 8/8] gnu: mesa: Update to 24.2.2. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563530219529 (code B ref 73071); Fri, 06 Sep 2024 15:09:02 +0000 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:08:22 +0000 Received: from localhost ([127.0.0.1]:53832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZR-00054v-FX for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:22 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:44825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZP-00054g-H9 for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635294; x=1725894494; bh=K62tQnT6x8qIfj1/z3bDDlMi8R1oN7YlMo6nQ8Ks9A0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=SHTqpxBy+KLukIXrtGcrOhK25D4N4Q0vyJprD2ZfaF00TO8T1jKeOHnpzH00jiNtC f9WC0eVbOM/49nVhBXt96i4IBDD+ckeUzJ1cN88iJgqhTNPZHGe1CygV2WSkDMmqXu zfTi249f5TGVciaZt05333wuWySZdjWUhyz6ixsaSXa3b+Y7nZVLBcdfSV7UR6fKbQ N/G17m+zMWwGCtkUBOkS21XbDL828+H0nJbGCO4a3byEsFuOMTs9F0GwpVxWXHdXqo 2wd/zDrtwZqYgJFUwgZkOkwK6rYxiXIt7hx22zfm2RkWDJSvsbkd16VHycx0f7j+hV JxJiaV3iHKJgA== Date: Fri, 06 Sep 2024 15:08:08 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 90cc0872112bb0c9fd540be2fe1c0f258ad1913c 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 Note the clang input for mesa was in inputs for aarch64-linux but more generally in native-inputs for mesa-opencl. Moved to native-inputs for all (mesa does not retain a reference to clang). * gnu/packages/gl.scm (mesa): Update to 24.2.2. [inputs]: Move clang-18 when building for aarch64-linux to ... [native-inputs]: ... here for all architectures. Add python-ply, and python-pyyaml. Use libclc for all architectures. (mesa-opencl)[inputs, native-inputs]: Remove fields. * gnu/packages/python-xyz.scm (python-pyyaml, python-ply): Add a comment about being dependencies of mesa. Change-Id: Ie262e6ea5a31fda0e410277256c203ea3caed96b --- gnu/packages/gl.scm | 49 ++++++++++++++----------------------- gnu/packages/python-xyz.scm | 2 ++ 2 files changed, 21 insertions(+), 30 deletions(-) -- 2.45.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ab53b1761a..ab18a3e5a7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2021 Ivan Gankevich -;;; Copyright © 2021, 2022, 2023 John Kehayias +;;; Copyright © 2021-2024 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> @@ -298,7 +298,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "24.0.4") + (version "24.2.2") (source (origin (method url-fetch) @@ -308,7 +308,7 @@ (define-public mesa "mesa-" version ".tar.xz"))) (sha256 (base32 - "1w25lwdrb0ffrx2fjk9izbvpcgf9ypfc7v32zybwvjwql0qbvzlh")))) + "00hxi7wjp368kh5qq2v25nyzjrf0grsx55w55fg4bgpd0hqps1zx")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -321,35 +321,32 @@ (define-public mesa libxxf86vm xorgproto)) (inputs - (append - (if (target-aarch64?) - (list clang-18) - '()) - (list elfutils ;libelf required for r600 when using llvm - expat - (force libva-without-mesa) - libxml2 - libxrandr - libxvmc - llvm-for-mesa - vulkan-loader - wayland - wayland-protocols - `(,zstd "lib")))) + (list elfutils ;libelf required for r600 when using llvm + expat + (force libva-without-mesa) + libxml2 + libxrandr + libxvmc + llvm-for-mesa + vulkan-loader + wayland + wayland-protocols + `(,zstd "lib"))) (native-inputs (append (list bison + clang-18 flex gettext-minimal glslang + libclc pkg-config python-libxml2 ;for OpenGL ES 1.1 and 2.0 support python-mako + python-ply + python-pyyaml python-wrapper (@ (gnu packages base) which)) - (if (target-aarch64?) - (list libclc) - '()) (if (%current-target-system) (list cmake-minimal-cross pkg-config-for-build @@ -594,15 +591,7 @@ (define-public mesa-opencl (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) - #~(cons "-Dgallium-opencl=standalone" #$flags)))) - (inputs - (modify-inputs (package-inputs mesa) - (prepend libclc))) - (native-inputs - (if (target-aarch64?) - (package-native-inputs mesa) - (modify-inputs (package-native-inputs mesa) - (prepend clang-18)))))) + #~(cons "-Dgallium-opencl=standalone" #$flags)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 21e04e75e9..416db71d68 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6133,6 +6133,7 @@ (define-public python-itsdangerous environments and back.") (license license:bsd-3))) +;; WARNING: This package is a dependency of mesa. (define-public python-pyyaml (package (name "python-pyyaml") @@ -20995,6 +20996,7 @@ (define-public python-pika network support library.") (license license:bsd-3))) +;; WARNING: This package is a dependency of mesa. (define-public python-ply (package (name "python-ply")