From patchwork Sat Apr 11 11:11:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 21186 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 779C827BBE4; Sat, 11 Apr 2020 12:12:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,HTML_MESSAGE, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CB89527BBE1 for ; Sat, 11 Apr 2020 12:12:11 +0100 (BST) Received: from localhost ([::1]:50810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNE3X-0002d5-D3 for patchwork@mira.cbaines.net; Sat, 11 Apr 2020 07:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47462) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNE3Q-0002ct-59 for guix-patches@gnu.org; Sat, 11 Apr 2020 07:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNE3O-00033r-Iq for guix-patches@gnu.org; Sat, 11 Apr 2020 07:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNE3O-00033a-50 for guix-patches@gnu.org; Sat, 11 Apr 2020 07:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNE3N-0008Sx-W9 for guix-patches@gnu.org; Sat, 11 Apr 2020 07:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40495] v2, spirv tests steel fail References: In-Reply-To: Resent-From: Vitaliy Shatrov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Apr 2020 11:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "40495@debbugs.gnu.org" <40495@debbugs.gnu.org> Received: via spool by 40495-submit@debbugs.gnu.org id=B40495.158660348232493 (code B ref 40495); Sat, 11 Apr 2020 11:12:01 +0000 Received: (at 40495) by debbugs.gnu.org; 11 Apr 2020 11:11:22 +0000 Received: from localhost ([127.0.0.1]:56194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNE2k-0008Rz-Cv for submit@debbugs.gnu.org; Sat, 11 Apr 2020 07:11:22 -0400 Received: from mail4.protonmail.ch ([185.70.40.27]:25562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNE2i-0008Rk-64 for 40495@debbugs.gnu.org; Sat, 11 Apr 2020 07:11:21 -0400 Date: Sat, 11 Apr 2020 11:11:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=default; t=1586603473; bh=UAWQi6MHTjA8jKcIBWPgFmCl7cxsa/78nMCAWuOn+vw=; h=Date:To:From:Reply-To:Subject:From; b=yAn2DfvgwmefuTuOR+/gAqk++t7xZWpuASs+vMzhcenBjVWYKMevJXbOR1WAyDTEs c3oboQmRWuq2rolY/S5Zguac1aeIelcWTHe40i9OAwYvUJW8KM8xMnACsULoduS6Ou PLKUZV4ociXqEtJwyJ7uGsXAXqptPz7YHaYWyr+8= Message-ID: <8gkWhyC3kxgwDJZBCBNOP_75zxyfYdPVtIzV3S_VTGXyLbh3ygvTNJkjVm5l1b7_wiVm36km0eH13nlB9vvBfAlcTT3FEiHlUTbguEWoFMc=@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" Reply-to: Vitaliy Shatrov , Vitaliy Shatrov via Guix-patches X-Patchwork-Original-From: Vitaliy Shatrov via Guix-patches via From: "ashish.is--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches >>> gl33 works gl33: http://logs.guix.gnu.org/guix/2020-04-07.log#115246 Please also test with gles30 (it's default now). >>> quotes, description removed, cut. >>> (recursive? #t) spirv-cross: gives nothing (to me at least). I'd used `substitute*` to make tests work, but they're fail. spirv-tools is a dependency for spirv-cross tests, and spirv-tools tests also fails. Tests fails, idk how to fix them. Sent with [ProtonMail](https://protonmail.com) Secure Email. From c39a46fabdd33aafa00c7f190bbc4e11b6e3aae7 Mon Sep 17 00:00:00 2001 From: Vitaliy Shatrov Date: Sat, 11 Apr 2020 18:02:59 +0700 Subject: [PATCH] gnu: Add taisei, and spirv-cross * gnu/packages/games.scm (taisei): new variable * gnu/packages/vulkan.scm (spirv-cross): new variable --- gnu/packages/games.scm | 55 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/vulkan.scm | 51 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4f5bca866e..26da35176a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10471,3 +10471,58 @@ and shovers to get to the goal. Race against the clock to collect coins to earn extra balls. Also included is Neverputt, which is a 3D miniature golf game.") ;thanks to Debian for description (license license:gpl2+)))) + +(define-public taisei + (package + (name "taisei") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/taisei-project/" + "taisei/releases/download/v" version + "/taisei-v" version ".tar.xz")) + (sha256 + (base32 + "11f9mlqmzy1lszwcc1nsbar9q1hs4ml6pbm52hqfd4q0f4x3ln46")))) + (build-system meson-build-system) + (arguments + `(;;configure option developer=true enables the diagnostics + ;;needed for bug reports. it is 'true' if not "release" + ;;#:build-type "release" + #:configure-flags + (list "-Dr_default=gles30" + "-Dr_gles20=true" + "-Dr_gles30=true" + "-Dshader_transpiler=true"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python) + ("python-docutils" ,python-docutils) + ("python-pygments" ,python-pygments))) + (inputs + `(("freetype" ,freetype) + ("libpng" ,libpng) + ("libwebp" ,libwebp) + ("libzip" ,libzip) + ("mesa" ,mesa) + ("openssl" ,openssl) + ("opusfile" ,opusfile) + ("sdl2" ,sdl2) + ("sdl2-mixer" ,sdl2-mixer) + ("shaderc" ,shaderc) + ("spirv-cross" ,spirv-cross) + ("zlib" ,zlib))) + (home-page "https://taisei-project.org/") + (synopsis "Fangame and libre clone of Touhou Project") + (description + "Taisei is a shoot-em-up game: The player controls a character (one of +three: Good, Bad, and Dead), dodges the missiles (lots of it cover the screen, +but the character's hitbox is very small), and shoot at the adversaries that +keep appear on the screen.") + (license (list license:expat ;game + license:cc-by4.0 ;resources/00-taisei.pkgdir/bgm/ + ;atlas/portraits/ + ;;miscellaneous + license:cc0 + license:public-domain)))) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6a2c219aac..39dd5215b6 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -107,6 +107,57 @@ 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-04-03") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-Cross") + (commit (string-append version)))) + (sha256 + (base32 + "0489s29kqgq20clxqg22y299yxz23p0yjh87yhka705hm9skx4sa")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;FIXME: Tests fail. + #: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" + (((string-append "PATHS " + "\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}" + "/external/glslang-build/output/bin")) + (string-append "PATHS " + (assoc-ref inputs "glslang") "/bin"))) + (substitute* "CMakeLists.txt" + (((string-append "PATHS " + "\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}" + "/external/spirv-tools-build/output/bin")) + (string-append "PATHS " + (assoc-ref inputs "spirv-tools") "/bin"))) + #t))))) + (native-inputs `(("glslang" ,glslang) + ("python" ,python) + ("spirv-headers" ,spirv-headers) + ("spirv-tools" ,spirv-tools))) + (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.0