From patchwork Sat Apr 24 16:39:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 28848 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 18AB927BC7D; Sat, 24 Apr 2021 17:54:15 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id C5E6427BC7C for ; Sat, 24 Apr 2021 17:54:14 +0100 (BST) Received: from localhost ([::1]:36082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laLXq-00060U-0p for patchwork@mira.cbaines.net; Sat, 24 Apr 2021 12:54:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laLK7-00020A-3U for guix-patches@gnu.org; Sat, 24 Apr 2021 12:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laLK6-0001qK-S2 for guix-patches@gnu.org; Sat, 24 Apr 2021 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laLK6-0001Xx-Q3 for guix-patches@gnu.org; Sat, 24 Apr 2021 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47997] [PATCH 1/2] gnu: Add nyan. References: <20210424162243.21166-1-arunisaac@systemreboot.net> In-Reply-To: <20210424162243.21166-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Apr 2021 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47997@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 47997-submit@debbugs.gnu.org id=B47997.16192823805906 (code B ref 47997); Sat, 24 Apr 2021 16:40:02 +0000 Received: (at 47997) by debbugs.gnu.org; 24 Apr 2021 16:39:40 +0000 Received: from localhost ([127.0.0.1]:41364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laLJe-0001X2-GN for submit@debbugs.gnu.org; Sat, 24 Apr 2021 12:39:40 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laLJb-0001Wl-IB for 47997@debbugs.gnu.org; Sat, 24 Apr 2021 12:39:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tTNlXw1SoXu0IFVVy8Ahg8UR/yYzwPXkNssnMQlEBVk=; b=E3d2lY4UmVeI4jKa7R38vT1vAa MGiJd3fzH7X0hh1BwpCqYsIs5d5B9YE2MsZbqutQJS0ZHOJkvvWdI8wDeA339IPpqONhyErYzJqGH 3lqmZ6JC8OWNicE93rMB71U4Hjoa5gtTbb04HpcuEIUAMBYk4tJufxFhKdICmUWFnB0Hx/03K802u hql5O9E4j5CZId3DtuxYjcM5MKNsXnVtdEAfc+FOt0aRa+YqctmmSZaFbT6t+CuMcYOGJUOfsSkS9 7xEw/zFF82/tIf64rbmnPkoIgBnR9rwfvK20I4tJqiSf2+xjuklZWEtkPft1hw2ksCvCxaFvwGinU 2wBrxBJA==; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1laLJY-000fpr-Os; Sat, 24 Apr 2021 22:09:28 +0530 From: Arun Isaac Date: Sat, 24 Apr 2021 22:09:25 +0530 Message-Id: <20210424163926.22301-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (nyan): New variable. --- gnu/packages/games.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5b316f1997..4d565395ee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira -;;; Copyright © 2017, 2018, 2020 Arun Isaac +;;; Copyright © 2017, 2018, 2020, 2021 Arun Isaac ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur @@ -12419,3 +12419,34 @@ game FPS.") implemented using ncurses user interface. An SDL graphical version is also available.") (license license:gpl3+))) + +(define-public nyan + (package + (name "nyan") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SFTtech/nyan") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jx874hmj7102ir4z95np5dgmavnh5dgj5iyz0ga8h4wa82n58dv")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "./nyan/nyancat" "--test-parser" + "-f" "../source/test/test.nyan")))))) + (native-inputs + `(("flex" ,flex))) + (home-page "https://github.com/SFTtech/nyan") + (synopsis "Data description language for openage") + (description "nyan is a data description language. It stores hierarchical +objects with key-value pairs in a database with the key idea that changes in a +parent affect all children. The main focus is readability and moddability.") + (license license:lgpl3+))) From patchwork Sat Apr 24 16:39:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 28847 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 D4A4727BC7D; Sat, 24 Apr 2021 17:53:35 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id 68BB427BC7C for ; Sat, 24 Apr 2021 17:53:35 +0100 (BST) Received: from localhost ([::1]:34826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laLXC-0005Sw-KD for patchwork@mira.cbaines.net; Sat, 24 Apr 2021 12:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laLK6-0001zK-OA for guix-patches@gnu.org; Sat, 24 Apr 2021 12:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laLK6-0001qF-Ft for guix-patches@gnu.org; Sat, 24 Apr 2021 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laLK6-0001Xq-DF for guix-patches@gnu.org; Sat, 24 Apr 2021 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47997] [PATCH 2/2] gnu: Add openage. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Apr 2021 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47997@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 47997-submit@debbugs.gnu.org id=B47997.16192823745895 (code B ref 47997); Sat, 24 Apr 2021 16:40:02 +0000 Received: (at 47997) by debbugs.gnu.org; 24 Apr 2021 16:39:34 +0000 Received: from localhost ([127.0.0.1]:41362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laLJe-0001X0-4N for submit@debbugs.gnu.org; Sat, 24 Apr 2021 12:39:34 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laLJb-0001Wk-Hl for 47997@debbugs.gnu.org; Sat, 24 Apr 2021 12:39:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2QRiF6wo2HP0EyK4So7NzdlE1VmZCuj5t3/x1scw+dg=; b=KP22lTky7Jrcj9Ifm4sBbLHy51 dswlTFog8OtWvswX1ykb/yKnqLgqoxCnqgSpovqvtM7KVfK8iBpaxLiPPCFY7O1FsBqJq+U2Dk5V+ KdlTFuGhG+psky5MRp/ddhMsix3yL7KF5gPlwNZiA5cGAU9MZR8DVLyPxZokogrw2IuetowwuzjG3 VEOGEe0lI71sirZ7YBiUUCr5Cue3xCSmtJEw/7TLvzcjYsDqUsRaXEkUwW2YZ5ts2Bi/YwYnG1bpt dDwpCBlLqW0UkjLZZSwRemAECe/biUV3tbLrdjJyt6cyVE+d2X0UW5L8EWMWvVZVOkHSu9v8QHZob IsTajJ0w==; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1laLJY-000fpr-V2; Sat, 24 Apr 2021 22:09:29 +0530 From: Arun Isaac Date: Sat, 24 Apr 2021 22:09:26 +0530 Message-Id: <20210424163926.22301-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210424163926.22301-1-arunisaac@systemreboot.net> References: <20210424163926.22301-1-arunisaac@systemreboot.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (openage): New variable. --- gnu/packages/games.scm | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4d565395ee..9f4ac40507 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12450,3 +12450,76 @@ available.") objects with key-value pairs in a database with the key idea that changes in a parent affect all children. The main focus is readability and moddability.") (license license:lgpl3+))) + +(define-public openage + (package + (name "openage") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SFTtech/openage") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "051hy0s0crdavaghwzv9airq5yrhmk2a6b3ckc7dhr1851yanynp")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DCMAKE_PY_INSTALL_PREFIX=" + %output "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages") + (string-append "-DGLOBAL_CONFIG_DIR=" %output "/etc/openage")) + #:modules ((guix build cmake-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build python-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'wrap-python 'wrap-qt + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") "/bin/openage") + `("QML2_IMPORT_PATH" ":" prefix + ,(map (lambda (name) + (string-append (assoc-ref inputs name) + "/lib/qt5/qml")) + (list "qtdeclarative" "qtquickcontrols"))))))))) + (inputs + `(("eigen" ,eigen) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) + ("libepoxy" ,libepoxy) + ("nyan" ,nyan) + ("opusfile" ,opusfile) + ("python" ,python) + ("python-jinja2" ,python-jinja2) + ("python-numpy" ,python-numpy) + ("python-pillow" ,python-pillow) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols" ,qtquickcontrols) + ("sdl" ,(sdl-union (list sdl2 sdl2-image))))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-pygments" ,python-pygments))) + (home-page "https://openage.sft.mx/") + (synopsis "Clone of the Age of Empires II engine") + (description "openage is a cross-platform real-time strategy game engine +that provides the mechanics of Age of Empires. It aims to be a platform for +the original Age of Empires games providing the same look and feel, but with +more features for modding and multiplayer.") + (license (list license:gpl3+ + ;; buildsystem/modules/FindSDL2.cmake, + ;; buildsystem/modules/FindGPerfTools.cmake, + ;; buildsystem/modules/FindOpusfile.cmake + license:bsd-3 + ;; libopenage/util/compress/lzxd.cpp, + ;; doc/code/lzx_compression_info + license:lgpl2.0))))