From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OPgeC2KICmHEMAEAgWs5BA (envelope-from ) for ; Wed, 04 Aug 2021 14:30:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id WFK4BmKICmGmcQAAbx9fmQ (envelope-from ) for ; Wed, 04 Aug 2021 12:30:26 +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 E2D84C0E0 for ; Wed, 4 Aug 2021 14:30:24 +0200 (CEST) Received: from localhost ([::1]:55184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBG2R-0003Gb-Bg for larch@yhetil.org; Wed, 04 Aug 2021 08:30:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBG26-0003Dk-Iw for guix-patches@gnu.org; Wed, 04 Aug 2021 08:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBG26-0007km-AH for guix-patches@gnu.org; Wed, 04 Aug 2021 08:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mBG25-0003DB-TO for guix-patches@gnu.org; Wed, 04 Aug 2021 08:30:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46378] [PATCH] gnu: Add instead. References: <87o8gv58h0.fsf@liltechdude.xyz> In-Reply-To: <87o8gv58h0.fsf@liltechdude.xyz> Resent-From: polyakov@liltechdude.xyz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Aug 2021 12:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46378 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46378@debbugs.gnu.org Cc: Dmitry Polyakov , leo.prikler@student.tugraz.at Received: via spool by 46378-submit@debbugs.gnu.org id=B46378.162808018412235 (code B ref 46378); Wed, 04 Aug 2021 12:30:01 +0000 Received: (at 46378) by debbugs.gnu.org; 4 Aug 2021 12:29:44 +0000 Received: from localhost ([127.0.0.1]:43033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBG1h-0003B7-Gn for submit@debbugs.gnu.org; Wed, 04 Aug 2021 08:29:44 -0400 Received: from mx1.liltechdude.xyz ([78.141.217.207]:21731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBG1f-0003Ax-7B for 46378@debbugs.gnu.org; Wed, 04 Aug 2021 08:29:36 -0400 Received: from localhost.localdomain ( [194.247.25.14]) by freebsd (OpenSMTPD) with ESMTPSA id d803f7fa (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 4 Aug 2021 12:29:32 +0000 (UTC) From: polyakov@liltechdude.xyz Date: Wed, 4 Aug 2021 17:29:12 +0500 Message-Id: <20210804122912.20268-1-polyakov@liltechdude.xyz> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628080225; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=pxTQhHWqqQMFwOBwYfhToCX3/T/WSVd+r7zyd1Udt6U=; b=W+z4JdjhAIE8EgkkFz3nQlhtRZGKbEhiVCLOFgGtGGgooNY3s3DNWjQO+Y83mSkE1JG2bf /l9Nod2VC2TogQYR5JMcXVOT2xrvub9M4I1Un/Al/KlJDcQn1/E1cuvv+PiwULFh7h69ND YOIrVy8oXbCnItT88Qo+kQvn87qidkyHLhobaCTEdOdzqFqWaODLgz3GqStlhAMv6/JanE eAMAKalc5WNXirmA2i87UGHc+Q6gmYUx67V8CeWTRZpCOXVXMnZt1015/MnxiUDQ5EtdzV b6bUJjgicHhZN7lgBb9a5l5t2Jxo5tpTCgjTq+SaeLsISwvIYGOD7k9x523dwA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628080225; a=rsa-sha256; cv=none; b=qGWv2vDF6KEP3rBXH55k93dATOBKTcN5Zu8p+lAxMO/C922OgduYAhYa5q+UP6NrOXh8Qx WDW0wkCHx2CtwgMyegAWWLita+r0/0eZ1Y39gTT/lcwYncFU5EqOpJJHABv1DN0+FdelNz O2M3zc4NqE2W7PptvQQsZ6VLIqf0kHHWotfR6s7gY7pLTmtvPomzGY82KYb8XpFtrrQ39G QJoPyCWILLWsSgOL1eTfyws78pNZzyD1bST8T8q4M7T04Bwpo9f5dYeDVnixRBvD9ow+7I PzsGspBPi3ldtTTv6EJZ0KJzr8nkq3CcBLDigDY0z3bGkScVXMLqnAMFmMGIUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=liltechdude.xyz (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-Migadu-Spam-Score: -1.31 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=liltechdude.xyz (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-Migadu-Queue-Id: E2D84C0E0 X-Spam-Score: -1.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: sITPYArptquS From: Dmitry Polyakov * gnu/local.mk (dist_patch_DATA): Register the patch. * gnu/packages/patches/instead-use-games-path.patch: New file. --- gnu/local.mk | 2 + gnu/packages/game-development.scm | 52 +++++++++++++++++++ .../patches/instead-use-games-path.patch | 32 ++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 gnu/packages/patches/instead-use-games-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index e849480..0c45ae5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -43,6 +43,7 @@ # Copyright © 2021 Philip McGrath # Copyright © 2021 Arun Isaac # Copyright © 2021 Sharlatan Hellseher +# Copyright © 2021 Dmitry Polyakov # # This file is part of GNU Guix. # @@ -1261,6 +1262,7 @@ dist_patch_DATA = \ %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.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/inkscape-1.1-fix-build-witch-gcc7.5.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index e1593c0..4164b20 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Alexandru-Sergiu Marton +;;; Copyright © 2021 Dmitry Polyakov ;;; ;;; This file is part of GNU Guix. ;;; @@ -2115,6 +2116,57 @@ upon which people base their games, ports to new platforms, and other projects.") (license license:gpl2)))) +(define-public instead + (package + (name "instead") + (version "3.3.5") + (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 "02j8cw623j51qmr4991i5hsbrzmnp0qfzds8m6nwwr15sjv3hv1g")) + (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)) + (inputs + `(("sdl2-images" ,sdl2-image) + ("sdl2-ttf" ,sdl2-ttf) + ("lua" ,lua) + ("pkg-config" ,pkg-config) + ("sdl2-mixer" ,sdl2-mixer) + ("luajit" ,luajit) + ("gtk+",gtk+))) + (home-page "https://instead3.syscall.ru/") + (synopsis "Text adventure interpreter") + (description "The STEAD (Simple TExt ADventures) interpreter provide +functionality to play games that combine visual novels, text adventures +and classic quests of 1990-s. STEAD games feature: +@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 license:gpl2) + (native-search-paths + (list (search-path-specification + (variable "INSTEAD_GAMES_PATH") + (separator #f) ;single entry + (files '("share/instead/games"))))))) + (define-public openvr (package (name "openvr") 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..52e96ed --- /dev/null +++ b/gnu/packages/patches/instead-use-games-path.patch @@ -0,0 +1,32 @@ +From 8b350daa847dd8e131d9e6b5b4434ce68a7903d0 Mon Sep 17 00:00:00 2001 +From: Dmitry Polyakov +Date: Wed, 4 Aug 2021 15:46:33 +0500 +Subject: [PATCH] [PATCH] Add support for INSTEAD_GAMES_PATH + +In certain cases, the user needs to determinate by himself where the +games will be stored. Using an environment variable is the most common +way to provide the user with this capability. +--- + src/main.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/main.c b/src/main.c +index ba0ada1d..b05497b8 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -394,6 +394,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.32.0 + -- 2.32.0