From patchwork Sat Sep 23 22:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Trujillo Viedma X-Patchwork-Id: 54243 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 5213527BBE9; Sun, 24 Sep 2023 01:49:48 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 B461227BBE9 for ; Sun, 24 Sep 2023 01:49:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkDJQ-0001qd-L3; Sat, 23 Sep 2023 20:49:28 -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 1qkBKt-0001hv-DN for guix-patches@gnu.org; Sat, 23 Sep 2023 18:42:51 -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 1qkBKt-0001BA-3f for guix-patches@gnu.org; Sat, 23 Sep 2023 18:42:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkBL4-0008F1-G9 for guix-patches@gnu.org; Sat, 23 Sep 2023 18:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66172] Acknowledgement (gnu: games: Update openrct2.) Resent-From: Daniel Trujillo Viedma Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 22:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66172 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66172@debbugs.gnu.org Received: via spool by 66172-submit@debbugs.gnu.org id=B66172.169550895631636 (code B ref 66172); Sat, 23 Sep 2023 22:43:02 +0000 Received: (at 66172) by debbugs.gnu.org; 23 Sep 2023 22:42:36 +0000 Received: from localhost ([127.0.0.1]:40744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkBKd-0008EB-IO for submit@debbugs.gnu.org; Sat, 23 Sep 2023 18:42:36 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:44203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkBKb-0008Du-7M for 66172@debbugs.gnu.org; Sat, 23 Sep 2023 18:42:34 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-405621baba7so11569945e9.0 for <66172@debbugs.gnu.org>; Sat, 23 Sep 2023 15:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695508936; x=1696113736; darn=debbugs.gnu.org; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=ujI8i3VA8RnZgbSGZS1c6yIgojmtZKgg5MxAJaxS5b0=; b=XnUBoKBgobEZrl/SC4gEG7AEwyg6BnoHOxHASdDXrvbcwiLC2BsXt9uAPUz7QCbUQO zkz2vYgM6TxmuGkQ+/OrEAv9xqpRHlmtO7P9Lgzz+d8xf0a96zaEgnfw9v8bR7WpySRa sWAxFqQ0R8TvO2t5siqd3/B/3NiufeaCmeBrvPngzGnTeY+Cmld9dFPK1Vh7cPwIykLk Y3nh7CkCDIDNM2PpuCW8uhmOLM+tYbJfTujzn0xFmS9U1MZG/CpyuG+dRhcO7muRREYJ 5YthhPsSXIkLozAPoBj43yMsOYPqNZFlQ1nvnm+W2Ov/vo5d8N9CY/Mr2OYg+tkP2RHE KOZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695508936; x=1696113736; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=ujI8i3VA8RnZgbSGZS1c6yIgojmtZKgg5MxAJaxS5b0=; b=fMXAoI41YXJfBjBVybz0N04T6cGJmwF23Z7mQzKKdxNQeuTiBZvxYd9BQOo3o15cg7 ZD2kyFLNgCyLzeXdUxREkzmLch6mH5mFZgWHl974XR6QEOQwyO0QYO141FLl2VTQh/oA ucXARrJX4Ga1S7b8KHzco36MNmlS9eo0gLTqAugFgwv+qEqQnC4F2yqNJVfyAYQSEaTY v9s8vAwRtxxnA4af8stHAIXWY7Us4iq0OJif/sFi7BVx8bkaHxC2CyGvGzwtNSACaNyj 2+G6Z69CDo1I1wblaU3UyelMavsTycBvHZp+j300kqB5S4C+2GKM+xXN36TMNwEPTfxe LKgQ== X-Gm-Message-State: AOJu0YxTAIo1CxjnhgVwBPtFbeYiN89UDIMJ42Edt9NstSOx/8A5md8f 5ZFUrlqVIijeyd7l5CJz0fdO2PPgb5s= X-Google-Smtp-Source: AGHT+IH8ykzM06tIWl/xAO+ulDdany6YL2CtOPOUx66e911qshkCiJMDF946ENFj1pVYIXQILKxplg== X-Received: by 2002:a05:600c:289:b0:401:bf87:9898 with SMTP id 9-20020a05600c028900b00401bf879898mr2869311wmk.25.1695508935552; Sat, 23 Sep 2023 15:42:15 -0700 (PDT) Received: from [192.168.0.17] ([37.223.122.244]) by smtp.gmail.com with ESMTPSA id u9-20020a05600c00c900b003fff96bb62csm8164066wmm.16.2023.09.23.15.42.14 for <66172@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 23 Sep 2023 15:42:14 -0700 (PDT) Message-ID: Date: Sun, 24 Sep 2023 00:42:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US References: <001037da-e7af-ef56-1440-e475277ac244@gmail.com> From: Daniel Trujillo Viedma In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 23 Sep 2023 20:49:23 -0400 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Of course, I forgot to attach the patch. Sorry for that... From 617dcef04314a044972ce17f340480b18ae143b6 Mon Sep 17 00:00:00 2001 Message-ID: <617dcef04314a044972ce17f340480b18ae143b6.1695507053.git.dtviedma@gmail.com> From: Daniel Trujillo Viedma Date: Sun, 24 Sep 2023 00:06:25 +0200 Subject: [PATCH] Update: openrct2 --- gnu/packages/games.scm | 264 ++++++++++++++++++++++++++++------------- 1 file changed, 180 insertions(+), 84 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0b7518c2c2..628d6ad4c1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4923,16 +4923,16 @@ (define-public openttd (define openrct2-title-sequences (package (name "openrct2-title-sequences") - (version "0.1.2") + (version "0.4.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/OpenRCT2/title-sequences/releases/download/v" - version "/title-sequence-v" version ".zip")) + version "/title-sequences.zip")) (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "0qbyxrsw8hlgaq0r5d7lx7an3idy4qbfv7yiw9byhldk763n9cfw")))) + "160df56cwb4vl1h25k8rz2wqmpyfncd8zpmfdinzny0zmz6qk894")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -4945,7 +4945,7 @@ (define openrct2-title-sequences (use-modules (guix build utils)) (let* ((out (assoc-ref %outputs "out")) (openrct2-title-sequences (string-append out - "/share/openrct2/title-sequences")) + "/share/openrct2/sequence")) (source (assoc-ref %build-inputs "source")) (unzip (search-input-file %build-inputs "/bin/unzip"))) (copy-file source (string-append ,name "-" ,version ".zip")) @@ -4955,16 +4955,17 @@ (define openrct2-title-sequences (copy-recursively "." openrct2-title-sequences) #t)))) - (home-page "https://github.com/OpenRCT2/OpenRCT2") + (home-page "https://github.com/OpenRCT2/title-sequences") (synopsis "Title sequences for OpenRCT2") (description - "openrct2-title-sequences is a set of title sequences for OpenRCT2.") - (license license:gpl3+))) + "Contains the title sequence that is distributed with each release of +OpenRCT2.") + (license license:cc-by4.0))) (define openrct2-objects (package (name "openrct2-objects") - (version "1.0.20") + (version "1.3.11") (source (origin (method url-fetch) @@ -4972,7 +4973,7 @@ (define openrct2-objects version "/objects.zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 "1q7a38kcwrfijav6app1gf253yfv8b0rljbkah8040y6i7snw9mw")))) + (base32 "1d402z4jkf1jvixhayiwkd2w4zblk043jrsmj7js475i9y7di1dz")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -4985,7 +4986,7 @@ (define openrct2-objects (use-modules (guix build utils)) (let* ((out (assoc-ref %outputs "out")) (openrct2-objects (string-append out - "/share/openrct2/objects")) + "/share/openrct2/object")) (source (assoc-ref %build-inputs "source")) (unzip (search-input-file %build-inputs "/bin/unzip"))) (copy-file source (string-append ,name "-" ,version ".zip")) @@ -4995,11 +4996,176 @@ (define openrct2-objects (copy-recursively "." openrct2-objects) #t)))) - (home-page "https://github.com/OpenRCT2/OpenRCT2") - (synopsis "Objects for OpenRCT2") + (home-page "https://github.com/OpenRCT2/objects") + (synopsis "Official objects for OpenRCT2") (description - "openrct2-objects is a set of objects for OpenRCT2.") - (license license:gpl3+))) + "Contains objects from RollerCoaster Tycoon 1, RollerCoaster Tycoon 2 and +their expansion packs.") + (license license:cc-by4.0))) + +(define openrct2-opensfx + (package + (name "openrct2-opensfx") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v" + version "/opensound.zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "0v5fwi953xq10kvyba46r193rpdm8pacvq52660as96cz1pipgkh")))) + (build-system trivial-build-system) + (native-inputs + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (openrct2-opensfx (string-append out + "/share/openrct2")) + (source (assoc-ref %build-inputs "source")) + (unzip (search-input-file %build-inputs "/bin/unzip"))) + (copy-file source (string-append ,name "-" ,version ".zip")) + (invoke unzip (string-append ,name "-" ,version ".zip")) + (delete-file (string-append ,name "-" ,version ".zip")) + (mkdir-p openrct2-opensfx) + (copy-recursively "." openrct2-opensfx) + #t)))) + (home-page "https://github.com/OpenRCT2/OpenSoundEffects") + (synopsis "Sound effects replacement for OpenRCT2") + (description + "Project to create a replacement for RollerCoaster Tycoon 2 sound effects +file.") + (license license:expat))) + +(define openrct2-openmsx + (package + (name "openrct2-openmsx") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/OpenRCT2/OpenMusic/releases/download/v" + version "/openmusic.zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 + "1vwhg6j5snvlym02fw3gsfbb6iw1jx3cq9kwrvfg6dmjpvsqin3q")))) + (build-system trivial-build-system) + (native-inputs + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (openrct2-openmsx (string-append out + "/share/openrct2")) + (source (assoc-ref %build-inputs "source")) + (unzip (search-input-file %build-inputs "/bin/unzip"))) + (copy-file source (string-append ,name "-" ,version ".zip")) + (invoke unzip (string-append ,name "-" ,version ".zip")) + (delete-file (string-append ,name "-" ,version ".zip")) + (mkdir-p openrct2-openmsx) + (copy-recursively "." openrct2-openmsx) + #t)))) + (home-page "https://github.com/OpenRCT2/OpenMusic") + (synopsis "New versions of the songs from RollerCoaster Tycoon 2") + (description + "This project aims to create an alternative, high quality soundtrack as +replacement for, and addition to RollerCoaster Tycoon 2's soundtrack for use in +OpenRCT2.") + (license license:cc-by-sa4.0))) + +(define-public openrct2 + (package + (name "openrct2") + (version "0.4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenRCT2/OpenRCT2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13kz5rkldcc5x2532xdf71c6c3rxn0jw72g6m5hq9a4q4isdh2hx")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" + "-DDOWNLOAD_TITLE_SEQUENCES=OFF" + "-DDOWNLOAD_OPENSFX=OFF" + "-DDOWNLOAD_OPENMSX=OFF") + #:tests? #f ; tests require network access + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-usr-share-paths&add-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((titles (assoc-ref inputs "openrct2-title-sequences")) + (objects (assoc-ref inputs "openrct2-objects")) + (opensfx (assoc-ref inputs "openrct2-opensfx")) + (openmsx (assoc-ref inputs "openrct2-openmsx"))) + ;; Fix some references to /usr/share. + (substitute* "src/openrct2/platform/Platform.Linux.cpp" + (("/usr/share") + (string-append (assoc-ref %outputs "out") "/share"))) + (copy-recursively + (string-append titles "/share/openrct2/sequence") + "data/sequence") + (copy-recursively + (string-append objects "/share/openrct2/object") + "data/object") + (copy-recursively + (string-append opensfx "/share/openrct2/") + "data") + (copy-recursively + (string-append openmsx "/share/openrct2") + "data")))) + (add-before 'configure 'get-rid-of-errors + (lambda _ + ;; Don't treat warnings as errors. + (substitute* "CMakeLists.txt" + (("-Werror") "")) + #t))))) + (inputs `(("curl" ,curl) + ("duktape" ,duktape) + ("fontconfig-minimal" ,fontconfig) + ("freetype" ,freetype) + ("icu4c" ,icu4c) + ("jansson" ,jansson) + ("nlohmann-json" ,nlohmann-json) + ("libpng" ,libpng) + ("libzip" ,libzip) + ("mesa" ,mesa) + ("openrct2-objects" ,openrct2-objects) + ("openrct2-title-sequences" ,openrct2-title-sequences) + ("openrct2-opensfx" ,openrct2-opensfx) + ("openrct2-openmsx" ,openrct2-openmsx) + ("openssl" ,openssl) + ("sdl2" ,sdl2) + ("speexdsp" ,speexdsp) + ("zlib" ,zlib) + ("flac" ,flac) + ("libvorbis" ,libvorbis))) + (native-inputs + (list pkg-config)) + (home-page "https://github.com/OpenRCT2/OpenRCT2") + (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") + (description "OpenRCT2 is a free software re-implementation of +RollerCoaster Tycoon 2 (RCT2). The gameplay revolves around building and +maintaining an amusement park containing attractions, shops and facilities.") + ;; See + ;; regarding assets. + (license license:gpl3+))) (define-public openquest (package @@ -5087,76 +5253,6 @@ (define-public openquest that follows two aliens who come to Earth in search of a stolen artifact.") (license license:gpl2+))) -(define-public openrct2 - (package - (name "openrct2") - (version "0.3.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OpenRCT2/OpenRCT2") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags (list "-DDOWNLOAD_OBJECTS=OFF" - "-DDOWNLOAD_TITLE_SEQUENCES=OFF") - #:tests? #f ; tests require network access - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-usr-share-paths&add-data - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((titles (assoc-ref inputs "openrct2-title-sequences")) - (objects (assoc-ref inputs "openrct2-objects"))) - ;; Fix some references to /usr/share. - (substitute* "src/openrct2/platform/Platform.Linux.cpp" - (("/usr/share") - (string-append (assoc-ref %outputs "out") "/share"))) - (copy-recursively - (string-append titles "/share/openrct2/title-sequences") - "data/title") - (copy-recursively - (string-append objects "/share/openrct2/objects") - "data/object")))) - (add-before 'configure 'get-rid-of-errors - (lambda _ - ;; Don't treat warnings as errors. - (substitute* "CMakeLists.txt" - (("-Werror") "")) - #t))))) - (inputs `(("curl" ,curl) - ("duktape" ,duktape) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("icu4c" ,icu4c) - ("jansson" ,jansson) - ("nlohmann-json" ,nlohmann-json) - ("libpng" ,libpng) - ("libzip" ,libzip) - ("mesa" ,mesa) - ("openrct2-objects" ,openrct2-objects) - ("openrct2-title-sequences" ,openrct2-title-sequences) - ("openssl" ,openssl) - ("sdl2" ,sdl2) - ("speexdsp" ,speexdsp) - ("zlib" ,zlib))) - (native-inputs - (list pkg-config)) - (home-page "https://github.com/OpenRCT2/OpenRCT2") - (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") - (description "OpenRCT2 is a free software re-implementation of -RollerCoaster Tycoon 2 (RCT2). The gameplay revolves around building and -maintaining an amusement park containing attractions, shops and facilities. - -Note that this package does @emph{not} provide the game assets (sounds, -images, etc.)") - ;; See - ;; regarding assets. - (license license:gpl3+))) - (define-public openriichi (package (name "openriichi") base-commit: 4bdb8bd2674c2b630626be43a5cd3c2b65401b52 -- 2.41.0