From patchwork Sun Nov 17 05:41:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Parnikkapore X-Patchwork-Id: 70464 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 026DB27BBEA; Sun, 17 Nov 2024 05:42:23 +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=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_MSGID_YAHOO,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 BA44827BBE2 for ; Sun, 17 Nov 2024 05:42:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCY2z-0006j3-HM; Sun, 17 Nov 2024 00:42:11 -0500 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 1tCY2w-0006iY-2o for guix-patches@gnu.org; Sun, 17 Nov 2024 00:42:06 -0500 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 1tCY2v-00088v-QJ for guix-patches@gnu.org; Sun, 17 Nov 2024 00:42:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:MIME-Version:Date:From:To:In-Reply-To:Subject; bh=fbVU1SXC9ZwEBkcYGxnYGuCRvIXxCC8G7uLxLENYbbI=; b=PGlLTVJsuzUe/5699/Chi7gfEvTcq9eBPaI1AFJrkn6fbb6DZbTpah8B+tUHQt1A6c6G7Z4rM6G4nm3CyVBKPo11CK+rbMyY3qpEFm/Qqsau5GFeUHMnS4IV/AY8cqxIfsUYPBS0O2m5J+jtcUIS4CcU2nnmt7P5glx8MC4JEGILay7bS2dkfIYlP8Uq/fnnDDVrL+NfZDD5Cwjzopmx/lUTupYH4SeJbQtpx/EoBtWE+luYwATB9NdccsDZXy5pvJmz52KjLdARESutoRyuX2OM+fkD7f+68kVY0o4YWJtFLHfOfby6vsd9oOyjjbbek7txShiWsSPvM47YnNvMnw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCY2r-0005bi-Nf; Sun, 17 Nov 2024 00:42:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74336] [PATCH v3] gnu: minetest: Update to 5.10.0. In-Reply-To: Resent-From: Parnikkapore Original-Sender: "Debbugs-submit" Resent-CC: poomklao@yahoo.com, liliana.prikler@gmail.com, adam.faiz@disroot.org, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 05:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74336@debbugs.gnu.org Cc: Parnikkapore , Liliana Marie Prikler , Adam Faiz , =?utf-8?b?w6XCrsKLw6bClsKHw6bCrcKm?= X-Debbugs-Original-Xcc: Parnikkapore , Liliana Marie Prikler , Adam Faiz , =?utf-8?b?w6XCrsKLw6bClsKHw6bCrcKm?= Received: via spool by 74336-submit@debbugs.gnu.org id=B74336.173182211321541 (code B ref 74336); Sun, 17 Nov 2024 05:42:01 +0000 Received: (at 74336) by debbugs.gnu.org; 17 Nov 2024 05:41:53 +0000 Received: from localhost ([127.0.0.1]:55590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCY2i-0005bL-T6 for submit@debbugs.gnu.org; Sun, 17 Nov 2024 00:41:53 -0500 Received: from sonic310-21.consmr.mail.sg3.yahoo.com ([106.10.244.141]:45624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCY2d-0005b1-Pw for 74336@debbugs.gnu.org; Sun, 17 Nov 2024 00:41:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1731822099; bh=fbVU1SXC9ZwEBkcYGxnYGuCRvIXxCC8G7uLxLENYbbI=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=e3t+rgAt71lLDmeNqB2RPU3cPsoujMOl1XsNwhXMwRy2UXlNd3oBFG3Kc1WE4mUyLy9mhTc9VERm/+WMXn5s+043cau4wphZuZT24ohIG/8g/F5QfsZh3yuzuXnxJ9YerUfU2vvIchHe/2DFsXsAG3G5pXqWXI+OO9cKWRWANcySLdowoev33Ob2vvbFJN/cPHSIvCp+3DiwdvJzAnpzPiPFpI48NqSy3EH7AYhbam7jn29FFSFJtfAzn7YCCMlqMtL6eJeCNE4sMNfFZ0R9AIFH10aabbmJ9GwZw+LC0a4G/h19npezQCEES2AjGrErbV79xmAuAeC2F8Rk00fWxw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1731822099; bh=ojlxN5lWt8625fwOW2Q1kCclFdG+BMlQpL7Q3zFszbx=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=scOAUpl9V2iKaS66OUBORb8PyXfoKobECcSoSrynSvqigFWtbHGuKC6OqtfAPY/LuHrGVKKReLCyFBK4s69YrKzp25XFh82Sx4O1sTZgj7UOA6BvHNk58q1k1+czTop3V71rcaekWmXVYDEAXB3aIsy6wBihvyG4RZFn/ctGWzpKidRc6uEO88SrRdNqAr45Sg1JGNpnHqdYEErZ3OGADwrBISdY9AhVOXjdIkymG/NK8jpI48SVw+6h1dl9NBixRjEg5ttfF8Ap4QBVUy/1cV9K8+FTMD5P9M9nFKW+J+GAyWkALkOqTB03OznLGXdpGIPsqg7jFJX6PV14O4lCxA== X-YMail-OSG: tY.H_3EVM1l3LurZbEU9mAa9SWw1gcBHhQZDbIigdmGjQNxgZWGjtBiWRSK98YA Kz5ScI6IE1riELg.IjEUuRJIamqHlilNmE2F6K.hkJ.zc27XdCjzj_gNql4FbpRpFba2A_6TUU3I HfzmPZC9vrQFLdFoPx1D0_2QStE9EdFXA_n8bPy8ztn5ac5USwnu9NQCVqDeR95yktzU4wEuxtIh IFBK29zFiXca5rkI1aDHzAqM.D_mbUR6VwqFdO4G7I8ZHi.qLbqqb3BokTKrkS_CL3zTj5Eys.gr ZWGPYJsORjLdpvnS9eQ0AxlVqKGqdkkuB9lSNiouOO1yrFBphlN5gaU0tSJNAyhH_4Ut06r2Tws1 rySy0gwww5wxH51oTMtA8qNixUNvniklrXJV13gIc0PwKTF8DPaHueKXRmFH6Ef9x47JFrihenjU YMdyy.tHsgKpBvs1N.6reVS1al5E4rThYjiDH1ULwwt9PTCWaLSHvNCL_b.x35.Bmx2ZYEJrWp4X CRS7qz9Wh.cDLWPJpFja.f8vDK7FGSdc0.4_KmSemGOn53RKH7.ReFmyu6eehQ1THX8WzEkQQw3X dVP9ZLxGC011eidv1KTbb9T4Wmu7wtQh92VidjIiU2lgEjb5zKDHt9qAEEv5AKyqOBwvPzyQhbcE V9VSQa2ouO9HL0_TigJCItasD49vgRww1COUW8_vupFZ8wUuPhWBlG8Nj9xUTvX2Ns.hdSfhSZHe uVeXg4eokEWwX3Z2qR_MQB40fkP1DM83qvmo7POGrT.ZJ09nujpS3MyE1XRUIKg9aMe8EXVad4zZ iguEEcuV9gn8JD9JrBoBP3MQ.FUdHtfCe2qABptdPuU7Pwe8p6KPCruULne0ajm5v1j5leSx0Kbw g.ilgdZbywDHPYavUPNX7y3idt.qPKj1jjkIbqWcMFRvnzPeVVhtdZ6AzCCrcUBfh7yhyf0rMGX2 T5GHyLx5R.QqZZo5QqRUsWg.w59MzdOBRn9nEfdQPywtyvtoE4IjJ52k4lMXpCp7vj0GVGIAPVA5 oAMbzsuNnFEKMSnXeDDfADYPAG1_O58Ru.kD1L4TcoJjiA8zS_PeTwjpLZrjx46Gp.cOYqvbHxNC fhXqedut6ekgCKrFjos5.klLaIm1PFX3W8p31qUOP_JYEX3HBaaHsZMVREg7gOf3AqXztv0og9Eb tCCgkJFyEbMBPkOawhYo0vt9vg0C6uLo0fju78QQexL9pkEtvPrneL6apI.LcJSUtl1bA6ywXTFo 6WOCIID9olYwBTKRey1JjWiQodAWDSdO.TDnGeas97E2DMjX9FM_zoa9F6f5cUUlWrWoVN_Em3Zg RegQw.rB_E3EXEO5rzCxjXidDUH1RWwNmTgKzugTSRkGsc70bzvDMOdfhnslUOmthB9lON2vS0kv ZOUklPbFXBhfx7UyK0irwKTGyqfMIEgkv1Ws3uWgcQeUApUs2hK42lzVTqplVkr5KPhJKOnpZn3l B4nSGiPgNr7qCqPlyzLJjAewqvd2o2Y.JTS0ofNftpkQGbWnOjitkpu_KOhVXPtp9mXTBzQaeMCd qJbvEYrji9H23taXhOS2a8ny.r3FDNeM89cO9gQwT1GPQmupl7dnw6VA8k3HDdP.xxN0Q5erWiEE TvOCV25LjG.rfdB90.fPkVtuiLWu7pPA8TMlH_AkiODfNvT.VLqPBioCH8SKq8HNeF5JNR1d4O.s 3zR89CkDQv68vy0QFJAVS8NJganknMayRHyYz1kEiOaPuntiLc981mA2spMaaEBw0tPo0jauqtp0 3oESOITCe4khExtlQgUtsQOqNEP0w71I0f5s8Vd9g.Fenn9yeByCm0BZUDDU3eH9Dx0q7GaDVGgf 1Umg3OimqoJw1v1U2B_JaDZz0oB1321DwIwnnTX.at60innrg0NwhB0SdtLqBtqf3uLxC_7C82x0 kyoQ99Axx2207pRb5kXXCz035mClOSOL3tSLJr8fQ33dYPxw8YXipdtzSNTcUOXnDpVA0.qiiS.O jHL1pD9ocR8JSy12K0RubeDIhKJHzGhPN11P48MZB254eDG5JbsIbqZIOOuA5p4zT0fIpq0cq7di 4BN67ACjJvHxMVUtM9AQDdiHxEAY13iEAoTSMx50GSY54JrFdGqpGCfh.TsOEfpeJlHxvzckGCC0 qSN6dyttFD7ZyDp5NAUlrL4czlQBOjcuXUNCydMbqkgyhuNtK60igHTIjK1bKEH6BGVT9d94W2X3 ubTtQEgkjjhi1zsuaKVVTP7ctklCwt7gGg6Xsu5GQawMd X-Sonic-MF: X-Sonic-ID: dfa6f4c0-c42c-420b-a9e2-57e1d42fc98c Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.sg3.yahoo.com with HTTP; Sun, 17 Nov 2024 05:41:39 +0000 Received: by hermes--production-sg3-5b7954b588-wvg78 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 24e685d33611dc41bab968cd85a7df08; Sun, 17 Nov 2024 05:41:35 +0000 (UTC) Date: Sun, 17 Nov 2024 13:41:27 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 References: 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: Parnikkapore X-ACL-Warn: , Parnikkapore via Guix-patches X-Patchwork-Original-From: Parnikkapore via Guix-patches via From: Parnikkapore 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 * gnu/packages/minetest.scm (minetest): Update to 5.10.0. [source] : Fix unbundling and unbundle catch2. [arguments] <#:configure-flags>: Remove redundant flags. [arguments] <#:phases>: Remove all patches no longer applicable. [inputs]: Add catch2@3. Remove coreutils and libxxf86vm. Change-Id: If8720bb51309d7c251e76a1885695851f3a03255 --- This patch performs additional devendoring, adds another test run by upstream's CI, and cleans up a few more things. Thanks Liliana for the tip about scandir! > Uhm… why does the build install to ../source? D: The upstream build system does that, even when compiled normally. The original package definition also used the in-tree copy, so I kept it that way. gnu/packages/minetest.scm | 79 ++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 46 deletions(-) base-commit: 0e1ffbc7f5f060f89c890472377a6102f27f6e9b diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 2552596ef8..3c184028ce 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -28,6 +28,7 @@ (define-module (gnu packages minetest) #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) @@ -54,7 +55,7 @@ (define-module (gnu packages minetest) (define-public minetest (package (name "minetest") - (version "5.9.0") + (version "5.10.0") (source (origin (method git-fetch) @@ -63,56 +64,39 @@ (define-public 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. + (base32 "1nsnsf1axiazb8zz51c0742kh0qx2b298pr5mr91m0l9r6dv1sdj")) + (modules '((guix build utils) + (srfi srfi-26) + (ice-9 ftw))) + ;; 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. + ;; - tiniergltf is intended for Minetest and diverged from upstream. (snippet - '(begin + '(let ((libs-to-keep '("." ".." "sha256" "tiniergltf"))) (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)))) + (for-each delete-file-recursively + (scandir "." (negate (cut member <> libs-to-keep))))) + ;; IrrlichtMT includes + (delete-file-recursively "irr/include/KHR") + (delete-file-recursively "irr/src/vendor") + (substitute* "irr/src/COpenGLCommon.h" + (("\"vendor/gl.h\"") "")) + ;; Catch2 + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(lib/catch2\\)") "find_package(Catch2 3 REQUIRED)")) + (substitute* "src/catch.h" + (("catch_amalgamated.hpp") "catch2/catch_all.hpp")))))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DENABLE_LTO=ON" - "-DENABLE_UPDATE_CHECKER=FALSE" - (string-append "-DCURL_INCLUDE_DIR=" - (search-input-directory - %build-inputs "include/curl")) - (string-append "-DZSTD_INCLUDE_DIR=" - (dirname (search-input-file - %build-inputs - "include/zstd.h"))) - (string-append "-DZSTD_LIBRARY=" - (search-input-file - %build-inputs "lib/libzstd.so"))) + "-DENABLE_UPDATE_CHECKER=FALSE") #: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) @@ -120,7 +104,10 @@ (define-public minetest ;; when invoked on the target outside of `guix build'. (when tests? (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) + (setenv "MINETEST_GAME_PATH" + (string-append (getcwd) "/../source/games")) + (invoke "../source/bin/luanti" "--run-unittests") + (invoke "../source/util/test_multiplayer.sh"))))))) (native-search-paths (list (search-path-specification (variable "MINETEST_GAME_PATH") @@ -129,8 +116,8 @@ (define-public minetest (variable "MINETEST_MOD_PATH") (files '("share/minetest/mods"))))) (native-inputs (list pkg-config)) - (inputs (list coreutils - curl + (inputs (list curl + catch2-3 freetype gettext-minimal gmp @@ -139,7 +126,6 @@ (define-public minetest libpng libogg libvorbis - libxxf86vm libxi luajit mesa @@ -147,6 +133,7 @@ (define-public minetest openal sqlite `(,zstd "lib"))) + (outputs '("out" "debug")) (synopsis "Voxel game engine") (description "Minetest is a voxel game engine that supports modding and game creation