From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2ICoF6q9+V6JXgAA0tVLHw (envelope-from ) for ; Mon, 29 Jun 2020 10:08:42 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IJZ8E6q9+V5SCAAAB5/wlQ (envelope-from ) for ; Mon, 29 Jun 2020 10:08:42 +0000 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 09FEC9400B1 for ; Mon, 29 Jun 2020 10:08:42 +0000 (UTC) Received: from localhost ([::1]:52164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpqiP-0006xp-16 for larch@yhetil.org; Mon, 29 Jun 2020 06:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpqhn-0006LK-8b for guix-patches@gnu.org; Mon, 29 Jun 2020 06:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36485) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpqhm-0005YO-UV for guix-patches@gnu.org; Mon, 29 Jun 2020 06:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpqhm-00018H-Pv for guix-patches@gnu.org; Mon, 29 Jun 2020 06:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41778] [PATCH 2/3] gnu: add spirv-cross. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 10:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41778@debbugs.gnu.org Received: via spool by 41778-submit@debbugs.gnu.org id=B41778.15934252494257 (code B ref 41778); Mon, 29 Jun 2020 10:08:02 +0000 Received: (at 41778) by debbugs.gnu.org; 29 Jun 2020 10:07:29 +0000 Received: from localhost ([127.0.0.1]:48021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqhF-00016a-H3 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:29 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:32386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpqh9-00016E-38 for 41778@debbugs.gnu.org; Mon, 29 Jun 2020 06:07:23 -0400 Received: from localhost.localdomain (193-81-159-42.hdsl.highway.telekom.at [193.81.159.42]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49wNT446xJz1LWpc for <41778@debbugs.gnu.org>; Mon, 29 Jun 2020 12:07:20 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49wNT446xJz1LWpc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1593425240; bh=uSrQTOKH6j51Q2vwnk0BnjNXKl1BYsKlLapNC9wDoxQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=QEFjk12cZ2bwwgG7StVxcA3M9cD5I6DYeRF4VsxcOgYVF0zl3u8ZFDw6FPr6EscdP GLyFWuNzrRD0fuEdcyZO4dfJCSSs63xtPk3li/7zux7WtLGMW3L9wqR7YCkaYSluXX 938CIr0KLaFGtgGTlRs2ZExwSac0J1WNb1eynai8= From: Leo Prikler Date: Mon, 29 Jun 2020 12:06:49 +0200 Message-Id: <20200629100649.26638-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 In-Reply-To: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> References: <0e2c18a84e232f73a72d755a692feaece0118396.camel@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=QEFjk12c; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.09 X-TUID: 5t78iwDyu/lY * gnu/packages/vulkan.scm (spirv-cross): New variable. --- gnu/packages/vulkan.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index d5f5be6816..6468b0ec3d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -102,6 +102,55 @@ SPIR-V modules. The project includes an assembler, binary module parser,disassembler, validator, and optimizer for SPIR-V.") (license license:asl2.0))) +(define-public spirv-cross + (package + (name "spirv-cross") + (version "2020-05-19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-Cross") + (commit version))) + (sha256 + (base32 + "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(;; FIXME: The following tests fail: + ;; 15 - spirv-cross-test-opt + ;; 16 - spirv-cross-test-metal-opt + ;; 17 - spirv-cross-test-hlsl-opt + #:tests? #f + #:configure-flags + (list "-DSPIRV_CROSS_SHARED=YES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests-to-find-deps + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/glslang(.*)/bin") + (string-append (assoc-ref inputs "glslang") "/bin"))) + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") + (string-append (assoc-ref inputs "spirv-tools") "/bin"))) + #t))))) + (inputs `(("glslang" ,glslang) + ("spirv-headers" ,spirv-headers) + ("spirv-tools" ,spirv-tools))) + (native-inputs `(("python" ,python))) + (home-page "https://github.com/KhronosGroup/SPIRV-Cross") + (synopsis "Parser for and converter of SPIR-V to other shader languages") + (description + "SPIRV-Cross tries hard to emit readable and clean output from the +SPIR-V. The goal is to emit GLSL or MSL that looks like it was written by a +human and not awkward IR/assembly-like code. NOTE: Individual features are +expected to be mostly complete, but it is possible that certain obscure GLSL +features are not yet supported. However, most missing features are expected +to be \"trivial\" improvements at this stage.") + (license license:asl2.0))) + (define-public glslang (package (name "glslang") -- 2.26.2