From patchwork Sat Mar 16 16:09:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61871 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 8807327BBEB; Sat, 16 Mar 2024 16:11:10 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 2470627BBEA for ; Sat, 16 Mar 2024 16:11:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlWcO-0004Sc-1p; Sat, 16 Mar 2024 12:10:44 -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 1rlWcA-0004RV-IV for guix-patches@gnu.org; Sat, 16 Mar 2024 12:10:33 -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 1rlWc5-00021O-T3 for guix-patches@gnu.org; Sat, 16 Mar 2024 12:10:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rlWcg-00056G-Rw for guix-patches@gnu.org; Sat, 16 Mar 2024 12:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH mesa-updates v2 1/1] gnu: Add directx-shader-compiler. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Mar 2024 16:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 69461@debbugs.gnu.org Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.171060541219519 (code B ref 69461); Sat, 16 Mar 2024 16:11:02 +0000 Received: (at 69461) by debbugs.gnu.org; 16 Mar 2024 16:10:12 +0000 Received: from localhost ([127.0.0.1]:56373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlWbr-00054l-J9 for submit@debbugs.gnu.org; Sat, 16 Mar 2024 12:10:11 -0400 Received: from fhigh3-smtp.messagingengine.com ([103.168.172.154]:55979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlWbn-00054K-PH for 69461@debbugs.gnu.org; Sat, 16 Mar 2024 12:10:08 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 9F76711400CD for <69461@debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 16 Mar 2024 12:09:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1710605365; x= 1710691765; bh=kR6/KpjGWfamjFirKMdEQPGusHU6zaNlnF9RS6zz/Y8=; b=r EM4ojGIqEdwnkX8pkPG+pwhkzaFbTSb9juhFhWSfBtOSUWjEiAEkjpq3MT4vgw/e hq4oKJn+wJP8EWDBmHiRaa73657+8+VqEqs+LJ4nJkkCk/mBf/DiKw4VqZVZGv7s hkKeYr/xhAVxj4pSfcA8LoZI3KzCQndZ9Oittp77VTak9GVrsN7+zcPjG5/rVG44 eNaD+VoivaQMTGZWYB4OgtAfuBd4BN54S/umhDAvfhaf6Wg3ksXZoGn/1f7TtbOf RiI2rrNL9rOZkwBN8PM1fxQrN/uVH6mPTSU4aFS/ByPQvQaI9V1FY/fD8U5Qm7CA Y0Ml6YAovrDqB9ltCqUXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1710605365; x=1710691765; bh=kR6/KpjGWfamj FirKMdEQPGusHU6zaNlnF9RS6zz/Y8=; b=CiQS7FmewEay/MNBPfKBBndu5VAMw rxdIS/7RzXnTeuHet7dTE03jAADnj7faeh8hHt7BcMZpjdNuYMblQncHjrIRiBKa 3VnvrIJgwdXptirAwiPsEqczn8xclImhlev5FdcqYMssYpqHwjnDY95oLvmuJmNo 2stzxlHND/MQexYiNFEO+GUVHFo9gqPD18QCOfn6dKYszdpQGIWvDac78DScHjou 2aIVd3g7G0x6GjAHS9YsCF/U1d8FMHMvsO9YXXMv9D8cQBnyPNDiftkNVRSghR7P mZJy52oo84U7XkmmuiN1jpq4sPhlKObYj9ir+1+CPiluoHp8hHBbel5NQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrkedvgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhephfejvdefkeekhfehieevueeufedtjeevjeelueetleduleegtdeuteefhfduue dvnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Sat, 16 Mar 2024 12:09:24 -0400 (EDT) From: dan Date: Sun, 17 Mar 2024 00:09:03 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 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/vulkan.scm (directx-headers-for-dxc): New variable. * gnu/packages/vulkan.scm (directx-shader-compiler): New variable. Change-Id: I6e81f59ebd7122c007cce2df820359c055df5fd9 --- gnu/packages/vulkan.scm | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 599b0a47d3..517f26c173 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,7 +44,9 @@ (define-module (gnu packages vulkan) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages version-control) #:use-module (gnu packages wine) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define %vulkan-sdk-version "vulkan-sdk-1.3.275.0") @@ -582,3 +584,68 @@ (define-public vulkan-utility-libraries (synopsis "Utility libraries for Vulkan developers") (description "Utility libraries for Vulkan developers.") (license license:asl2.0))) + +;; directx-shader-compiler depends on an old version of directx-headers. +(define directx-headers-for-dxc + (let ((commit "980971e835876dc0cde415e8f9bc646e64667bf7") + (revision "115")) + (origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/microsoft/DirectX-Headers.git") + (commit commit))) + (file-name (git-file-name "directx-headers-for-dxc" + (git-version "0" revision commit))) + (sha256 (base32 "0c7l2xdsbr132ga2nyqjhz9xa42dxvhh9idjxnl673mz5kab1j6h"))))) + +(define-public directx-shader-compiler + (package + (name "directx-shader-compiler") + (version "1.8.2403") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microsoft/DirectXShaderCompiler.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ckngd42ivz5cv5nqngkjwwlcxbcj9mcxps56zy7qnq4dmmqkiid")) + (modules '((guix build utils))) + (snippet '(substitute* "CMakeLists.txt" + (("add_subdirectory\\(external\\)") + "find_package(SPIRV-Tools REQUIRED) +find_package(SPIRV-Tools-opt CONFIG REQUIRED)"))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-G" + "Unix Makefiles" + "-C" + "../source/cmake/caches/PredefinedParams.cmake" + (string-append "-DSPIRV_HEADER_INCLUDE_DIR=" + #$(this-package-input + "spirv-headers") "/include") + (string-append "-DSPIRV_TOOLS_INCLUDE_DIR=" + #$(this-package-input + "spirv-tools") "/include") + (string-append "-DDIRECTX_HEADER_INCLUDE_DIR=" + #$directx-headers-for-dxc + "/include")) + #:phases #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install-distribution" + make-flags)))))) + (inputs (list libxml2 spirv-headers spirv-tools)) + (native-inputs (list git python)) + (home-page "https://github.com/microsoft/DirectXShaderCompiler") + (synopsis + "Compiler and related tools used to compile High-Level Shader Language (HLSL)") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools used to compile High-Level Shader Language (HLSL) programs into DirectX +Intermediate Language (DXIL) representation. Applications that make use of +DirectX for graphics, games, and computation can use it to generate shader +programs.") + (license license:ncsa)))