From patchwork Sat Jul 22 23:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 51931 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 3629627BBEA; Sun, 23 Jul 2023 00:49:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0D31B27BBE2 for ; Sun, 23 Jul 2023 00:49:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNMLQ-000886-9N; Sat, 22 Jul 2023 19:49: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 1qNMLO-00087s-KF for guix-patches@gnu.org; Sat, 22 Jul 2023 19:49:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNMLO-0002J3-CS for guix-patches@gnu.org; Sat, 22 Jul 2023 19:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNMLO-0006Jx-1J for guix-patches@gnu.org; Sat, 22 Jul 2023 19:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64787] [PATCH v2 1/2] gnu: Add scummc. References: In-Reply-To: Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 23:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64787@debbugs.gnu.org Received: via spool by 64787-submit@debbugs.gnu.org id=B64787.169006971524264 (code B ref 64787); Sat, 22 Jul 2023 23:49:02 +0000 Received: (at 64787) by debbugs.gnu.org; 22 Jul 2023 23:48:35 +0000 Received: from localhost ([127.0.0.1]:37672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNMKx-0006JH-EL for submit@debbugs.gnu.org; Sat, 22 Jul 2023 19:48:35 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNMKv-0006Il-E2 for 64787@debbugs.gnu.org; Sat, 22 Jul 2023 19:48:34 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9804F40EA9 for <64787@debbugs.gnu.org>; Sun, 23 Jul 2023 01:48:28 +0200 (CEST) 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 kZ3enUm9RKUK for <64787@debbugs.gnu.org>; Sun, 23 Jul 2023 01:48:27 +0200 (CEST) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690069707; bh=71OBfr8guf1u6nb0uzqRwK2lmhCuYgV9ItHPM7ugGbw=; h=Date:To:From:Subject; b=FkgX2NN2A59Asgh4TFq/XqJgB9OYBR1riUYXcwuT2bIeCLID+7m4vUEteTQWJEHhK DavvxhgAbXGhONg8XTGbZP/wpWK9dl+PQG5eSDdVoqRGRn9PxdxkUsNv+j2gUapI50 0ln5JRN9amfFsmsRyWyrRsF2zxT3ZTYKn8PMZeG3Pbsu0CzXAa+q9veXXJc0KDhqX9 LeMPsVT2FUF4cZ9kahkY0w/T6D1m1MzAH5DXu5a4d5XbZZCv7Mh7HVqy/du9GD9O9/ QKzdtvqmrEJYNWlsXvxedBIuC6bGjh0Ed3YN0df+AaT0bj1agADWXGkL1Xe3o3cC7u bfWAiMzy/4sqw== Date: Sun, 23 Jul 2023 07:48:22 +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 ae75dfc3f9fa840f014b23809132540b955e189b Mon Sep 17 00:00:00 2001 Message-ID: From: AwesomeAdam54321 Date: Sat, 22 Jul 2023 15:34:55 +0800 Subject: [PATCH v2 1/2] gnu: Add scummc. * gnu/packages/game-development.scm (scummc): New variable. --- gnu/packages/game-development.scm | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) base-commit: 6bda806416b8e6032ef1047c5feed776b6cc0493 diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index b0d9a88dc2..ba015aa649 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -66,6 +66,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages compression) @@ -745,6 +746,57 @@ (define-public tsukundere experimental.") (license license:lgpl3+))) +(define-public scummc + (package + (name "scummc") + (version "0.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AlbanBedel/scummc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yyq05kfmvgx5aa68kg1l5a4lpsky7hzxxcdvv2xbgf0jljdcl3k")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "examples/example.mak" + (("scost.*\n$") "scost\n") + (("bmp \\$\\(.*\n$") "bmp\n") + (("/%.scc.*\n$") "/%.scc\n") + (("voc \\$\\(.*\n$") "voc\n")) + (substitute* "Makefile.target" + (("distrib-data:.*\n") "distrib-data:\n") + (("cp.*/bin" all) + (string-append all " || true"))))))) + (build-system gnu-build-system) + (native-inputs + (list bison doxygen libxslt pkg-config)) + (inputs + (list freetype gtk+-2 sdl)) + (arguments + (list #:test-target "test" + #:tests? #f ; The only tests verify that game checksums match + #:make-flags + #~(list "SHOW_WARNINGS=no") + #:phases + #~(modify-phases %standard-phases + (replace 'configure ; ScummC uses a non-standard configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "./configure" configure-flags))) + (replace 'install ; install target is referred to as distrib + (lambda _ + (invoke "make" "distrib" + (string-append "DISTRIB=" #$output))))))) + (synopsis "Scumm Compiler") + (description + "ScummC is a set of tools allowing to create SCUMM games from scratch. +It is capable of creating games for SCUMM version 6 and partially version 7.") + (home-page "https://github.com/AlbanBedel/scummc") + (license license:gpl2+))) + (define-public sfml (package (name "sfml") From patchwork Sat Jul 22 23:50:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 51932 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 34C6927BBEA; Sun, 23 Jul 2023 00:51:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 CC3F527BBE2 for ; Sun, 23 Jul 2023 00:51:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNMNK-0008Nb-RL; Sat, 22 Jul 2023 19:51:02 -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 1qNMNK-0008NT-1i for guix-patches@gnu.org; Sat, 22 Jul 2023 19:51:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNMNJ-0003Ny-Pz for guix-patches@gnu.org; Sat, 22 Jul 2023 19:51:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNMNJ-0006My-Lj for guix-patches@gnu.org; Sat, 22 Jul 2023 19:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64787] [PATCH v2 2/2] gnu: Add openquest. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 23:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64787@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 64787-submit@debbugs.gnu.org id=B64787.169006981524430 (code B ref 64787); Sat, 22 Jul 2023 23:51:01 +0000 Received: (at 64787) by debbugs.gnu.org; 22 Jul 2023 23:50:15 +0000 Received: from localhost ([127.0.0.1]:37676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNMMZ-0006Lx-01 for submit@debbugs.gnu.org; Sat, 22 Jul 2023 19:50:15 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNMMX-0006Lp-DN for 64787@debbugs.gnu.org; Sat, 22 Jul 2023 19:50:14 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id CFBC740747; Sun, 23 Jul 2023 01:50:09 +0200 (CEST) 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 hsKSzXlmDx5O; Sun, 23 Jul 2023 01:50:08 +0200 (CEST) Message-ID: <076074f9-7ed6-9ae6-15f1-ce6b1806ddd1@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690069808; bh=pyNGkDQ2YgeMP17NUPvIwNnyxMLoSRBGqHSQOSv6CHc=; h=Date:Subject:From:To:References:Cc:In-Reply-To; b=DSslBiVkUayPWBxJSkRyMbRyhAp2yT0zbEvcaXaFE/yn0nDdFjCPRzOFhN/NItLLb UJI6q+lBMqOF0rMHIQuaDCFck6703RryxK1eXn6sV3xkVf2sCJb2nEW2nGQMtk98OB 0//5fMNoIAkGV1VfGUijj4FW3ldpdKq2oHGVI7/Y8u9waCnH8iYjgTFqRiQqQ8+xnT TC1Ew2EASDUph51dDTOwDV03jno85Ya5iQ43OPC1VpPC1AA0CRTWvUswfYbHJgHiof wijtFrMNjKrVeh9di1fDxqdF0Ob5pg/Vw58LuyODZSm2/cogpgSaHVF7u89cUlU2Sj hWe1OC7SLb0FA== Date: Sun, 23 Jul 2023 07:50:03 +0800 MIME-Version: 1.0 Content-Language: en-US References: In-Reply-To: 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 bcb776213db44c48735694ab44941d1fc7e38e31 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: AwesomeAdam54321 Date: Sat, 22 Jul 2023 15:38:48 +0800 Subject: [PATCH v2 2/2] gnu: Add openquest. * gnu/packages/games.scm (openquest): New variable. --- gnu/packages/games.scm | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c388314771..a35c4c6db6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5094,6 +5094,88 @@ (define openrct2-objects "openrct2-objects is a set of objects for OpenRCT2.") (license license:gpl3+))) +(define-public openquest + (package + (name "openquest") + (version "0.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AlbanBedel/scummc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yyq05kfmvgx5aa68kg1l5a4lpsky7hzxxcdvv2xbgf0jljdcl3k")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "examples/example.mak" + (("scost.*\n$") "scost\n") + (("bmp \\$\\(.*\n$") "bmp\n") + (("/%.scc.*\n$") "/%.scc\n") + (("voc \\$\\(.*\n$") "voc\n")) + (substitute* "Makefile.target" + (("distrib-data:.*\n") "distrib-data:\n") + (("cp.*/bin" all) + (string-append all " || true"))))))) + (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments scummc) + ((#:make-flags _) + #~(list "SCC=scc" + "SLD=sld" + "COST=cost" + "CHAR=char" + "SOUN=soun")) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (with-directory-excursion "examples/openquest" + (apply invoke "make" "tentacle" make-flags)))) + (add-after 'install 'install-executable + (lambda* (#:key inputs #:allow-other-keys) + ;; Create standalone executable. + (let* ((bash (search-input-file inputs "/bin/bash")) + (share (string-append #$output "/examples/openquest")) + (scummvm (search-input-file inputs "/bin/scummvm")) + (bin (string-append #$output "/bin")) + (executable (string-append bin "/openquest"))) + (mkdir-p bin) + (with-output-to-file executable + (lambda () + (format #t "#!~a~%" bash) + (format #t + "exec ~a --path=~a tentacle~%" + scummvm share))) + (chmod executable #o755)))) + (add-after 'install-executable 'install-desktop-file + (lambda _ + ;; Create desktop file. There is no official icon, + ;; but the main character of the game is a good choice. + (let ((apps (string-append #$output "/share/applications"))) + (mkdir-p apps) + (make-desktop-entry-file + (string-append apps "/openquest.desktop") + #:name "OpenQuest" + #:generic-name "OpenQuest" + #:exec (string-append #$output "/bin/openquest") + #:icon (string-append #$output "/examples/openquest/graphics/zob/frames/stand_S.bmp") + #:categories '("AdventureGame" "Game" "RolePlaying") + #:keywords '("game" "adventure" "roleplaying" "2D" "sci-fi") + #:comment '((#f "Simple 2D point and click adventure game")))))))))) + (native-inputs + (modify-inputs (package-native-inputs scummc) + (prepend scummc))) + (inputs + (list bash scummvm)) + (home-page "https://www.scummvm.org") + (synopsis "Simple 2D point and click adventure game") + (description "OpenQuest is a two room adventure game +that follows two aliens who come to Earth in search of a stolen artifact.") + (license license:gpl2+))) + (define-public openrct2 (package (name "openrct2")