From patchwork Thu Jul 13 12:40:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 787712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7b6X0HmHz9ryk for ; Thu, 13 Jul 2017 22:41:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YfOlz0V6"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6604D8A2D4; Thu, 13 Jul 2017 12:41:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7c4Qq6G--4SS; Thu, 13 Jul 2017 12:41:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6108F8A2D5; Thu, 13 Jul 2017 12:41:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8E8891BFB1F for ; Thu, 13 Jul 2017 12:41:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8A42030A8E for ; Thu, 13 Jul 2017 12:41:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CVSah4XjiljM for ; Thu, 13 Jul 2017 12:41:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by silver.osuosl.org (Postfix) with ESMTPS id 9CD7730A89 for ; Thu, 13 Jul 2017 12:41:06 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id 62so22360887wmw.1 for ; Thu, 13 Jul 2017 05:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rxJHkbr5ZV+xo17w1N/5669Ds4SdVfJ+4xMcORMYkgQ=; b=YfOlz0V6E+zDCQVdOzoMPJog6g+0cT/HOndfeTX/m0DWKGYJyiQuPtWfkSt254VwW5 Y5tvTPbTMAd8U3oE/jWIBjRxXCzjSRf63y4bJOwObUkDHw+g1krXouYn3LQ7rOoRN4sP +XVij++ARGHWu0XqEg73i/E5ZUeNKpmtgYAQMZxTKJHPTGTfILb0+buaeXwHwQIHMj4a zrreb5KBHdl44BaIcvjAWWK4kco1LyxHCZg4S0PEgTCM3/3+5lKsWIOtHfbmBccQRYOM E1jlh49zIkwKmlF1lgN4jInvD/PDj++W2MzayFrG/wlKLE3wwmGdn+5H/zJnu+He9Exw C7Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rxJHkbr5ZV+xo17w1N/5669Ds4SdVfJ+4xMcORMYkgQ=; b=AhLDbqAO1pEuUoEo/JOTTRRiaZ/aizvlqgi6Fz5LavBA12A2Qf8BrQAQf9NLK3lWI4 FDeijh/EcX3F1vcmYw6eBAJPnhYSdMhLKlv0LeIvzXyRTE5Fz20zTYpEEiK2/G39oMsX mw9MXk2j0WSDKyFiAvvNF6qQDs0ODk26FWzYFoVmroPgd7gvNUExoHWcFGc2vShxoQI3 nmlFKxKmLNGYMWGOPAQhiX8qTr4yv5O5jdJA7XEViEFZ0e6dnMpPqHKz8nOhmrDmOzGl OSEEOagnly5qu2DnJ/9cRgZ+a0aKVePJHVGcqRAbjyblOX4Mf1asEWDphn9GlPrEqeBN 3vMA== X-Gm-Message-State: AIVw113SaEClnKA7dZTi1XEn0Xyx1CpRSlioX5ArjwahKSSjHYp6turO zfhj/ieOF3bNbpNkSNc= X-Received: by 10.28.132.147 with SMTP id g141mr1828301wmd.130.1499949664904; Thu, 13 Jul 2017 05:41:04 -0700 (PDT) Received: from localhost.localdomain (gam75-1-81-57-22-125.fbx.proxad.net. [81.57.22.125]) by smtp.gmail.com with ESMTPSA id 67sm110047wrc.34.2017.07.13.05.41.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 05:41:04 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 14:40:52 +0200 Message-Id: <20170713124052.13708-10-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170713124052.13708-1-romain.naour@gmail.com> References: <20170713124052.13708-1-romain.naour@gmail.com> Cc: Romain Naour Subject: [Buildroot] [PATCH v3 10/10] package/minetest_game: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Romain Naour --- v3: use "cp -dpfr" instead of rsync (ThomasP). remove nyancat mod license. sort licenses by name. add licenses hashes. v2: update to 0.4.16 update license file Add a hash file backport an upstream patch due to regression. --- DEVELOPERS | 1 + package/Config.in | 1 + ...lt-Revert-Default-Shorter-and-better-ABMs.patch | 54 ++++++++++++++++++++++ package/minetest_game/Config.in | 7 +++ package/minetest_game/minetest_game.hash | 25 ++++++++++ package/minetest_game/minetest_game.mk | 39 ++++++++++++++++ 6 files changed, 127 insertions(+) create mode 100644 package/minetest_game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch create mode 100644 package/minetest_game/Config.in create mode 100644 package/minetest_game/minetest_game.hash create mode 100644 package/minetest_game/minetest_game.mk diff --git a/DEVELOPERS b/DEVELOPERS index ace8058..2f7a1ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1438,6 +1438,7 @@ F: package/linux-syscall-support/ F: package/lugaru/ F: package/mcelog/ F: package/minetest/ +F: package/minetest_game/ F: package/openpowerlink/ F: package/physfs/ F: package/stress-ng/ diff --git a/package/Config.in b/package/Config.in index cb1cdb1..ee17d21 100644 --- a/package/Config.in +++ b/package/Config.in @@ -229,6 +229,7 @@ menu "Games" source "package/ltris/Config.in" source "package/lugaru/Config.in" source "package/minetest/Config.in" + source "package/minetest_game/Config.in" source "package/opentyrian/Config.in" source "package/opentyrian-data/Config.in" source "package/prboom/Config.in" diff --git a/package/minetest_game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch b/package/minetest_game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch new file mode 100644 index 0000000..e484e50 --- /dev/null +++ b/package/minetest_game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch @@ -0,0 +1,54 @@ +From 626cd8e9c7c2a5d5c907a12abbaa6066b6d5f2ff Mon Sep 17 00:00:00 2001 +From: "vorunbekannt75@web.de" +Date: Tue, 6 Jun 2017 19:20:58 +0200 +Subject: [PATCH] Default: Revert "Default: Shorter and better ABMs" + +This reverts commit e523c3a2965afe76b9102b67992e15fafba1594a to re-enable +the overriding and redefinition of these global functions. + +[Romain backport from upstream] +Signed-off-by: Romain Naour +--- + mods/default/functions.lua | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/mods/default/functions.lua b/mods/default/functions.lua +index 5dc22ca..327e0c8 100644 +--- a/mods/default/functions.lua ++++ b/mods/default/functions.lua +@@ -139,7 +139,9 @@ if minetest.settings:get_bool("enable_lavacooling") ~= false then + interval = 1, + chance = 2, + catch_up = false, +- action = default.cool_lava, ++ action = function(...) ++ default.cool_lava(...) ++ end, + }) + end + +@@ -222,7 +224,9 @@ minetest.register_abm({ + neighbors = {"group:sand"}, + interval = 12, + chance = 83, +- action = default.grow_cactus ++ action = function(...) ++ default.grow_cactus(...) ++ end + }) + + minetest.register_abm({ +@@ -231,7 +235,9 @@ minetest.register_abm({ + neighbors = {"default:dirt", "default:dirt_with_grass"}, + interval = 14, + chance = 71, +- action = default.grow_papyrus ++ action = function(...) ++ default.grow_papyrus(...) ++ end + }) + + +-- +2.9.4 + diff --git a/package/minetest_game/Config.in b/package/minetest_game/Config.in new file mode 100644 index 0000000..75978e9 --- /dev/null +++ b/package/minetest_game/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MINETEST_GAME + bool "minetest_game" + depends on BR2_PACKAGE_MINETEST + help + The main subgame for the Minetest engine. + + https://github.com/minetest/minetest_game diff --git a/package/minetest_game/minetest_game.hash b/package/minetest_game/minetest_game.hash new file mode 100644 index 0000000..602dbfe --- /dev/null +++ b/package/minetest_game/minetest_game.hash @@ -0,0 +1,25 @@ +# Locally calculated +sha256 ea914555949b4faccda5e13143cb021d2f9a5fa19abd1f5e4b7b65004cbd2b5a minetest_game-0.4.16.tar.gz + +sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt +sha256 3382f3bf99566089543621ee3256f7f98bf9364d3b852c5ed08202d435215d7d mods/beds/license.txt +sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt +sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt +sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt +sha256 c0eca35bf446b1b9c8a0d1eefa0613bf2996187cd1f9382e7424b3d0b0dd7851 mods/creative/license.txt +sha256 0542a1ff8212197bf350b6135fb4d29f8a2341d9ddc1407ec812d7fb609a5c0f mods/default/license.txt +sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt +sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt +sha256 a8647ac7609fdaea96bd0ec58ac5837fd17d049fd450008fd7922162979a292e mods/flowers/license.txt +sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt +sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt +sha256 a82dfda1c9feb704997ea42116eb6a15a1f3f99ee8c49215fbbd32d519e8ad74 mods/stairs/license.txt +sha256 1d42ffae6bad0da2e76966532f5f759bbeb5adb395ee4bf7bacca1fdfef745a6 mods/tnt/license.txt +sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt +sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt +sha256 54fd170807a31712e3d6489287a27cdf5aa42eaff10e321aea040fb5b3e5a60a mods/xpanes/license.txt diff --git a/package/minetest_game/minetest_game.mk b/package/minetest_game/minetest_game.mk new file mode 100644 index 0000000..2386944 --- /dev/null +++ b/package/minetest_game/minetest_game.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# minetest_game +# +################################################################################ + +MINETEST_GAME_VERSION = 0.4.16 +MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) +MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ + CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) +MINETEST_GAME_LICENSE_FILES = LICENSE.txt \ + mods/beds/license.txt \ + mods/boats/license.txt \ + mods/bones/license.txt \ + mods/bucket/license.txt \ + mods/carts/license.txt \ + mods/creative/license.txt \ + mods/default/license.txt \ + mods/doors/license.txt \ + mods/dye/license.txt \ + mods/farming/license.txt \ + mods/fire/license.txt \ + mods/flowers/license.txt \ + mods/give_initial_stuff/license.txt \ + mods/screwdriver/license.txt \ + mods/sethome/license.txt \ + mods/stairs/license.txt \ + mods/tnt/license.txt \ + mods/vessels/license.txt \ + mods/walls/license.txt \ + mods/wool/license.txt \ + mods/xpanes/license.txt + +define MINETEST_GAME_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/share/minetest/games/minetest_game + cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/minetest/games/minetest_game +endef + +$(eval $(generic-package))