From patchwork Thu May 4 20:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49802 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 6F54027BBE9; Thu, 4 May 2023 21:13:41 +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 4B51427BBE2 for ; Thu, 4 May 2023 21:13:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufK4-0007Ob-RE; Thu, 04 May 2023 16:13:04 -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 1pufK2-0007Lt-M8 for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -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 1pufK2-0006qG-8r for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufK2-000897-4W for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 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: Thu, 04 May 2023 20:13: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 Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323116231247 (code B ref 63219); Thu, 04 May 2023 20:13:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:12:42 +0000 Received: from localhost ([127.0.0.1]:52143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJh-00087v-HB for submit@debbugs.gnu.org; Thu, 04 May 2023 16:12:41 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:56835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJf-00087Y-GS for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:12:40 -0400 Date: Thu, 04 May 2023 20:12:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231153; x=1683490353; 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=ZqziUhFXx8BkE3Bs0vyjjvhw5WqnzLPul9RBvED7jgHLNYjrgPoE1nEYXKlxpJ4XD Nj1QpneHvlDXZ40NG8NZdbNRxvC5WFyO7FQmudDjQOdZzGQUu6BmSMVb8HkRsSwQ1B oN+qk2JHQZUrM2eT1+OSNBWksofA8F9D4PzsV/gmcCG21OZh2NESzG5pp+mWZEPoHJ hxK8T+YlO1MtBLzV5X8b6tNzk069XnHQHZhkOKfqBgaIA0KtqBNb5Vx7xCsTqXftk2 INtaNl/kTiKJZhYX+jPqc+mMQGTgFV9gexzxfajjGbFxxLaDVL/5nKgmWsDiYwbldu uRT1s6boxdD8Q== Message-ID: <4b3b466bdacfc3c1196ce0a7198559a52c0a020d.1683230943.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): 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 Thu May 4 20:12:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49801 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 9C8DD27BBE9; Thu, 4 May 2023 21:13:23 +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 0E20327BBE2 for ; Thu, 4 May 2023 21:13:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufK5-0007Om-MP; Thu, 04 May 2023 16:13: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 1pufK3-0007MB-BF for guix-patches@gnu.org; Thu, 04 May 2023 16:13: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 1pufK3-0006ql-2U for guix-patches@gnu.org; Thu, 04 May 2023 16:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufK2-00089L-US for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 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: Thu, 04 May 2023 20:13: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 Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323117931294 (code B ref 63219); Thu, 04 May 2023 20:13:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:12:59 +0000 Received: from localhost ([127.0.0.1]:52151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJz-00088g-7c for submit@debbugs.gnu.org; Thu, 04 May 2023 16:12:59 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:41375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJw-00088E-M3 for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:12:58 -0400 Date: Thu, 04 May 2023 20:12:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231170; x=1683490370; bh=abL49T01FaUnnuiWiAbanAWJ19wckPkCkExifB/K8t4=; 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=nv4wAdKyDKd9HQiyEs9PRWdPQBIIg+YkWTfkK5dyy/LdNa0gEW5XdzHzFSoslFEtg YueIpquz/DF9e2wFl5xF9OtH+6iBRiXNMmC84sHg8TlApTwZ4eUbSA1SttAeTG4kSW /aFfG668qJpiOIblr/kvW4dwAG36clYmS7Nr3af/F3hdvY4+C8rlZbxANGvPOJTMRk XS+Pw9kYfn7j+DkoulU6maBV//x+9Oq1ZmmEnJQsYaPPZ739B74Nv539Lkl24rnUKJ Nec2wCA8eSK9JtAY14hUf2VzuJ2Dvizd3BkyzaH4zF4wbqi/pyc1qYAaKoxJQ/Vxg0 w+xqsiv6mHsiA== Message-ID: <7ff21afd6c6446d9f986ecf6982b41722fed81ac.1683230943.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 | 48 +++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 23 deletions(-) -- 2.39.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6521170ebb..f705b864f1 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/")) @@ -529,7 +531,7 @@ (define-public mesa-opencl (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) - `(cons "-Dgallium-opencl=standalone" ,flags)))) + #~(cons "-Dgallium-opencl=standalone" #$flags)))) (inputs (modify-inputs (package-inputs mesa) (prepend libclc))) @@ -543,10 +545,10 @@ (define-public mesa-opencl-icd (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) - `(cons "-Dgallium-opencl=icd" - ,(delete "-Dgallium-opencl=standalone" flags))) + #~(cons "-Dgallium-opencl=icd" + (delete "-Dgallium-opencl=standalone" #$flags))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'install 'mesa-icd-absolute-path (lambda _ ;; Use absolute path for OpenCL platform library. @@ -554,7 +556,7 @@ (define-public mesa-opencl-icd ;; for ICD in our applications to find OpenCL platform. (use-modules (guix build utils) (ice-9 textual-ports)) - (let* ((out (assoc-ref %outputs "out")) + (let* ((out #$output) (mesa-icd (string-append out "/etc/OpenCL/vendors/mesa.icd")) (old-path (call-with-input-file mesa-icd get-string-all)) (new-path (string-append out "/lib/" (string-trim-both old-path)))) From patchwork Thu May 4 20:12:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49803 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 C7D8227BBE9; Thu, 4 May 2023 21:13:53 +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 5D2E927BBE2 for ; Thu, 4 May 2023 21:13:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufK4-0007NG-Bn; Thu, 04 May 2023 16:13:04 -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 1pufK2-0007M2-Uw for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -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 1pufK2-0006qU-MB for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufK2-00089E-Gm for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 3/4] gnu: mesa: Fix hardware video decoding. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 May 2023 20:13: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 Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323117731279 (code B ref 63219); Thu, 04 May 2023 20:13:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:12:57 +0000 Received: from localhost ([127.0.0.1]:52149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJw-00088R-UW for submit@debbugs.gnu.org; Thu, 04 May 2023 16:12:57 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:37965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJu-000889-2d for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:12:56 -0400 Date: Thu, 04 May 2023 20:12:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231168; x=1683490368; bh=w0LCqe1QyYnr34DxQea7riOgQ8saTByCBXgHCuY+Ht0=; 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=eJ0vRlk2TYTCMrP05PuzA7k21YQhDJnvkbi8LMRW3sLiVsM0fT9ATsdEyBPaWIFsg S7pdsz/3RxN9gwLTcOvNHhAhRKIq2vVIiVwnf5Id27TZy+LH0/Pmp53JkCP8pfNa/k KuHrFnb6wpVpyZf/L98dbPrA9jI9hvh6cxdhYkq0BYFQCCkSH7DdZnWFHl6o6/CyNz wFTjbbDRe+YxnExlDvf+9S6xpjBD7NMd3u14L4tf4XCXcMBesSJ2tSvd0/mVeuD5FF Tby7rLiuN3rAydGOPbgiFK9xMy1Qhx2g2S4xmG+rd4i8dpcen26rBSqm+O/VrrH9WI qKuHYoK8wjBiA== Message-ID: <50d525c2c364d0a64c92b4f956eab304e370e102.1683230943.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): 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 f705b864f1..5248151a95 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 Thu May 4 20:12:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49804 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 EB05527BBE9; Thu, 4 May 2023 21:14:07 +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 DEE6B27BBE2 for ; Thu, 4 May 2023 21:14:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufL1-0008Ap-Md; Thu, 04 May 2023 16:14:03 -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 1pufL0-00089Z-Q4 for guix-patches@gnu.org; Thu, 04 May 2023 16:14:02 -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 1pufL0-0006xD-Gv for guix-patches@gnu.org; Thu, 04 May 2023 16:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufL0-0008BH-9k for guix-patches@gnu.org; Thu, 04 May 2023 16:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 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: Thu, 04 May 2023 20:14: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 Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323118531360 (code B ref 63219); Thu, 04 May 2023 20:14:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:13:05 +0000 Received: from localhost ([127.0.0.1]:52159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufK4-00089k-Ql for submit@debbugs.gnu.org; Thu, 04 May 2023 16:13:05 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:11195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufK2-00088Y-IO for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:13:03 -0400 Date: Thu, 04 May 2023 20:12:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231176; x=1683490376; bh=Ah9i9X9QyKv5O360atIvzNRcMparYCvvQ2jCkY0eGsk=; 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=j5yA2SzOPLojadd1srRdM+of3QmoVw7fmDjejH/RMglMMCr12xXvmA7g+8/F0GuzM TSbsGE6ifTWp0DevQqX4IHyD1EF7Wh9bBssus9SH/THFbVdGK7AOqu8wcbHtkkmR5a ST5lzDEd1UWuy8OHRup22PPfurDFhQeJYsvGTRKIZW19cwwIMc9pB8YiZHP1acRYNj 60Qh/oSb/z29qX8umeLidDIW/SMwkTfoUpDaxPD+kRdh+IY5lO1MVpQFBbE2jsy/Kq J5rmoYvFHz97++oonjnWFi95QbC4zrtZmmdur6155E5LqmE7eEUF3MCQOg7zAQTRqN wvhACkdhSDbtw== 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 5f5de953d7..9a801f3f3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1559,7 +1559,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 5248151a95..235b386dad 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)