From: Vitaliy Shatrov via Guix-patches via <guix-patches@gnu.org>
To: "40495@debbugs.gnu.org" <40495@debbugs.gnu.org>
Subject: [bug#40495] v2, spirv tests steel fail
Date: Sat, 11 Apr 2020 11:11:08 +0000 [thread overview]
Message-ID: <8gkWhyC3kxgwDJZBCBNOP_75zxyfYdPVtIzV3S_VTGXyLbh3ygvTNJkjVm5l1b7_wiVm36km0eH13nlB9vvBfAlcTT3FEiHlUTbguEWoFMc=@protonmail.com> (raw)
In-Reply-To: <jZkvxKPG3fdbqhUupvY_Q8AqB9plnxUshnYZxzubWH1q3jMfdBbErjtrCb3wMAZI8wQI2-voDbET4rcZc4jlfreWlYzbpLkAquavgn1rq0E=@protonmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 471 bytes --]
>>> 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.
[-- Attachment #1.2: Type: text/html, Size: 962 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-taisei-and-spirv-cross.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-taisei-and-spirv-cross.patch", Size: 5667 bytes --]
From c39a46fabdd33aafa00c7f190bbc4e11b6e3aae7 Mon Sep 17 00:00:00 2001
From: Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com>
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
next prev parent reply other threads:[~2020-04-11 11:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 19:52 [bug#40495] [PATCH] Add taisei, and spirv-cross Vitaliy Shatrov via Guix-patches via
2020-04-08 6:54 ` Vitaliy Shatrov via Guix-patches via
2020-04-10 17:13 ` Nicolas Goaziou
2020-04-11 7:31 ` [bug#40495] Update Vitaliy Shatrov via Guix-patches via
2020-04-11 11:11 ` Vitaliy Shatrov via Guix-patches via [this message]
2020-04-11 12:29 ` [bug#40495] v3-- fixed indentation Vitaliy Shatrov via Guix-patches via
2020-04-11 20:23 ` Nicolas Goaziou
2020-04-12 4:10 ` [bug#40495] update Vitaliy Shatrov via Guix-patches via
2020-06-30 15:27 ` Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='8gkWhyC3kxgwDJZBCBNOP_75zxyfYdPVtIzV3S_VTGXyLbh3ygvTNJkjVm5l1b7_wiVm36km0eH13nlB9vvBfAlcTT3FEiHlUTbguEWoFMc=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=40495@debbugs.gnu.org \
--cc=D0dyBo0D0dyBo0@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.