From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QMAdD9dvIWCcJgAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 17:07:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sHvxCtdvIWAyVQAA1q6Kng (envelope-from ) for ; Mon, 08 Feb 2021 17:07:35 +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 317B69402B1 for ; Mon, 8 Feb 2021 17:07:34 +0000 (UTC) Received: from localhost ([::1]:60842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9A0b-0002eT-3U for larch@yhetil.org; Mon, 08 Feb 2021 12:07:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l92nB-0007nC-61 for guix-patches@gnu.org; Mon, 08 Feb 2021 04:25:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l92n1-00065p-8K for guix-patches@gnu.org; Mon, 08 Feb 2021 04:25:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l92n1-00036B-42 for guix-patches@gnu.org; Mon, 08 Feb 2021 04:25:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46378] [PATCH] gnu: Add instead. Resent-From: Dmitry Polyakov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Feb 2021 09:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46378 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46378@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161277625711820 (code B ref -1); Mon, 08 Feb 2021 09:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2021 09:24:17 +0000 Received: from localhost ([127.0.0.1]:49803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l92mG-00034Y-A2 for submit@debbugs.gnu.org; Mon, 08 Feb 2021 04:24:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:54050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l90tH-00048r-7s for submit@debbugs.gnu.org; Mon, 08 Feb 2021 02:23:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l90tF-00084D-OU for guix-patches@gnu.org; Mon, 08 Feb 2021 02:23:22 -0500 Received: from liltechdude.xyz ([136.244.109.117]:46160 helo=mail.liltechdude.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l90tD-0000rP-Kx for guix-patches@gnu.org; Mon, 08 Feb 2021 02:23:21 -0500 Received: from localhost (unknown [188.43.12.45]) by mail.liltechdude.xyz (Postfix) with ESMTPSA id EE3242F228A for ; Mon, 8 Feb 2021 07:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=liltechdude.xyz; s=mail; t=1612768990; bh=S1/KdOpxKkXSyyEeUuQGgxPqhmU77PaWsVLE+Mu3tAg=; h=From:To:Subject:Date:From; b=nb5Bw3Hp7AYmLX0MZU/TBJDN69OHNsO1y/rmri1HnRPYwizUXBm57yp97qnBZj9Q1 f0pyyQvkmFUG/BNQHTCJQ5Y9fts9C+JGDOcZCZyZlFw+BPwbDUUVuJOLUl9F9IvCtr 9o/Jd/W2tJge1CsPJ0VcNfADEo21n2iQRAvLZ4e4O2Enm0DUKe6nurNjbF73oxsiAO 5B/4fPfPeZaIQbKkKDM3Vhzt+AORnSqrYA/f1iVozLI1eH3yfA2xZ7JFZb3zOZREhz YTpyucAAjj97HQkPFP3t5Ut9H2gfx0BaHmb9gfBHvNowNZGXywSMQgARKSmOR8qgaT YGj1Mt6F58Dzg== User-agent: mu4e 1.4.15; emacs 28.0.50 From: Dmitry Polyakov Date: Mon, 08 Feb 2021 02:23:07 -0500 Message-ID: <87o8gv58h0.fsf@liltechdude.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=136.244.109.117; envelope-from=polyakov@liltechdude.xyz; helo=mail.liltechdude.xyz X-Spam_score_int: 24 X-Spam_score: 2.4 X-Spam_bar: ++ X-Spam_report: (2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=1.997, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 08 Feb 2021 04:24:15 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 08 Feb 2021 09:30:18 -0500 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 X-Migadu-Spam-Score: -3.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=liltechdude.xyz header.s=mail header.b=nb5Bw3Hp; dmarc=fail reason="SPF not aligned (relaxed)" 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: 317B69402B1 X-Spam-Score: -3.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: N5p8MPWZz7VQ --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable hope this work From=20b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00 2001 From: Dmitry Polyakov Subject: [PATCH] gnu: Add instead. * gnu/local.mk (instead): New variable. =2D-- gnu/local.mk | 2 + gnu/packages/game-development.scm | 45=20 +++++++++++++++++++ .../patches/instead-use-games-path.patch | 28 ++++++++++++ 3 files changed, 75 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 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -40,6 +40,7 @@ # Copyright =C2=A9 2020 Malte Frank Gerdes # Copyright =C2=A9 2020 Vinicius Monego # Copyright =C2=A9 2021 Bj=C3=B6rn H=C3=B6fling +# Copyright =C2=A9 2021 Dmitry Polyakov # # This file is part of GNU Guix. # @@ -1187,6 +1188,7 @@ dist_patch_DATA =3D \ %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=20 b/gnu/packages/game-development.scm index 92c3da9..a117058 100644 =2D-- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2020 Nicolas Goaziou ;;; Copyright =C2=A9 2020 Timotej Lazar ;;; Copyright =C2=A9 2020 Giacomo Leidi +;;; Copyright =C2=A9 2021 Dmitry Polyakov ;;; ;;; This file is part of GNU Guix. ;;; @@ -1961,6 +1962,50 @@ all modern computing platforms. Each library=20 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=20 "014wfz5z5x72rhnakczpgfyw8s6bq510bxfmn4gv66jahkh4b65f")) + (patches + (search-patches + "instead-use-games-path.patch")))) + (arguments + '(#:configure-flags + (list (string-append + "-DLUA_INCLUDE_DIR=3D" + (assoc-ref %build-inputs "luajit")=20 "/include/luajit-2.1/") + "-DWITH_LUAJIT=3D1" + "-DWITH_GTK3=3D1") + #: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 "Simple text adventure interpreter for Unix and=20 Windows") + (description "Simple text adventure interpreter for Unix and=20 Windows.") + (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=20 after 1.3.6. (let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0")) diff --git a/gnu/packages/patches/instead-use-games-path.patch=20 b/gnu/packages/patches/instead-use-games-path.patch new file mode 100644 index 0000000..2e460bf =2D-- /dev/null +++ b/gnu/packages/patches/instead-use-games-path.patch @@ -0,0 +1,28 @@ +From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00=20 2001 +From: Dmitry Polyakov +Date: Wed, 3 Feb 2021 14:33:37 -0500 +Subject: [PATCH] add custom gamedir support + +--- + 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 =3D NULL; ++ ++ if (gamespath_env =3D getenv("INSTEAD_GAMES_PATH"), gamespath_env=20 !=3D NULL) { ++ games_sw =3D strdup(gamespath_env); ++ } ++ + for (i =3D 1; i < argc; i++) { + if (lua_sw) /* during load profile */ + break; +-- +2.30.0 =2D- 2.30.0 =2D- =E9=AD=94=E6=B3=95=E5=B0=91=E5=A5=B3=E3=83=AA=E3=83=AB=E3=83=86=E3=83=81=E3= =83=85=E3=83=87=E3=81=A7=E3=81=99=E3=82=88=E3=80=82 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJNBAEBCgA3FiEEAbBRoIRjq1x/LhdPuT3EB6aJ2cMFAmAg5tsZHHBvbHlha292 QGxpbHRlY2hkdWRlLnh5egAKCRC5PcQHponZw4MmD/9FcfEeFlKSgolZpK0VeoRs Jy+kVVJljAg2sQIev4FXLls4U3GuDYi/YOHJKOjLpgL/AogeI+p1xbujLP9Fi9uG eqsW0rXAqSqDbOFQUnRh17AFbbBYeEntFL8gAWehxzt59DIiak+E6STnPjrfpXck wdrDxVK1DJ92ncJMhyBwbQvXfGAYPhKItKWAl1CTJF4Eh8zruUj0jgn8led4LHMt /NCcRZQhefMh8rTI/4u2FuuOBCW/9eQeoDC/b+fEmF4RB0ANf2SqlkQOaU8LMVsr Aj8XyG3OCwDfmOQmxYmYmvEBj31mRGaA/REO2MwbQnTpC9CQjd0M/tRP2WmSZfEX VWgxHEYCckcpTK0JyHRMlsofybCp8gISm544jB/BnKvGRmnmOzMpOgIXQm5Rz3yq utlV6IO8tnuTLjORI8fZhxOAMCAcOsYgtrjwWd0gXcDBEzlYaYFkaN7rIxz+Xmsd qpIzyxp4xQU46qnDUva4IL6D0Ia2kizOoP8Awxbc8zhRSBm+V3OpDYzUPK94fRF9 qCQ7fxppA3SApR6ooAQYEanViwvxLiix/79Ysx+YKpgq034HE0BhtOui+P8Nf4DN rCw99L8fvWSBDbfcKlij518X17zgrtadxHk+eIgO8lJTiNVrIQGX31IcPB9d3Akn R/TiNObrrFx6/4/2Zt4dFg== =/UGL -----END PGP SIGNATURE----- --=-=-=--