From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mLrjI5ewimagUgAAqHPOHw:P1 (envelope-from ) for ; Sun, 07 Jul 2024 15:13:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id mLrjI5ewimagUgAAqHPOHw (envelope-from ) for ; Sun, 07 Jul 2024 17:13:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b=PWt9tMYA; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=i3zHWIOo; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720365136; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LTuMjn25BdLpVeUA6xG49uvhyYAanwMfFtRR4FI5I68=; b=FVyCh9D2/PWceWo4pWiijAPcQ7UjctzqwmIM+fSqBnnKmwVM+MQWyq9RDn9KjUZS3nK52r 0IpfjwQ2f+vC7G7/6QdjhI6EMermhVcpW/8CQJmNqP5Abm3UJ4OmRCG6dpJuN3783141d3 9swgAbD7ZdE1Rd1A6d5hpMr3b9FzFSDi9I9f+M2/IUQU1E0wP4VHr7LQZI7X3bi8XjGH7T ZqIlUEsaWfI3ZQZMkCUNEXSjwDg+pOKPeLKmFElPz5Fkq/nNhtnG9AZoW8HCJPHbCmWlsG jKFNt1xcOfHG9o4xyeM71QplnjR3rSo4Z1ZjNH8FhMu1+daV6+j3755u8XDKcA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720365136; a=rsa-sha256; cv=none; b=b3BR5324nqYBIOgqEN3H1TsT2CCRYIMibZKkBup87JQdkK59qLq4iBFSNwk8mNseTs3p0I bocn4uj87WA5XMJz10LWMOzdVqI963Wp+6JWHk/mgqPSbqHAhA50UUEpBmtqZQf1QDAPEq OtC+rMqEpp9vapuvCzv+nHcD7S2HccCj6y+4TLzT72/u+At6/v+YE1dsh0YDbcM/bH1JTi rR/5j43Z9OQnmB/FEpixYypQ8pozoIvPWUOc7vP9ZRJohzl1WNMDWDK5EhyQ33RFOgPOqq mGPui5Bcw05XGrPIzLP2gJq65etrkFGeYc5EY+g3agb7Jm4zm8+TZq5DvxCfmg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm3 header.b=PWt9tMYA; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=i3zHWIOo; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B0BA43FC4A for ; Sun, 07 Jul 2024 17:12:16 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQTYX-0005cP-28; Sun, 07 Jul 2024 11:12:01 -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 1sQTYV-0005bN-1p for guix-patches@gnu.org; Sun, 07 Jul 2024 11:11:59 -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 1sQTYU-0007Bg-N1 for guix-patches@gnu.org; Sun, 07 Jul 2024 11:11:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQTYX-00029Q-Qc; Sun, 07 Jul 2024 11:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69461] [PATCH] gnu: Add directx-shader-compiler. References: In-Reply-To: Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, john.kehayias@protonmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2024 15:12:01 +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: patch To: 69461@debbugs.gnu.org Cc: dan , John Kehayias , Liliana Marie Prikler X-Debbugs-Original-Xcc: dan , John Kehayias , Liliana Marie Prikler Received: via spool by 69461-submit@debbugs.gnu.org id=B69461.17203651128250 (code B ref 69461); Sun, 07 Jul 2024 15:12:01 +0000 Received: (at 69461) by debbugs.gnu.org; 7 Jul 2024 15:11:52 +0000 Received: from localhost ([127.0.0.1]:48996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTYN-00028z-KP for submit@debbugs.gnu.org; Sun, 07 Jul 2024 11:11:52 -0400 Received: from fhigh8-smtp.messagingengine.com ([103.168.172.159]:50059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQTYK-00028i-Uy for 69461@debbugs.gnu.org; Sun, 07 Jul 2024 11:11:50 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 509CE11402BC for <69461@debbugs.gnu.org>; Sun, 7 Jul 2024 11:11:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 07 Jul 2024 11:11:39 -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:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1720365099; x=1720451499; bh=LTuMjn25BdLpVeUA6xG49 uvhyYAanwMfFtRR4FI5I68=; b=PWt9tMYAgoA+OyE4LfEZOp2L5wuXq4Dx/2KMC puK1hFGd2DLCKOrj0cKPuyRYokng1NfclM93Xl/fiY2GYjCBpRYYGiUk9yDK0g1Z X4DHCD9+rn6slSitEc27EGMA4vP9x8uqRRCF2je5deuDQcBSQlpcd5yQs4Qut7zO U6Ea6rnLcMOUo0d6kNOaFyiPSvboEm7VKRTcHfUUXHbm9DmUz1EZFt36IEVAIwbl nk52z/91f6gxiiq651PFnoIe1tNH68NuYsixxQoxx4Oxdr+pmMTpiCP9m253d+eG Ef7BsgFsnUZo7qwnXFPOmmlVKQYwXwPrNVm5lCFtL87dxxI/Q== 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 :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720365099; x=1720451499; bh=LTuMjn25BdLpVeUA6xG49uvhyYAa nwMfFtRR4FI5I68=; b=i3zHWIOojSy7tpSc9shq4bKA1h4NdM9jtQRfwRkqNiMc P5ZrGv7O89Q5P8qIsOuRD5qmZ0XJmal+pdOgbl5rl3sz5s+U05+67GdQ3bzGhX/4 cYrXVhxeYMpaoyeNxkIepnNMQBazBZ1KN3i4zzxsWigoOHL4xIJlGOkdjpYtlHO6 7/rEdthxdUxQtEd23FSC2tmMgEYaL1m9wztg+HKf1jVOySgMln93L5ZH2qUtQLAY +kk10LraaKEWYOXQLTZjq22zTF6wBMBOuIAcYS8IelJTMNvuTBPj1Iu2sfr+ASmp 3v3jvzlxqy/hy62jL5tjjHF7qKemhsVKuPlptk6vWg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehgdekjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthhtvghr nhepudeugfekvedujedutefgkefhiefghefffeehledvtdffheetvdejveekjeekgfekne cuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69461@debbugs.gnu.org>; Sun, 7 Jul 2024 11:11:36 -0400 (EDT) From: dan Date: Sun, 7 Jul 2024 23:11:14 +0800 Message-ID: <28e69dd9147a8e24ece2216f46bb15201b2b0a6a.1720365035.git.i@dan.games> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.51 X-Spam-Score: 0.51 X-Migadu-Queue-Id: B0BA43FC4A X-Migadu-Scanner: mx11.migadu.com X-TUID: BrT2MxlrCPe0 * gnu/packages/vulkan.scm (directx-headers-for-dxc): New variable. Change-Id: I6e81f59ebd7122c007cce2df820359c055df5fd9 --- gnu/packages/vulkan.scm | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 25542c1e06..61d49c7b2b 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-public spirv-headers @@ -642,3 +644,66 @@ (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.2405") + (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 "19rc3nb32ic0bz2vc3nbpb5lw3dh63vnpf2jvdk131m6j7kwbi4k")) + (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 + "@acronym{HLSL, High-Level Shader Language} shader compiler") + (description + "The DirectX Shader Compiler project includes a compiler and related +tools for compiling @acronym{HLSL, High-Level Shader Language} programs into +SPIR-V.") + (license license:ncsa))) base-commit: c86a07bacc2469e7a00fbc66cfe4f322e4bafb06 -- 2.41.0