From patchwork Tue Apr 7 19:52:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 21153 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 366EE27BBE1; Tue, 7 Apr 2020 20:53:11 +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 6C54B27BBE4 for ; Tue, 7 Apr 2020 20:53:10 +0100 (BST) Received: from localhost ([::1]:52656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLuHW-0003vq-1O for patchwork@mira.cbaines.net; Tue, 07 Apr 2020 15:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52450) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLuHP-0003ve-MB for guix-patches@gnu.org; Tue, 07 Apr 2020 15:53:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLuHO-0006rk-5F for guix-patches@gnu.org; Tue, 07 Apr 2020 15:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLuHO-0006rg-1p for guix-patches@gnu.org; Tue, 07 Apr 2020 15:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jLuHN-0000ob-W9 for guix-patches@gnu.org; Tue, 07 Apr 2020 15:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40495] [PATCH] Add taisei, and spirv-cross Resent-From: Vitaliy Shatrov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Apr 2020 19:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40495@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.15862891723113 (code B ref -1); Tue, 07 Apr 2020 19:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Apr 2020 19:52:52 +0000 Received: from localhost ([127.0.0.1]:50995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLuHD-0000o9-RL for submit@debbugs.gnu.org; Tue, 07 Apr 2020 15:52:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:58161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLuHB-0000o1-OH for submit@debbugs.gnu.org; Tue, 07 Apr 2020 15:52:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52422) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLuH9-0003tK-QI for guix-patches@gnu.org; Tue, 07 Apr 2020 15:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLuH7-0006nJ-Ub for guix-patches@gnu.org; Tue, 07 Apr 2020 15:52:47 -0400 Received: from mail4.protonmail.ch ([185.70.40.27]:38109) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jLuH7-0006mr-9O for guix-patches@gnu.org; Tue, 07 Apr 2020 15:52:45 -0400 Date: Tue, 07 Apr 2020 19:52:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=default; t=1586289162; bh=NINLwCPUiQlIonAgfQd4H+SRgixKgvqpl7T+dpdEtvo=; h=Date:To:From:Reply-To:Subject:From; b=boIALZsLI2E6AwQJHe/TmS4yg/rzuRVXa6rpoCVVPkSa2e0IG9gqbIjUzonJGu7E7 ZuPa4RjnbOo1WEhZqn3ZeZm7juT5yhxqMz4KSFWbuFO2OrjZ8xAR8gKv7JIATGQfil 9y/36KHupNmEcRq1bO09YvRO9O+yxuiPQAClPeqA= Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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 Hi; taisei is a game, it has three renderers: gl33, gles20, and gles30. To support later two it need a SPIRV-Cross tool. I was told on IRC that the game wasn't playable due to graphics issues, but it worked fine on my machine; testing and help are welcome. Game build is "developer" build; it enables cheats, but greatly improves the diagnostics (output to console). If configured as "debugoptimized" with "-Ddeveloper=false", then it's diagnostics are same as for "release". I didn't notice any impact on performance with my 7-years old laptop, from those options. SPIRV-Cross seem to have tests, but i didn't get how to start them yet. Sent with [ProtonMail](https://protonmail.com) Secure Email. From aa3c292907ac78b3df095867f39289b4a7497472 Mon Sep 17 00:00:00 2001 From: Vitaliy Shatrov Date: Wed, 8 Apr 2020 02:28:20 +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 | 56 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/vulkan.scm | 31 +++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1efc50e6d1..711f4779c7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10471,3 +10471,59 @@ 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_gles30=true" + "-Dshader_transpiler=true" + "-Dr_gles20=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. At the same time, player lose one +\"life\" when being hit. If player are out of \"lives\", it’s a Game Over. +Player have a few \"Continues\" to keep playing (but without scores).") + (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..e0a031141f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -107,6 +107,37 @@ 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 ;TODO: solve "No tests were found!!!" + `(#:configure-flags + (list "-DSPIRV_CROSS_SHARED=YES"))) + (inputs `(("spirv-headers" ,spirv-headers))) + (native-inputs `(("pkg-config" ,pkg-config) + ("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.25.1