From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eCauErht2mZdMwEAe85BDQ:P1 (envelope-from ) for ; Fri, 06 Sep 2024 02:49:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id eCauErht2mZdMwEAe85BDQ (envelope-from ) for ; Fri, 06 Sep 2024 04:49:28 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vGTJ2JkF; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=1QFR5LrJ; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="U j/ASRe"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725590968; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kanmAM8+D0WFFpcSq7AQ/E4fdS5bgSnaMt85f+VoL8g=; b=L5zYT54BnAiGzKjV2QgapO7oFXtB9R4LN7Lqm44awqW2ow3aDlg2m6m9nwOyUymv7B+qso sOm6acwaq8f5OJFzeBdVIgLSPhrPQKPt1fTciaCmp4gRO56lBe6yDXiP7W9sYkqwAaLmTT yepIhcDOHeptH0y7N/C3OwLo/+MtOcJRHf+ey8cCx4pztvH8mlZDaxZbo4vBquEdb5cCdt km/Jh/RtfQTIXSFqFt9X4xZDS2ZQyHwjLYkY82ZQQIBL1lpBdAjHerKimlot3K4svsHD3D BFDV5uvJAmpJjTsxl9oVr4qBQcmg4u0BcDycGP5Kz5lsl4ebPHUrv8WLxtTM5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725590968; a=rsa-sha256; cv=none; b=FKYjvYvPLBAxDScVPYzZGlSPEeaOlXdaqB4pR9TRz4QTKnG3fHqsxey6q/Ka89+48NXA3q K29gdzhgDzFYPB9gzR6+u6R0vywUW7kZOgfMlGI7YSRcv6kliuWmh5YzLTs/OfFKPUhXOv C8z76u0qjIe0Ut5LP6Q/GFZFB26F57imtkrT/QP2/U8Nev7zURURs77pAzxLnzdP273C3Q J0yP4ZCafHKB1UPuNV9bhDT3AXfLJOK0BB0l4gqQC4abNppEz4uo0MyIAg74nr0NCcHrwm 4tjnLeSIA8DFn56Enks+WUD0X9Wx3nFbwJNrwYPvLeOYpH3c9yj1z+VSXhXtkg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vGTJ2JkF; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=1QFR5LrJ; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="U j/ASRe"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" 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 656866796B for ; Fri, 6 Sep 2024 04:49:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smP1y-0000Tt-EY; Thu, 05 Sep 2024 22:49: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 1smP1t-0000Gl-OA for guix-patches@gnu.org; Thu, 05 Sep 2024 22:48:58 -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 1smP1t-00028q-Eq for guix-patches@gnu.org; Thu, 05 Sep 2024 22:48:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=kanmAM8+D0WFFpcSq7AQ/E4fdS5bgSnaMt85f+VoL8g=; b=vGTJ2JkF6nPteepUM8kakDstgfGcp6RdA+kHgbdXs4kSqOvHNQwg+tzZi/Z2cG0uUJmip6/umoDzlL2q2/o0Ag+JYhnDYg4bLyHOrAZ/ym33ZBw9hyGdI+HeO38vP3IUfSeFk/YZ8pdsua5+LikYXCYvvO5Ckx2R1NT/jgFj9869Qg5nfqMP5yohHxFWCdcCjq7miunHsn5tZ1iDSrW0aLy3wrbheloUAdfNkvC1sO5v+8vI70yDysraYNrxnhbNV8vHf64HiaI8aDwdjOG6E5LUXi+IfWTfw9huWG3KZvKHlknF9LKJP5Url2Qq3+1GEi4DhnRd3YNg2S8ERxuD1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smP2w-0006iw-7T for guix-patches@gnu.org; Thu, 05 Sep 2024 22:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72912] [PATCH 0/1] Update Minetest to 5.9.0 (again) Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 02:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jan Wielkiewicz Cc: Adam Faiz , 72912@debbugs.gnu.org, Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 72912-submit@debbugs.gnu.org id=B72912.172559099925831 (code B ref 72912); Fri, 06 Sep 2024 02:50:02 +0000 Received: (at 72912) by debbugs.gnu.org; 6 Sep 2024 02:49:59 +0000 Received: from localhost ([127.0.0.1]:38715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smP2s-0006iY-C4 for submit@debbugs.gnu.org; Thu, 05 Sep 2024 22:49:59 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:49247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smP2o-0006iG-Q1 for 72912@debbugs.gnu.org; Thu, 05 Sep 2024 22:49:56 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 36F3A11402E5; Thu, 5 Sep 2024 22:48:43 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Thu, 05 Sep 2024 22:48:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s= mesmtp; t=1725590923; x=1725677323; bh=kanmAM8+D0WFFpcSq7AQ/E4fd S5bgSnaMt85f+VoL8g=; b=1QFR5LrJ3TBdCikpdLi6BHVQVveGK/xmYU4yOtGzG 6u7eE/qlauBKo9V01yi+rnkyJ+FXzTc/hy4ow/NDL4N5BV4YZuhLR58sr3T814n3 ewfvc28v9VE1hNpNHzzeTf0ndPRj7pprkogtg4hGh3stFmX2PC8u4dRXK/PJNhaB Sg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725590923; x= 1725677323; bh=kanmAM8+D0WFFpcSq7AQ/E4fdS5bgSnaMt85f+VoL8g=; b=U j/ASRe+CsPSVUZcRseQf6TTet3HhHWw4fj0Hxgs/KiTRpAJwKbonAqd/IetZLOOy QXY+SahB9CQkBOmQRy0mn3bWT8I1nqoWpPihUTdAaGgNb0iiFyK/3qYuKYN4cNuG M8ZVelxWQ4y441VIKguwHkaj2doD3DM9C+YNOeeyDpFiJo2MDLyh/Zuq48V9fSJB 4ndARKFcgCF4UbNGP0WTIKRhDqxyMZR4cRse1GYDf8absFPlLv0UOX6WyFdPc14z yFhv2U3f/rztKh34ZWQYRfEwGDtF4e9j3oouerwL+bBH5zKZGdvOYWTpGkXGhFwj aHQepnb0OAWuIZlDxxKnQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeitddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfffhvfevuffkfhggtggugfgjsehmkeerredttddv necuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnh grmhgvqeenucggtffrrghtthgvrhhnpeehtedugeethfeitdfgteelvdfhhefhheegjeej uddugeeileegjeeiieefteehtdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgvpdhnsggprhgtphht thhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehtohhnrggpkhhoshhmih gtiihnvghgohgpshhmihgvtghirgesihhnthgvrhhirgdrphhlpdhrtghpthhtoheplhhi lhhirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopeejvdelud dvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihihiihsohhnghesvghn vhhsrdhnvghtpdhrtghpthhtoheprggurghmrdhfrghiiiesughishhrohhothdrohhrgh X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Sep 2024 22:48:42 -0400 (EDT) Date: Thu, 5 Sep 2024 22:48:40 -0400 From: Leo Famulari Message-ID: References: <438cb9c032652d3ba32ae927121e58adb5c82abd.camel@gmail.com> <20240831142605.29484112@interia.pl> <20240906010548.1eab8fb1@interia.pl> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="POEc2VXidGVZkfyd" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240906010548.1eab8fb1@interia.pl> 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 656866796B X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -9.12 X-Spam-Score: -9.12 X-TUID: Gn8xldjLuErp --POEc2VXidGVZkfyd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Sep 06, 2024 at 01:05:48AM +0200, Jan Wielkiewicz wrote: > Do I need to apply the patch and resend it or will a maintainer take > care of that? I prepared an updated patch (attached). There's something I don't quite understand: The "minetest-game" package doesn't provide any executables. It's just data. The "minetest" package still runs and lets me play the basic minetest game locally or on a server. Is that expected? I would have expected differently based on the news about the removal of the game from the engine's codebase. Leo --POEc2VXidGVZkfyd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-minetest-Update-to-5.9.0.patch" Content-Transfer-Encoding: 8bit >From 6cbd545902644d18204ed9db6b8de6de24f7b62d Mon Sep 17 00:00:00 2001 Message-ID: <6cbd545902644d18204ed9db6b8de6de24f7b62d.1725590913.git.leo@famulari.name> From: Jan Wielkiewicz Date: Sat, 31 Aug 2024 12:54:59 +0200 Subject: [PATCH] gnu: minetest: Update to 5.9.0. The Minetest engine and the "Minetest Game" have been decoupled upstream in Minetest 5.9.0: https://dev.minetest.net/Changelog#Minetest_Game * gnu/packages/minetest.scm (minetest): Update to 5.9.0. [arguments]: Adjust #:configure-flags and #:phases to account for the removal of the Minetest Game from the Minetest codebase. [native-search-paths, synopsis, description]: Likewise. [inputs]: Remove IRRLICHT-FOR-MINETEST. (minetest-data): Update to 0.0.0-0.88ecab3. Rename to MINETEST-GAME and deprecate MINETEST-DATA. [synopsis, description]: Adjust to account for the decoupling of the game from the engine. * gnu/packages/games.scm (irrlicht-for-minetest): Remove variable. * guix/build-system/minetest.scm (default-minetest-game): New variable. (%default-modules): Use it. Change-Id: I0117bd33a2ce5eb1c79fdb29878682081f61dd4e Signed-off-by: Leo Famulari --- gnu/packages/games.scm | 24 +--- gnu/packages/minetest.scm | 235 +++++++++++++++++---------------- guix/build-system/minetest.scm | 4 + 3 files changed, 126 insertions(+), 137 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 30057a4f4a..7f0debac07 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -83,6 +83,7 @@ ;;; Copyright © 2024 Vagrant Cascadian ;;; Copyright © 2024 Sébastien Lerique ;;; Copyright © 2024 James Smith +;;; Copyright © 2024 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -3961,29 +3962,6 @@ (define-public irrlicht (home-page "https://irrlicht.sourceforge.io/") (license license:zlib))) -(define-public irrlicht-for-minetest - (package - (inherit irrlicht) - (name "irrlicht-for-minetest") - (version "1.9.0mt13") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/irrlicht") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11pxg0yh50ym1hvh8va5jbbcjz5dsshj3xxvm3qhkgg96vpism06")))) - (build-system cmake-build-system) - (arguments - ;; No check target. - (list #:tests? #f)) - (inputs - (modify-inputs (package-inputs irrlicht) - (prepend libxi))))) - (define-public mars ;; The latest release on SourceForge relies on an unreleased version of SFML ;; with a different API, so we take the latest version from the official diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 831ccf6e72..4ea4854695 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2020, 2021, 2022 Liliana Marie Prikler ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2024 Jan Wielkiewicz ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -29,7 +30,6 @@ (define-module (gnu packages minetest) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) - #:use-module (gnu packages games) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages image) @@ -53,105 +53,107 @@ (define-module (gnu packages minetest) (define-public minetest (package (name "minetest") - (version "5.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sww17h8z77w38jk19nsqxn8xcj27msq0glbil7pyj4i0ffprjrr")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled libraries. - (delete-file-recursively "lib") - #t)))) + (version "5.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h4yn4k0wpjr1h24aiqcnc9xsxgxj4bq757pla2pa9zmh2xf45kk")) + (modules '((guix build utils))) + ;; Delete bundled libraries, keep lib/sha256 because there's no good + ;; upstream, see: + ;; https://github.com/openssl/openssl/blob/master/crypto/sha/sha512.c + ;; "SHA512 low level APIs are deprecated for public use, + ;; but still ok for internal use." Also asked MT devs on IRC for this. + (snippet + '(begin + (with-directory-excursion "lib" + (for-each (lambda (file) + (if (not (string=? file "sha256")) + (delete-file-recursively file))) + (find-files (string-append "lib") #:directories? #t))) + #t)))) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DRUN_IN_PLACE=0" - "-DENABLE_FREETYPE=1" - "-DENABLE_GETTEXT=1" - "-DENABLE_SYSTEM_JSONCPP=TRUE" - (string-append "-DIRRLICHTMT_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/irrlichtmt")) + #~(list "-DENABLE_LTO=ON" + "-DENABLE_UPDATE_CHECKER=FALSE" (string-append "-DCURL_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/curl")) + (search-input-directory + %build-inputs "include/curl")) (string-append "-DZSTD_INCLUDE_DIR=" - (dirname - (search-input-file %build-inputs - "include/zstd.h"))) + (dirname (search-input-file + %build-inputs + "include/zstd.h"))) (string-append "-DZSTD_LIBRARY=" - (search-input-file %build-inputs - "lib/libzstd.so"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/filesys.cpp" - ;; Use store-path for "rm" instead of non-existing FHS path. - (("\"/bin/rm\"") - (format #f "~s" (search-input-file inputs "bin/rm")))) - (substitute* "src/CMakeLists.txt" - ;; Let minetest binary remain in build directory. - (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) - (substitute* "src/unittest/test_servermodmanager.cpp" - ;; do no override MINETEST_SUBGAME_PATH - (("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);") - "(void)0;")) - (setenv "MINETEST_SUBGAME_PATH" ; for check - (string-append (getcwd) "/games")))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Thanks to our substitutions, the tests should also run - ;; when invoked on the target outside of `guix build'. - (when tests? - (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) + (search-input-file + %build-inputs "lib/libzstd.so"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (format #f "~s" + (search-input-file inputs "bin/rm")))) + (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. + (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") + "")) + (substitute* "src/unittest/test_servermodmanager.cpp" + ;; do no override MINETEST_GAME_PATH + (("(un)?setenv\\(\"MINETEST_GAME_PATH\".*\\);") + "(void)0;")) + (setenv "MINETEST_GAME_PATH" ;for check + (string-append (getcwd) "/games")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; Thanks to our substitutions, the tests should also run + ;; when invoked on the target outside of `guix build'. + (when tests? + (setenv "HOME" "/tmp") + (invoke "src/minetest" "--run-unittests"))))))) (native-search-paths (list (search-path-specification - (variable "MINETEST_SUBGAME_PATH") + (variable "MINETEST_GAME_PATH") (files '("share/minetest/games"))) (search-path-specification (variable "MINETEST_MOD_PATH") (files '("share/minetest/mods"))))) - (native-inputs - (list pkg-config)) - (inputs - (list coreutils - curl - freetype - gettext-minimal - gmp - irrlicht-for-minetest - jsoncpp - libjpeg-turbo - libpng - libogg - libvorbis - libxxf86vm - luajit - mesa - ncurses - openal - sqlite - `(,zstd "lib"))) - (propagated-inputs - (list minetest-data)) - (synopsis "Infinite-world block sandbox game") + (native-inputs (list pkg-config)) + (inputs (list coreutils + curl + freetype + gettext-minimal + gmp + jsoncpp + libjpeg-turbo + libpng + libogg + libvorbis + libxxf86vm + libxi + luajit + mesa + ncurses + openal + sqlite + `(,zstd "lib"))) + (synopsis "Voxel game engine") (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways.") + "Minetest is a voxel game engine that supports modding and game creation +using its Lua modding API. It allows playing a wide range of voxel-based +games, installing mods and texture packs. This package only provides the base +platform, users need to install games themselves (for example, +@code{minetest-game}), either through Guix, the built-in interface or other +sources.") (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) @@ -183,35 +185,40 @@ (define-public minetest-server "openal"))) (synopsis "Infinite-world block sandbox game (server)") (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways. This package provides @command{minetestserver} to run a -Minetest server."))) + "Server for Minetest game engine and gaming platform. Allows hosting +Minetest games with multiplayer support. This package provides +@command{minetestserver} to run a Minetest server."))) -(define minetest-data - (package - (name "minetest-data") - (version (package-version minetest)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest_game") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pq4rm15lzwcqv6npgyz6v89hi3zj8zybw25n9i0d27qj786xc4z")))) - (build-system copy-build-system) - (arguments - (list #:install-plan - #~'(("." "/share/minetest/games/minetest_game")))) - (synopsis "Main game data for the Minetest game engine") - (description - "Game data for the Minetest infinite-world block sandbox game.") - (home-page "https://www.minetest.net/") - (license license:lgpl2.1+))) +(define-public minetest-game + (let ((commit "88ecab34d98550c8eb77f49ac2866b480a6e707a") + (revision "0")) + (package + (name "minetest-game") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest_game") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pvr3m7kxrriabw20sy6rhx0givh5ic85dk5g88cbbsy83admsp0")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("." "/share/minetest/games/minetest_game")))) + (synopsis "Ex-official game for Minetest game engine") + (description + "A game for the Minetest voxel game platform. It provides a very basic +Minecraft-like base for some mods. It is currently in maintenance mode +and gets no new features.") + (home-page "https://www.minetest.net/") + (license license:lgpl2.1+)))) + +;; This package is deprecated. "Minetest Game" is no longer the official game. +(define-public minetest-data + (deprecated-package "minetest-data" minetest-game)) (define-public (minetest-topic topic-id) "Return an URL (as a string) pointing to the forum topic with diff --git a/guix/build-system/minetest.scm b/guix/build-system/minetest.scm index 1fae3a47e9..9774c5882a 100644 --- a/guix/build-system/minetest.scm +++ b/guix/build-system/minetest.scm @@ -37,6 +37,9 @@ (define (default-optipng) (define (default-minetest) (module-ref (resolve-interface '(gnu packages minetest)) 'minetest)) +(define (default-minetest-game) + (module-ref (resolve-interface '(gnu packages minetest)) 'minetest-game)) + (define (default-xvfb-run) (module-ref (resolve-interface '(gnu packages xorg)) 'xvfb-run)) @@ -57,6 +60,7 @@ (define (standard-minetest-packages) `(("xvfb-run" ,(default-xvfb-run)) ("optipng" ,(default-optipng)) ("minetest" ,(default-minetest)) + ("minetest-game" ,(default-minetest-game)) ,@(filter (lambda (input) (member (car input) '("libc" "tar" "gzip" "bzip2" "xz" "locales"))) base-commit: 392a552524b7801b4a5517e40d860c05f010c655 -- 2.45.2 --POEc2VXidGVZkfyd--