From patchwork Tue May 2 01:01:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49739 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 6A3FE27BBE2; Tue, 2 May 2023 02:03:18 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 7933127BBE9 for ; Tue, 2 May 2023 02:03:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pteQ5-0001Sw-LK; Mon, 01 May 2023 21:03:05 -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 1pteQ2-0001S3-SC for guix-patches@gnu.org; Mon, 01 May 2023 21:03:03 -0400 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 1pteQ2-00037Q-Ce for guix-patches@gnu.org; Mon, 01 May 2023 21:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pteQ2-0005DZ-8W for guix-patches@gnu.org; Mon, 01 May 2023 21:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch 1/4] gnu: mesa: Fix library paths in Vulkan layer manifests. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 01:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: 63219@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168298933219919 (code B ref -1); Tue, 02 May 2023 01:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2023 01:02:12 +0000 Received: from localhost ([127.0.0.1]:41294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePD-0005B9-OT for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:48420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pteP8-0005Am-OC for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:09 -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 1pteP8-0001Gg-HZ for guix-patches@gnu.org; Mon, 01 May 2023 21:02:06 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pteP6-0002sw-Lo for guix-patches@gnu.org; Mon, 01 May 2023 21:02:06 -0400 Date: Tue, 02 May 2023 01:01:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682989322; x=1683248522; bh=vixj9XIYRm2gNp2J6c7vSww3fUz3dCObaj2JEM+6ezA=; 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=RybmREq00a7tDSMvzfgLPjUinOlM0ySsfr5RIjFK8EhjmfqrjzGr4XHcgSUd4W9Ig mgbbHUkuQWKJjneDimLZDcTswcKi0yQoGH9kwLHIOjyhC2Di2aAxs0mSsWHFKqwi/F Gb6q65y9bPjJlOtPdgGGJ/Ys4Oqp7OGb3HBL9hvJmZNByP8dHFfgd/HE6ALoqdZkwI zb3d0wsvZL37e9ung6PWQbNM1vbZoTei3/h+N4n3DDjl+X6J89a2ldY+BNkn3YuSXI mSy+o7sdpnpArBWzt5AlQjQarr9KPEgwPzj2dpWaM3nF3afXRahmCOm/tVmNVnGY87 oFaSZSNvGBZYw== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 (mesa): Fix library paths in Vulkan layer manifests. --- gnu/packages/gl.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) -- 2.39.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3a63d70c7a..6521170ebb 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021, 2022 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -488,7 +489,28 @@ (define-public mesa file) (symlink reference file))) others)))) - (delete-duplicates inodes)))))))) + (delete-duplicates inodes))))) + (add-after 'install 'set-layer-path-in-manifests + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (implicit-path (string-append + out + "/share/vulkan/implicit_layer.d/")) + (explicit-path (string-append + out + "/share/vulkan/explicit_layer.d/")) + (fix-layer-path + (lambda (layer-name) + (let* ((explicit (string-append explicit-path layer-name ".json")) + (implicit (string-append implicit-path layer-name ".json")) + (manifest (if (file-exists? explicit) + explicit + implicit))) + (substitute* manifest + (((string-append "\"lib" layer-name ".so\"")) + (string-append "\"" out "/lib/lib" layer-name ".so\""))))))) + (for-each fix-layer-path '("VkLayer_MESA_device_select" + "VkLayer_MESA_overlay")))))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") (description "Mesa is a free implementation of the OpenGL and Vulkan From patchwork Tue May 2 01:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49741 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 E731127BBEC; Tue, 2 May 2023 02:03:44 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 9A19C27BBE2 for ; Tue, 2 May 2023 02:03:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pteQ8-0001Tn-Ln; Mon, 01 May 2023 21:03:08 -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 1pteQ4-0001Ss-MU for guix-patches@gnu.org; Mon, 01 May 2023 21:03:05 -0400 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 1pteQ4-00038M-Dq for guix-patches@gnu.org; Mon, 01 May 2023 21:03:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pteQ4-0005EB-8z for guix-patches@gnu.org; Mon, 01 May 2023 21:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch 2/4] gnu: mesa: Use gexps instead of quasiquote. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 01:03:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: 63219@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168298934219996 (code B ref 63219); Tue, 02 May 2023 01:03:04 +0000 Received: (at 63219) by debbugs.gnu.org; 2 May 2023 01:02:22 +0000 Received: from localhost ([127.0.0.1]:41316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePO-0005CN-CG for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:22 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:33985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePL-0005BP-BS for 63219@debbugs.gnu.org; Mon, 01 May 2023 21:02:19 -0400 Date: Tue, 02 May 2023 01:02:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682989333; x=1683248533; bh=8r293lVuB8Z3Qwuo5YiIhQ/Se9NqOdPD3vDBVdMH8Ys=; 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=TdjHxp/LwLA5zSiGBU65cvO+tUzbkk16XTV5SNDPrF7ftTRs2rg3mqZ4IKyQhjjMD a4h3dekDeQcDW7lC75WXx6nPPc4I/R/tJQE6h6S9lKSe9F96c80jL9zdlBj8F0Wv4J qPP6VFMfMKHAOp0T9sJ04keteoprYyXU617UGZqLZ/ewMBSpaEAdDJxiuPjgPOxqpQ J9LLINBeVYLO1/pudqSeXZ+FfRHV7KUxybShZ5vNpvoyknPcqEXF/Wzgf3he6l/M9u Ul87Hzqb6gh177BA+2wfIh42qer3LBbRnqWq7HuZpiTod0yQmkRP72aI5ChU26mxgY X0RixoBMVCSZA== Message-ID: <4742c9c59e960506b3badea201fea6754e7aef8e.1682984719.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 (mesa)[arguments]: Use gexps instead of quasiquote. --- gnu/packages/gl.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) -- 2.39.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6521170ebb..3d6d1e2ab5 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -315,8 +315,10 @@ (define-public mesa (@ (gnu packages base) which))) (outputs '("out" "bin")) (arguments - `(#:configure-flags - '(,@(match (%current-system) + (list + #:configure-flags + #~(list + #$@(match (%current-system) ("aarch64-linux" ;; TODO: Fix svga driver for non-Intel architectures. '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ @@ -345,7 +347,7 @@ (define-public mesa "-Dshared-glapi=enabled" ;; Explicitly enable Vulkan on some architectures. - ,@(match (%current-system) + #$@(match (%current-system) ((or "i686-linux" "x86_64-linux") '("-Dvulkan-drivers=intel,amd")) ((or "powerpc64le-linux" "powerpc-linux") @@ -369,12 +371,12 @@ (define-public mesa ;; documentation recommends using 'release' for performance anyway. #:build-type "release" - #:modules ((ice-9 match) - (srfi srfi-1) - (guix build utils) - (guix build meson-build-system)) + #:modules '((ice-9 match) + (srfi srfi-1) + (guix build utils) + (guix build meson-build-system)) #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'disable-failing-test (lambda _ ;; Disable the intel vulkan (anv_state_pool) tests, as they may @@ -383,7 +385,7 @@ (define-public mesa (substitute* "src/intel/vulkan/meson.build" (("if with_tests") "if false")) - ,@(match (%current-system) + #$@(match (%current-system) ("riscv64-linux" ;; According to the test logs the llvm JIT is not designed ;; for this architecture and the llvmpipe tests all segfault. @@ -428,8 +430,8 @@ (define-public mesa (_ '((display "No tests to disable on this architecture.\n")))))) (add-before 'configure 'fix-dlopen-libnames - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (lambda _ + (let ((out #$output)) ;; Remain agnostic to .so.X.Y.Z versions while doing ;; the substitutions so we're future-safe. (substitute* "src/glx/meson.build" @@ -446,9 +448,9 @@ (define-public mesa (("\"gbm_dri\\.so") (string-append "\"" out "/lib/dri/gbm_dri.so")))))) (add-after 'install 'split-outputs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (lambda _ + (let ((out #$output) + (bin #$output:bin)) ;; Not all architectures have the Vulkan overlay control script. (mkdir-p (string-append out "/bin")) (call-with-output-file (string-append out "/bin/.empty") @@ -457,13 +459,13 @@ (define-public mesa (string-append bin "/bin")) (delete-file-recursively (string-append out "/bin"))))) (add-after 'install 'symlinks-instead-of-hard-links - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; All the drivers and gallium targets create hard links upon ;; installation (search for "hardlink each megadriver instance" ;; in the makefiles). This is no good for us since we'd produce ;; nars that contain several copies of these files. Thus, turn ;; them into symlinks, which saves ~124 MiB. - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (lib (string-append out "/lib")) (files (find-files lib (lambda (file stat) @@ -491,8 +493,8 @@ (define-public mesa others)))) (delete-duplicates inodes))))) (add-after 'install 'set-layer-path-in-manifests - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (lambda _ + (let* ((out #$output) (implicit-path (string-append out "/share/vulkan/implicit_layer.d/")) From patchwork Tue May 2 01:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49740 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 3351A27BBEA; Tue, 2 May 2023 02:03:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 2A92027BBE2 for ; Tue, 2 May 2023 02:03:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pteQ9-0001Ui-TB; Mon, 01 May 2023 21:03:09 -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 1pteQ4-0001Sg-8A for guix-patches@gnu.org; Mon, 01 May 2023 21:03:04 -0400 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 1pteQ3-00038A-V8 for guix-patches@gnu.org; Mon, 01 May 2023 21:03:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pteQ3-0005E4-Q2 for guix-patches@gnu.org; Mon, 01 May 2023 21:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch 3/4] gnu: mesa: Fix hardware video decoding. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 01:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: 63219@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168298934219990 (code B ref 63219); Tue, 02 May 2023 01:03:03 +0000 Received: (at 63219) by debbugs.gnu.org; 2 May 2023 01:02:22 +0000 Received: from localhost ([127.0.0.1]:41314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePN-0005CF-VK for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:22 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:47907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePK-0005BO-SW for 63219@debbugs.gnu.org; Mon, 01 May 2023 21:02:19 -0400 Date: Tue, 02 May 2023 01:02:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682989333; x=1683248533; bh=ML0fOkFrCjpx+4yrXHyaU6gheHuQ/3CnefUm71Ehcdc=; 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=vm/qBRzNnJ3eZUfnQjJIufWp3AGOqjFuk12whjrVGQzTEPtX8W8oJJFQVzB2zcUhf DtOmG89Nm6OjrG/3Jg6/OuFS3d8h116don1qz8zb1dL1CcZYpMDkeCOa/YlDpTxFP5 FHGBiGFaU8S8hwSXjB2xCy7sFtODt7doc7yuUehP8jzTKymyOhs1yt5vJa+mFjLVkg Zz3CtRwD6GL0C6lTMa+/t3JveV3O4v54v4IgnF7tAtbDN7jyA88QsXnmjjwuFHwZQT dn8heJNXQGjVMLy7+GUVrk2mA/RnnuPAfockwVmHQtCXsu4upHJCwQCVUFgnH8eT2D qRrZvm6lTn4EA== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 (mesa): Fix hardware video decoding. [arguments]: Add -Dvideo-codecs to the #:configure-flags [native-search-paths]: Add VDPAU_DRIVER_PATH so libvdpau can find the drivers. --- gnu/packages/gl.scm | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.39.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3d6d1e2ab5..09a1df4936 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -362,6 +362,10 @@ (define-public mesa ;; Enable the Vulkan overlay layer on all architectures. "-Dvulkan-layers=device-select,overlay" + ;; Enable the codecs that were built by default as part of the + ;; 21.3.x releases to avoid functionality regressions. + "-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc" + ;; Also enable the tests. "-Dbuild-tests=true" @@ -513,6 +517,11 @@ (define-public mesa (string-append "\"" out "/lib/lib" layer-name ".so\""))))))) (for-each fix-layer-path '("VkLayer_MESA_device_select" "VkLayer_MESA_overlay")))))))) + (native-search-paths + (list (search-path-specification + ;; Ensure the Mesa VDPAU drivers can be found. + (variable "VDPAU_DRIVER_PATH") + (files '("lib/vdpau"))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") (description "Mesa is a free implementation of the OpenGL and Vulkan From patchwork Tue May 2 01:02:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49742 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 9A2B027BBEA; Tue, 2 May 2023 02:03:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 4B39C27BBE2 for ; Tue, 2 May 2023 02:03:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pteQA-0001Uz-9f; Mon, 01 May 2023 21:03:10 -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 1pteQ5-0001T0-6B for guix-patches@gnu.org; Mon, 01 May 2023 21:03:05 -0400 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 1pteQ4-00038R-To for guix-patches@gnu.org; Mon, 01 May 2023 21:03:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pteQ4-0005EJ-PC for guix-patches@gnu.org; Mon, 01 May 2023 21:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch 4/4] gnu: mesa: Update to 23.0.3. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 01:03:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168298936920039 (code B ref 63219); Tue, 02 May 2023 01:03:04 +0000 Received: (at 63219) by debbugs.gnu.org; 2 May 2023 01:02:49 +0000 Received: from localhost ([127.0.0.1]:41320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePo-0005D7-TE for submit@debbugs.gnu.org; Mon, 01 May 2023 21:02:49 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:25465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptePm-0005Cv-OK for 63219@debbugs.gnu.org; Mon, 01 May 2023 21:02:47 -0400 Date: Tue, 02 May 2023 01:02:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682989360; x=1683248560; bh=GxGyB5xJRAxPTulnLXEpk1wjjUdc1sqL+7imJ2O6Edo=; 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=WfVdYH1i7ELZErwacUP9gxSy4NldlgTmbK1td/hiKp+NGwWNoTHm9WFHmSdxS3kUN PinGIwt6iOQw/KaSXU6J2yKtEjDCdAshp29+oWr4bVFGzAhyXFsvarKn3Z5SFKqfc4 46AfFGICosaFmjp46O71HoRP0QuALYeL8IBjzdcXOw9dD4O61f/PeNlDmRo2bX9CMu TZgXEhulZHmq4jvDuGMR9DBb3OT0r/Cghgiy3pdMusGaS3HJIqos56xYU2Qs1pz60D viGoOG6Zf4bNw2YSsJTxArBJaocBZuoNxxXxr976gQ94BfLknmPJQwHqx79Kb1n4kY TrDa+3q16XFzA== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 (mesa): Update to 23.0.3. [source]: Remove obsolete patch and update HTTPS url. [arguments]: Enable the crocus gallium driver. * gnu/packages/patches/mesa-fix-sporadic-test-failures.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gl.scm | 14 ++++------ .../mesa-fix-sporadic-test-failures.patch | 27 ------------------- 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 gnu/packages/patches/mesa-fix-sporadic-test-failures.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index 4976b5c740..cb260e4ece 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1558,7 +1558,6 @@ dist_patch_DATA = \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mercurial-openssl-compat.patch \ %D%/packages/patches/mesa-opencl-all-targets.patch \ - %D%/packages/patches/mesa-fix-sporadic-test-failures.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 09a1df4936..e93f21c374 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,21 +267,17 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "22.2.4") + (version "23.0.3") (source (origin (method url-fetch) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" + (uri (list (string-append "https://archive.mesa3d.org/" "mesa-" version ".tar.xz") (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz"))) + "mesa-" version ".tar.xz"))) (sha256 (base32 - "1azpr68pdg63yq3igmzwsgn2ypg49m0mp3hfkq0lcyswr99npmv5")) - (patches - (list (search-patch "mesa-fix-sporadic-test-failures.patch"))))) + "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -330,7 +326,7 @@ (define-public mesa ((or "powerpc64le-linux" "powerpc-linux" "riscv64-linux") '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) (_ - '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,\ + '("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\ svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio diff --git a/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch b/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch deleted file mode 100644 index 50ac5530a2..0000000000 --- a/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 7749599d737d205a88bbb6fa755ba095d9b581fa -Author: Gert Wollny -Date: Mon Aug 15 17:15:43 2022 +0200 - - r600/sfn: Initialize out buffer when printing op - - 79ca456b4837b3bc21cf9ef3c03c505c4b4909f6 - r600/sfn: rewrite NIR backend - - Closes: #7021 - - Signed-off-by: Gert Wollny - Part-of: - -diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp -index 3d40ea1796a..00826ed6457 100644 ---- a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp -+++ b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp -@@ -206,7 +206,7 @@ bool WriteScratchInstr::do_ready() const - - void WriteScratchInstr::do_print(std::ostream& os) const - { -- char buf[6]; -+ char buf[6] = {0}; - - os << "WRITE_SCRATCH "; - if (m_address)