From patchwork Tue Mar 14 06:57:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 47957 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 CBE6A16EA5; Tue, 14 Mar 2023 06:58:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CFE9F16E4E for ; Tue, 14 Mar 2023 06:58:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbybk-0002tj-QW; Tue, 14 Mar 2023 02:58:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbybj-0002tV-3W for guix-patches@gnu.org; Tue, 14 Mar 2023 02:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbybi-0004uK-QM for guix-patches@gnu.org; Tue, 14 Mar 2023 02:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbybi-0007mV-DY for guix-patches@gnu.org; Tue, 14 Mar 2023 02:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62178] [PATCH 1/5] gnu: Add fgeal. References: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> In-Reply-To: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 06:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62178@debbugs.gnu.org Cc: Liliana Marie Prikler , iyzsong@envs.net Received: via spool by 62178-submit@debbugs.gnu.org id=B62178.167877704529854 (code B ref 62178); Tue, 14 Mar 2023 06:58:02 +0000 Received: (at 62178) by debbugs.gnu.org; 14 Mar 2023 06:57:25 +0000 Received: from localhost ([127.0.0.1]:36096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyb7-0007lS-3w for submit@debbugs.gnu.org; Tue, 14 Mar 2023 02:57:25 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyb4-0007lJ-Cb for 62178@debbugs.gnu.org; Tue, 14 Mar 2023 02:57:23 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9D74644593; Tue, 14 Mar 2023 07:57:21 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5omTNKjCcRU8; Tue, 14 Mar 2023 07:57:20 +0100 (CET) Message-ID: <21349edf-d7fa-ec74-e40f-7fc155658449@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678777040; bh=jciicnkvX5BnfEH1W39R6Hmj/8U8Yd/ZBzd/LPLgxpU=; h=Date:To:Cc:From:Subject; b=c4H6VNthwKFGrT0QcDcdK1XJrAlUPFtXQXi3rKGDh4CDPJg4uK9cO1NxwsJRyHfti Yb1/zbKvpSfx8X2Q3aha0D7DVHrzIZAcsIY8woeN4s6/ykIcUaXlLGU6tM6AJiLnpj W91MUbrzGFuaNxIdHPtO2lTStn3X++y060tQzJ/GtFQesn6QllnKh9yxaxZ+ejysT2 IbmxBEAHwn2XGZsuvux74CBM8+TiwvfigenEE9l6yC0eKthSUClrF6WNmctM6sN3Qw ts7HkYVwYjaPK+pf+QOatKjSJ6ZxFZt8FxsyQj0ELIh55vPVaNefFRH88MCGBpOsM6 q4eHX1LH1s1Kw== Date: Tue, 14 Mar 2023 14:57:16 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From f2dc6209535b2ad8aed999845c0992264cc7aff6 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 14 Mar 2023 13:38:36 +0800 Subject: [PATCH 1/5] gnu: Add fgeal. * gnu/packages/game-development.scm (fgeal): New variable. --- gnu/packages/game-development.scm | 106 ++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a384572a9d..f86793fda0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2359,6 +2359,112 @@ (define-public flatzebra double-buffering.") (license license:gpl2+))) +(define-public fgeal + (let ((commit "0ae72fbf31eb2e133fe83520391e7a82c0b59e67") + (revision "0")) + (package + (name "fgeal") + (version (git-version "0.8.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/hydren/fgeal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lck86n8nkhb088bd0jg4imi9j5l1lwfr2pddqqr880rjrnnm8fw")) + (modules '((guix build utils))) + (snippet + #~(begin + (with-directory-excursion "project/build/linux-gcc-sdl2-release" + (rename-file "configure.sh" "configure") + (substitute* "configure" + (("-exec sed -i") + (string-append + "-exec sed -i" + " \"s,SDL2_CFLAGS,`pkg-config --cflags sdl2`,g\" {} \\;" + " -exec sed -i")) + (("which") "type -p")) + (substitute* "makefile" + (("RM := rm -rf") + (string-append "RM := rm -rf\n" + "PREFIX ?= /usr/local")) + (("clean:") + (string-append + "install:\n\t" + "install -d $(DESTDIR)$(PREFIX)/include\n\t" + "cp -r ../fgeal $(DESTDIR)$(PREFIX)/include\n\t" + "install -d $(DESTDIR)$(PREFIX)/lib\n\t" + "install -m 644 libfgeal.so $(DESTDIR)$(PREFIX)/lib\n\n" + "clean:"))) + (substitute* "extra/subdir.mk" + (("../extra/input_manager.cpp \\\\") + (string-append "../extra/input_manager.cpp \\\n" + "../extra/primitives.cpp \\")) + (("./extra/input_manager.o \\\\") + (string-append "./extra/input_manager.o \\\n" + "./extra/primitives.o \\")) + (("./extra/input_manager.d \\\\") + (string-append "./extra/input_manager.d \\\n" + "./extra/primitives.d \\")))) + (copy-recursively "project/build/linux-gcc-sdl2-release" + "linux-gcc-sdl2-release") + (substitute* (find-files "." "\\.mk") + (("-I\"BUILD_PATH\"") "-I\"BUILD_PATH\" SDL2_CFLAGS")) + (for-each + (lambda (file) + (install-file file "fgeal")) + '("agnostic_cached_drawable_text.hxx" + "agnostic_filesystem.hxx" + "agnostic_sound_stream.hxx" + "colors.hpp" + "core.hpp" + "display.hpp" + "event.hpp" + "exceptions.hpp" + "fgeal.hpp" + "filesystem.hpp" + "font.hpp" + "friend_classes.hxx" + "generic_graphics.hxx" + "geometry.hpp" + "graphics.hpp" + "image.hpp" + "input.hpp" + "sound.hpp" + "version.h")) + (for-each + (lambda (file) + (install-file file "fgeal/extra")) + (find-files "extra" "\\.hpp")))))) + (build-system gnu-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list sdl2 + sdl2-gfx + sdl2-image + sdl2-mixer + sdl2-ttf)) + (arguments + (list #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "linux-gcc-sdl2-release")))) + #:make-flags + #~(list (string-append "DESTDIR=" #$output) + "PREFIX="))) + (home-page "https://gitlab.com/hydren/fgeal") + (synopsis "Simple C++ game library wrapper") + (description "fgeal is a simple C++ wrapper library meant to provide +common functionalities between some game libraries through a single API. + It serves as a cross-platform abstraction layer to other low-level game +libraries, such as SDL.") + (license license:lgpl2.1+)))) + (define-public libccd (package (name "libccd") From patchwork Tue Mar 14 07:02:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 47958 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 36DD816EA5; Tue, 14 Mar 2023 07:03:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 668E716E4E for ; Tue, 14 Mar 2023 07:03:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbyga-0003ev-FT; Tue, 14 Mar 2023 03:03:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbygZ-0003dX-16 for guix-patches@gnu.org; Tue, 14 Mar 2023 03:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbygY-0005cf-Ii for guix-patches@gnu.org; Tue, 14 Mar 2023 03:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbygY-0007vZ-DK for guix-patches@gnu.org; Tue, 14 Mar 2023 03:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62178] [PATCH 2/5] gnu: Add futil. References: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> In-Reply-To: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 07:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62178@debbugs.gnu.org Cc: Liliana Marie Prikler , iyzsong@envs.net Received: via spool by 62178-submit@debbugs.gnu.org id=B62178.167877736030437 (code B ref 62178); Tue, 14 Mar 2023 07:03:02 +0000 Received: (at 62178) by debbugs.gnu.org; 14 Mar 2023 07:02:40 +0000 Received: from localhost ([127.0.0.1]:36103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbygB-0007ul-Uv for submit@debbugs.gnu.org; Tue, 14 Mar 2023 03:02:40 -0400 Received: from knopi.disroot.org ([178.21.23.139]:35848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyg7-0007uZ-UL for 62178@debbugs.gnu.org; Tue, 14 Mar 2023 03:02:36 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4FE6A444AD; Tue, 14 Mar 2023 08:02:35 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k5glQ6pGxYjr; Tue, 14 Mar 2023 08:02:33 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678777353; bh=i9HjcUKA/7s3JW6KUl/OTdMUT/m9kkKCtgYyrYkL1DI=; h=Date:To:Cc:From:Subject; b=YlKhD8rJ5FbdOiufnWf+GeH2tzbCZpSeOj1A7iELmGEioehA1f34TU8q9W8HdeXBA Fta/Jfm5oWItOYUltvoEwnMLLohIhdr+3iOJTKTUvMrwGyBOASBQZlfRhgTDacPbkZ 0Jbw/WUjIQATf3gtPHNh1ujlKpM59BcatFtU+cOIhep1iMA7wERoGM86cIF3beY+qv nOScjkwWEDiw8MtnzM0J3F0sWOdkW1KL1zTdhfVJNOQFgBj/Um3K4XEGleWr60Qveq RzA6up+s1JA3BttXLb6E6DzztFAkLaIvnMs0hn7TLvzUuBtxhZhnoAN3rz8fXZq7EK FXv1wNdCda3gw== Date: Tue, 14 Mar 2023 15:02:30 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From ca7eeb834e5b53667d0ec945454d80794ee2a717 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 14 Mar 2023 13:55:09 +0800 Subject: [PATCH 2/5] gnu: Add futil. * gnu/packages/cpp.scm (futil): New variable. * gnu/packages/patches/futil-Add-Makefile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 38 ++++++++ gnu/packages/patches/futil-Add-Makefile.patch | 91 +++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 gnu/packages/patches/futil-Add-Makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index c2521acf02..1bdbddce5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1133,6 +1133,7 @@ dist_patch_DATA = \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-glibc-2.34.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/futil-Add-Makefile.patch \ %D%/packages/patches/fxdiv-system-libraries.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ed6ae69198..69cda8aacc 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1216,6 +1216,44 @@ (define-public folly (supported-systems '("aarch64-linux" "x86_64-linux")) (license license:asl2.0))) +(define-public futil + (let ((commit "83fcf85cf7638947a44657b2f334c2d8a2d5d02d") + (revision "0")) + (package + (name "futil") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/hydren/futil") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05vyx6n4aqix3w1z76hal9zxzixfxnlw0cg4b06lc1l9gnw6ja71")) + (patches + (search-patches "futil-Add-Makefile.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + (lambda (file) + (install-file file "include/futil")) + (find-files "." "\\.h")))))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure)) + #:make-flags + #~(list (string-append "DESTDIR=" #$output) + "PREFIX="))) + (home-page "https://gitlab.com/hydren/futil") + (synopsis "C++ utility code library") + (description "Futil is a set of C++ utility code and library headers.") + (license license:zlib)))) + (define-public poco (package (name "poco") diff --git a/gnu/packages/patches/futil-Add-Makefile.patch b/gnu/packages/patches/futil-Add-Makefile.patch new file mode 100644 index 0000000000..2c5760d31b --- /dev/null +++ b/gnu/packages/patches/futil-Add-Makefile.patch @@ -0,0 +1,91 @@ +From 29c2ab3931bc0749fb72d222b14a629170cea9e6 Mon Sep 17 00:00:00 2001 +From: AwesomeAdam54321 +Date: Sun, 12 Mar 2023 00:47:56 +0800 +Subject: [PATCH] futil: Add Makefile. + +Adapted from https://gitlab.com/hydren/terrarium/-/blob/master/build/linux-gcc-sdl2-release/src_libs/futil/subdir.mk +--- + Makefile | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + create mode 100644 Makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..39d2275 +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,71 @@ ++################################################################################ ++# Automatically-generated file. Do not edit! ++################################################################################ ++ ++# Add inputs and outputs from these tool invocations to the build variables ++CPP_SRCS += \ ++exception.cpp \ ++properties.cpp \ ++stox.cpp \ ++string_actions.cpp \ ++string_extra_operators.cpp \ ++string_parse.cpp \ ++string_split.cpp ++ ++C_SRCS += \ ++chrono.c \ ++random.c \ ++round.c \ ++snprintf.c \ ++strtox.c ++ ++OBJS += \ ++chrono.so \ ++exception.so \ ++properties.so \ ++random.so \ ++round.so \ ++snprintf.so \ ++stox.so \ ++string_actions.so \ ++string_extra_operators.so \ ++string_parse.so \ ++string_split.so \ ++strtox.so ++ ++SRCDIR ?= . ++INCLUDE_PATH ?= ${SRCDIR}/include ++PREFIX ?= /usr/local ++ ++all: libfutil.so ++ ++libfutil.so: $(OBJS) $(USER_OBJS) ++ @echo 'Building target: $@' ++ @echo 'Invoking: GCC C++ Linker' ++ g++ -shared -o "libfutil.so" $(OBJS) $(USER_OBJS) $(LIBS) ++ @echo 'Finished building target: $@' ++ @echo ' ' ++ ++install: all ++ install -d $(DESTDIR)$(PREFIX) ++ cp -r include $(DESTDIR)$(PREFIX) ++ install -d $(DESTDIR)$(PREFIX)/lib ++ install -m 644 libfutil.so $(DESTDIR)$(PREFIX)/lib ++ ++%.so: %.c ++ @echo 'Building file: $<' ++ @echo 'Invoking: GCC C Compiler' ++ gcc -O3 -Wall -shared -fPIC -I${INCLUDE_PATH} -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" ++ @echo 'Finished building: $<' ++ @echo ' ' ++ ++%.so: %.cpp ++ @echo 'Building file: $<' ++ @echo 'Invoking: GCC C++ Compiler' ++ g++ -I${INCLUDE_PATH} -O3 -Wall -shared -fPIC -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" ++ @echo 'Finished building: $<' ++ @echo ' ' ++ ++clean: ++ rm $(wildcard *.so) ++ +-- +2.39.2 + From patchwork Tue Mar 14 07:09:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 47959 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 82B2916EA0; Tue, 14 Mar 2023 07:11:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5387316E4E for ; Tue, 14 Mar 2023 07:11:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbyoL-000729-KA; Tue, 14 Mar 2023 03:11:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbyoJ-000720-Ik for guix-patches@gnu.org; Tue, 14 Mar 2023 03:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbyoJ-0006ly-2c for guix-patches@gnu.org; Tue, 14 Mar 2023 03:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbyoI-00086k-Ij for guix-patches@gnu.org; Tue, 14 Mar 2023 03:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62178] [PATCH 3/5] gnu: Add libgeramun. References: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> In-Reply-To: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 07:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62178@debbugs.gnu.org Cc: Liliana Marie Prikler , iyzsong@envs.net Received: via spool by 62178-submit@debbugs.gnu.org id=B62178.167877780631099 (code B ref 62178); Tue, 14 Mar 2023 07:11:02 +0000 Received: (at 62178) by debbugs.gnu.org; 14 Mar 2023 07:10:06 +0000 Received: from localhost ([127.0.0.1]:36108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbynN-00085W-8s for submit@debbugs.gnu.org; Tue, 14 Mar 2023 03:10:05 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbynK-00084z-9C for 62178@debbugs.gnu.org; Tue, 14 Mar 2023 03:10:03 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C450C4153C; Tue, 14 Mar 2023 08:10:00 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PmiweStz4rHn; Tue, 14 Mar 2023 08:09:59 +0100 (CET) Message-ID: <4a5cec1d-edac-a65d-c010-5a969c365e5b@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678777799; bh=Pk6g3FzjlBJ8IaLuQhyKvG13sgoMi9lmG/+/e/m5QZE=; h=Date:To:From:Subject:Cc; b=QBNJ0oWtx+owbOtqUUkf1cwgdQscdColLCmrsCt6JlzuOPX9EleSjkavm2t9ryrFG zg/R70L2faIAyZmJZFL+jpFllEkiJBPYIZNvimMOTtSRJHmR/RGE1IfAu2mZe5I2mN 1CDEgns8MSeP9L0koeHJ5MH9tnvQxItRD6rjwmKed9IgiamLlM9e6cBvc/YS+3oO8c 94wWwul45TszlzpQw+reVGyHZto1DRIB46Qg/deGqm/SHAJqD16UhqQd26uI0GHSe1 uPps8GKpAGgiec/VSEQBmstVQnKbL2bAAQU6N1PHQZsaxcLkkdUULSTFWD2GtkpTOU a5kwzBbzKOJIg== Date: Tue, 14 Mar 2023 15:09:56 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 03a5262a846175be5ce4c8e1b9ea6d199a46b4fa Mon Sep 17 00:00:00 2001 Message-Id: <03a5262a846175be5ce4c8e1b9ea6d199a46b4fa.1678775193.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 14 Mar 2023 14:02:58 +0800 Subject: [PATCH 3/5] gnu: Add libgeramun. * gnu/packages/game-development.scm (libgeramun): New variable. * gnu/packages/patches/libgeramun-Add-Makefile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/game-development.scm | 41 ++++++++++ .../patches/libgeramun-Add-Makefile.patch | 79 +++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 gnu/packages/patches/libgeramun-Add-Makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1bdbddce5e..228ec92bb1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1382,6 +1382,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ + %D%/packages/patches/libgeramun-Add-Makefile.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f86793fda0..57bffa9b88 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2494,6 +2494,47 @@ (define-public libccd a.k.a. XenoCollide) as described in Game Programming Gems 7.") (license license:expat))) +(define-public libgeramun + (let ((commit "29668d33266a00fa730d8ee5a16893a86ee2d04d") + (revision "0")) + (package + (name "libgeramun") + (version (git-version "0.14" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/hydren/libgeramun") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nfsdyp3nnz33wxy54vnbbm50kr2y5h6q40kz6g1whz12lqmi79n")) + (patches + (search-patches "libgeramun-Add-Makefile.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + (lambda (file) + (install-file file "include/libgeramun")) + (find-files "." "\\.h")))))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure)) + #:make-flags + #~(list (string-append "DESTDIR=" #$output) + "PREFIX="))) + (synopsis "Procedural platformer-game map generation library") + (description + "libgeramun is a set of +stochastic, procedural platformer-game map generation routines. + The routines are meant to produce maps with a Terraria-like look and feel.") + (home-page "https://gitlab.com/hydren/libgeramun") + (license license:gpl2+)))) + (define-public ode (package (name "ode") diff --git a/gnu/packages/patches/libgeramun-Add-Makefile.patch b/gnu/packages/patches/libgeramun-Add-Makefile.patch new file mode 100644 index 0000000000..01a94d6422 --- /dev/null +++ b/gnu/packages/patches/libgeramun-Add-Makefile.patch @@ -0,0 +1,79 @@ +From ac239d7be2755dc28fa831ba15a0fb318848a5a6 Mon Sep 17 00:00:00 2001 +From: AwesomeAdam54321 +Date: Sun, 12 Mar 2023 01:30:46 +0800 +Subject: [PATCH] libgeramun: Add Makefile. + +Adapted from https://gitlab.com/hydren/terrarium/-/raw/master/build/linux-gcc-sdl2-release/src_libs/libgeramun/subdir.mk +--- + Makefile | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + create mode 100644 Makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..8d37ce4 +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,59 @@ ++################################################################################ ++# Automatically-generated file. Do not edit! ++################################################################################ ++ ++# Add inputs and outputs from these tool invocations to the build variables ++CPP_SRCS += \ ++brush.cpp \ ++cave.cpp \ ++debug.cpp \ ++generators.cpp \ ++midpoint_displacement.cpp \ ++miners.cpp \ ++preview_callback.cpp \ ++random_walk.cpp \ ++spring.cpp \ ++surf_replacer.cpp ++ ++OBJS += \ ++brush.so \ ++cave.so \ ++debug.so \ ++generators.so \ ++midpoint_displacement.so \ ++miners.so \ ++preview_callback.so \ ++random_walk.so \ ++spring.so \ ++surf_replacer.so ++ ++SRCDIR ?= . ++INCLUDE_PATH ?= ${SRCDIR}/include ++PREFIX ?= /usr/local ++ ++all: libgeramun.so ++ ++libgeramun.so: $(OBJS) $(USER_OBJS) ++ @echo 'Building target: $@' ++ @echo 'Invoking: GCC C++ Linker' ++ g++ -shared -o "libgeramun.so" $(OBJS) $(USER_OBJS) $(LIBS) ++ @echo 'Finished building target: $@' ++ @echo ' ' ++ ++install: all ++ install -d $(DESTDIR)$(PREFIX) ++ cp -r include $(DESTDIR)$(PREFIX) ++ install -d $(DESTDIR)$(PREFIX)/lib ++ install -m 644 libgeramun.so $(DESTDIR)$(PREFIX)/lib ++ ++%.so: %.cpp ++ @echo 'Building file: $<' ++ @echo 'Invoking: GCC C++ Compiler' ++ g++ -I${INCLUDE_PATH} -O3 -Wall -shared -fPIC -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" ++ @echo 'Finished building: $<' ++ @echo ' ' ++ ++clean: ++ rm $(wildcard *.so) ++ ++ +-- +2.39.2 + From patchwork Tue Mar 14 07:11:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 47960 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 939AF16EA0; Tue, 14 Mar 2023 07:12:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E2CF016E4E for ; Tue, 14 Mar 2023 07:12:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbypI-0007Fl-Fj; Tue, 14 Mar 2023 03:12:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbypG-0007FO-CH for guix-patches@gnu.org; Tue, 14 Mar 2023 03:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbypG-0006qK-4E for guix-patches@gnu.org; Tue, 14 Mar 2023 03:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbypF-00088J-Sp for guix-patches@gnu.org; Tue, 14 Mar 2023 03:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62178] [PATCH 4/5] gnu: Add rapidxml. References: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> In-Reply-To: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 07:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62178@debbugs.gnu.org Cc: Liliana Marie Prikler , iyzsong@envs.net Received: via spool by 62178-submit@debbugs.gnu.org id=B62178.167877791631252 (code B ref 62178); Tue, 14 Mar 2023 07:12:01 +0000 Received: (at 62178) by debbugs.gnu.org; 14 Mar 2023 07:11:56 +0000 Received: from localhost ([127.0.0.1]:36112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbypA-000880-5L for submit@debbugs.gnu.org; Tue, 14 Mar 2023 03:11:56 -0400 Received: from knopi.disroot.org ([178.21.23.139]:47770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyp9-00087s-9E for 62178@debbugs.gnu.org; Tue, 14 Mar 2023 03:11:55 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A1D66444EE; Tue, 14 Mar 2023 08:11:54 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UPZmlcyxzwMS; Tue, 14 Mar 2023 08:11:53 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678777913; bh=Qp/P+A6rx7BYS5J78sLjZ/oChyDiKbPKXxBKbcqjpVE=; h=Date:To:Cc:From:Subject; b=iemIGCgWUtEUKijjLZ3rbEmAW4nAqVzwxw5rZr2rqCLkkY1qGKqeRKShiR3vDEZAf 6jEdvSRRr6HgRuAvMc4MEmjBT8KTEMYXkiktK/4wmWgjlXf9bcV3zhJCSGhGBTr/fy vMrt0e/TIxygaOSxe/31E6XJBSDY+4vbDkLYcSpy/p32RgCxCXMSFXwMLZJoveCjgl fLWYpar7JCC8Gv3vTrBdL/kHv3XU9/1w2FlnfXVkHXkhPWye3e/lm1ryAJ6WKFFx0N /hiIENOr+9OJxKNSpdq9Rd6n0pFozTS7WeKnaDqcmOzjceM9Xyj3VzrGKi6J3eWHUI Gj5ao3frZ0+mQ== Date: Tue, 14 Mar 2023 15:11:50 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From f103aa078174b6b2d1ae733546a73eeb1ed853c3 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 14 Mar 2023 14:07:08 +0800 Subject: [PATCH 4/5] gnu: Add rapidxml. * gnu/packages/xml.scm (rapidxml): New variable. --- gnu/packages/xml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 0b26a63e85..c8dbd27772 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -76,6 +76,7 @@ (define-module (gnu packages xml) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system perl) @@ -1983,3 +1984,32 @@ (define-public python-xmltodict (description "This package provides a Python library to convert XML to @code{OrderedDict}.") (license license:expat))) + +(define-public rapidxml + (package + (name "rapidxml") + (version "1.13") + (source (origin + (method url-fetch) + (uri (string-append + "https://sourceforge.net/projects/" + "rapidxml/files/rapidxml/rapidxml%20" + version "/rapidxml-" version ".zip")) + (sha256 + (base32 + "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63")))) + (build-system copy-build-system) + (native-inputs + (list unzip)) + (arguments + (list + #:install-plan + #~'(("./" "include/rapidxml" #:include-regexp ("\\.hpp$"))))) + (synopsis "XML Parser") + (description + "RapidXml is an attempt to create the fastest XML parser possible, +while retaining useability, portability and reasonable W3C compatibility. + It is an in-situ parser written in modern C++, with parsing speed approaching +that of strlen function executed on the same data.") + (home-page "https://rapidxml.sourceforge.net/") + (license license:boost1.0))) From patchwork Tue Mar 14 07:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 47961 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 994A416E4E; Tue, 14 Mar 2023 07:14:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 02F2016E4E for ; Tue, 14 Mar 2023 07:14:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbyrI-0007Pc-0C; Tue, 14 Mar 2023 03:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbyrC-0007PP-Sm for guix-patches@gnu.org; Tue, 14 Mar 2023 03:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbyrC-00079E-97 for guix-patches@gnu.org; Tue, 14 Mar 2023 03:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbyrC-0008BN-0m for guix-patches@gnu.org; Tue, 14 Mar 2023 03:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62178] [PATCH 5/5] gnu: Add terrarium. References: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> In-Reply-To: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 07:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62178@debbugs.gnu.org Cc: Liliana Marie Prikler , iyzsong@envs.net Received: via spool by 62178-submit@debbugs.gnu.org id=B62178.167877802031416 (code B ref 62178); Tue, 14 Mar 2023 07:14:01 +0000 Received: (at 62178) by debbugs.gnu.org; 14 Mar 2023 07:13:40 +0000 Received: from localhost ([127.0.0.1]:36117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyqp-0008Ad-PE for submit@debbugs.gnu.org; Tue, 14 Mar 2023 03:13:40 -0400 Received: from knopi.disroot.org ([178.21.23.139]:55294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyqn-0008AU-JS for 62178@debbugs.gnu.org; Tue, 14 Mar 2023 03:13:38 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F04884153C; Tue, 14 Mar 2023 08:13:36 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WomEqbGzk07u; Tue, 14 Mar 2023 08:13:35 +0100 (CET) Message-ID: <7f959aa7-fbc9-d027-da03-7b6a7727274f@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678778015; bh=UcRzGPFztl4iXg+FsuY7RZESRaVPfwICh+AsK1HNV+0=; h=Date:To:Cc:From:Subject; b=T8RjKCAbg9yg4Ry51gT0AL/iIG+0EbpYfvbdOwGhnNQkLPRb7WSA6LpSFvG3AugqW Ef+huHLNLUTjs/9wUJGs9mV6/UUKKupe+864j8VAP+TrncAt8u+645RvydjKquPivl H1cwgyVDJhAWqmQypDge881KExZX/Zb2SlAEv/ZSoyK6SajM+4DdHCbGE0LZFUr15I J31iynGIeCsF/2+p60nb4Lj1Vw/R+c3UbJ2lVjidgt+DzXW8RMJ4+1BQdIVwSoath2 gxelTQ9zAuzokfYwq2+iFp7u4IaGXkLc3Z+71bg5IizNCQQIUliDj0lXr+o5ViWIBM +MtPndfr5R/lg== Date: Tue, 14 Mar 2023 15:13:32 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 914d9ebcaffee24da73bb4d9711c0428ff36feb0 Mon Sep 17 00:00:00 2001 Message-Id: <914d9ebcaffee24da73bb4d9711c0428ff36feb0.1678775193.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 14 Mar 2023 14:19:59 +0800 Subject: [PATCH 5/5] gnu: Add terrarium. * gnu/packages/games.scm (terrarium): New variable. --- gnu/packages/games.scm | 96 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2946c787af..adcaba1248 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -618,6 +618,102 @@ (define-public bastet canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) +(define-public terrarium + (let ((commit "4a489717b2fc53903b934487d7321be4682e4e2b") + (revision "0")) + (package + (name "terrarium") + (version (git-version "0.1.9" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/hydren/terrarium") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xq7kfl7dvvw222kamw1b5paq5p997z8px8ximbz12v0kj62aqjf")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + delete-file + '("resources/jack.ttf" ; unlicensed font, probably shareware + "resources/liberation.ttf")) ; bundled font + (for-each + (lambda (file) + (copy-recursively + (string-append "build/linux-gcc-sdl2-release/" file) + (string-append "./" file))) + '("src" + "makefile" + "configure.sh" + "objects.mk" + "sources.mk")) + (rename-file "configure.sh" "configure") + (substitute* "configure" + (("which") "type -p")) + (substitute* "makefile" + (("..LIBS. `sdl2-config --cflags --libs`") + "-lbox2d -lfgeal -lfutil -lgeramun") + (("@echo 'Building target: .@'") + (string-append + "sed -i -e \"s,@DESTDIR@,$(DESTDIR),\"" + " -e \"s,@PREFIX@,$(PREFIX),\"" + " -e \"s,@FONT_DIR@,$(FONT_DIR),\"" + " src/loading_state.cpp src/main.cpp" + " src/options_menu_state.cpp src/main_menu_state.cpp\n\t" + "@echo 'Building target: $@'")) + (("clean:") + (string-append + "install: terrarium\n\t" + "install -d $(DESTDIR)$(PREFIX)/share\n\t" + "cp -r resources $(DESTDIR)$(PREFIX)/share\n\t" + "install -d $(DESTDIR)$(PREFIX)/bin\n\t" + "install -m 755 terrarium $(DESTDIR)$(PREFIX)/bin\n\n" + "clean:"))) + (substitute* "src/terrarium_game_logic.cpp" + (("config.properties") ".terrarium/config.properties")) + (substitute* "src/main_menu_state.cpp" + (("resources/maps") ".terrarium/maps") + (("resources/chars") ".terrarium/chars") + (("resources/jack.ttf") "@FONT_DIR@/LiberationSans-Bold.ttf") + (("resources/liberation.ttf") + "@FONT_DIR@/LiberationMono-Regular.ttf")) + (substitute* "src/options_menu_state.cpp" + (("resources/jack.ttf") "@FONT_DIR@/LiberationSans-Bold.ttf") + (("resources/liberation.ttf") + "@FONT_DIR@/LiberationMono-Regular.ttf")) + (substitute* '("src/loading_state.cpp" + "src/main.cpp" + "src/main_menu_state.cpp") + (("\\./resources/") "resources/")) + (substitute* '("src/options_menu_state.cpp" + "src/loading_state.cpp" + "src/main_menu_state.cpp" + "src/main.cpp") + (("resources/") "@DESTDIR@@PREFIX@/share/resources/")))))) + (build-system gnu-build-system) + (inputs + (list box2d + fgeal + font-liberation + futil + libgeramun + rapidxml)) + (arguments + (list #:tests? #f ; no tests + #:make-flags + #~(list (string-append "DESTDIR=" #$output) + (string-append "FONT_DIR=" + #$(this-package-input "font-liberation") + "/share/fonts/truetype")))) + (home-page "https://gitlab.com/hydren/terrarium") + (synopsis "Terraria-clone game") + (description "Terrarium is an attempt to do a Terraria clone game, +possibly with some new features.") + (license license:gpl2+)))) + (define-public tetrinet (package (name "tetrinet")