From: polyakov@liltechdude.xyz
To: 46378@debbugs.gnu.org
Cc: Dmitry Polyakov <liltechdude@gmail.com>
Subject: [bug#46378] [PATCH] gnu: Add instead.
Date: Mon, 8 Feb 2021 09:11:20 -0500 [thread overview]
Message-ID: <20210208141120.9184-1-polyakov@liltechdude.xyz> (raw)
In-Reply-To: <87o8gv58h0.fsf@liltechdude.xyz>
From: Dmitry Polyakov <liltechdude@gmail.com>
* gnu/local.mk (instead): New variable.
* gnu/packages/patches/instead-use-games-path.patch:
Patch for engine that enable set game directory
location in environment.
---
gnu/local.mk | 2 +
gnu/packages/game-development.scm | 53 +++++++++++++++++++
.../patches/instead-use-games-path.patch | 28 ++++++++++
3 files changed, 83 insertions(+)
create mode 100644 gnu/packages/patches/instead-use-games-path.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index b9b4b66..923231f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -40,6 +40,7 @@
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
# Copyright © 2020 Vinicius Monego <monego@posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+# Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
#
# This file is part of GNU Guix.
#
@@ -1187,6 +1188,7 @@ dist_patch_DATA = \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
+ %D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 92c3da9..018d946 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1961,6 +1962,58 @@ all modern computing platforms. Each library component is fairly independent
of the others")
(license license:lgpl2.0+)))
+(define-public instead
+ (package
+ (name "instead")
+ (version "3.3.2")
+ (build-system cmake-build-system)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/instead-hub/instead")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "014wfz5z5x72rhnakczpgfyw8s6bq510bxfmn4gv66jahkh4b65f"))
+ (patches
+ (search-patches
+ "instead-use-games-path.patch"))))
+ (arguments
+ '(#:configure-flags
+ (list (string-append
+ "-DLUA_INCLUDE_DIR="
+ (assoc-ref %build-inputs "luajit") "/include/luajit-2.1/")
+ "-DWITH_LUAJIT=1"
+ "-DWITH_GTK3=1")
+ #:tests? #f))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("sdl2-images" ,sdl2-image)
+ ("sdl2-ttf" ,sdl2-ttf)
+ ("lua" ,lua)
+ ("sdl2-mixer" ,sdl2-mixer)
+ ("luajit" ,luajit)
+ ("gtk+",gtk+)))
+ (home-page "https://instead3.syscall.ru/")
+ (synopsis "Text adventure interpreter")
+ (description "The interpreter of STEAD (Simple Text Adventures) allows one
+to play games that combine visual novels, text adventures and classic quests
+of 1990-s. The STEAD games features are:
+@enumerate
+@item Very simple source code of the stories. (based on LUA);
+@item Graphical game interface;
+@item Supports music and images;
+@item Theme support - a game may change the interface look;
+@end enumerate")
+ (license (list license:gpl2 license:zlib))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "INSTEAD_GAMES_PATH")
+ (separator #f) ;single entry
+ (files '("share/instead/games")))))))
+
(define-public ioquake3
;; We follow master since it seems that there won't be releases after 1.3.6.
(let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0"))
diff --git a/gnu/packages/patches/instead-use-games-path.patch b/gnu/packages/patches/instead-use-games-path.patch
new file mode 100644
index 0000000..e081506
--- /dev/null
+++ b/gnu/packages/patches/instead-use-games-path.patch
@@ -0,0 +1,28 @@
+From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00 2001
+From: Dmitry Polyakov <liltechdude@gmail.com>
+Date: Wed, 3 Feb 2021 14:33:37 -0500
+Subject: [PATCH] add support to get game directory location from environent
+
+---
+ src/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 9e6e2c3b..860bd3aa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -366,6 +366,12 @@ int instead_main(int argc, char *argv[])
+ setdir(game_cwd);
+ profile_load(NULL);
+
++ char *gamespath_env = NULL;
++
++ if (gamespath_env = getenv("INSTEAD_GAMES_PATH"), gamespath_env != NULL) {
++ games_sw = strdup(gamespath_env);
++ }
++
+ for (i = 1; i < argc; i++) {
+ if (lua_sw) /* during load profile */
+ break;
+--
+2.30.0
--
2.30.0
next prev parent reply other threads:[~2021-02-08 19:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 7:23 [bug#46378] [PATCH] gnu: Add instead Dmitry Polyakov
2021-02-08 12:46 ` Leo Prikler
2021-02-08 13:04 ` Dmitry Polyakov
2021-02-08 14:11 ` polyakov [this message]
2021-02-08 15:46 ` Leo Prikler
2021-02-08 17:15 ` Dmitry Polyakov
2021-02-08 17:43 ` Leo Prikler
2021-08-04 12:29 ` polyakov
2021-08-04 13:50 ` bug#46378: " Leo Prikler
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=20210208141120.9184-1-polyakov@liltechdude.xyz \
--to=polyakov@liltechdude.xyz \
--cc=46378@debbugs.gnu.org \
--cc=liltechdude@gmail.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.