From patchwork Thu Jul 13 12:40:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 787703 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 3x7b5s6kyhz9ryk for ; Thu, 13 Jul 2017 22:41:05 +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="QBKbmusW"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B7FF68A266; Thu, 13 Jul 2017 12:41:02 +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 PFCuUxKYicv7; Thu, 13 Jul 2017 12:41:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DCBF48A261; Thu, 13 Jul 2017 12:41:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 123361BFB1F for ; Thu, 13 Jul 2017 12:41:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0B16F8A180 for ; Thu, 13 Jul 2017 12:41:00 +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 p2W1hTZW53hq for ; Thu, 13 Jul 2017 12:40:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id 060F18A156 for ; Thu, 13 Jul 2017 12:40:59 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id j85so4844666wmj.0 for ; Thu, 13 Jul 2017 05:40:58 -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; bh=uCn7i1ltPcAHkdXkzEQFFs/v7M5EWIFHIOwLANHlkPo=; b=QBKbmusWEYdkEdN8HeunkYOgIGaa7kWgAm0R/ErL3oJqZx+L+eLd4du+CuOityAPec tyaA4WjiZ69moVo+oP8dYh4oV3w/u1fhPZDhM472aF4fiObp3pTMxGQ35tYc97VcdJNm je3LIVfiYO1IJlJbp9p5J+OOStqhVgBXKnegxEvB0ok3wlS5jt+/f/1ZvnFVjn4nMCDc qdpg9n7gYAbrjVPZCUUgprbyO5MFUXe3YJK71C8MW+jipRiUgvEnEUrkz2JE6rEXfv7O b412OLyV00RTVqal9l2Z02iwK4zKeUMZPHnEsS6mbY0r4Y7Je+hRMTY/1/I5rtJPPwge FkkQ== 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; bh=uCn7i1ltPcAHkdXkzEQFFs/v7M5EWIFHIOwLANHlkPo=; b=mBdvF1k4TODzx5Z5nu+bZWNPic1dm4uks8tjaXAJTRZyCZJPgxID0u2iPXrPT3tGDS 0AGIZ2SuCjUORvRSnF1mk6XzfeAPh699J/OlQvIoconlEE0elzkjkJXW8p4aZQMdDECQ PsIV+ETSBJB1IelvNtcIT/HG8pL74yYI50UMVwHyQhe8w2lPDBVzPe0l+GN5i+EEUaLm 36aP9TbLdI9TaSXWH9GKugAK4FqSHUD0VVB+E2r9rILPwXHdkjq9b3ejIh2SHfLSWR0A OhUvS7l1zWlMRjyekz3AsTKjmf1RPeulpgtmeUINRDaxQiH5VpHgC5FQk+gla84V+b5M bV9w== X-Gm-Message-State: AIVw110LXM4CKgEW4adAFgOe1MzlAhE/02AhVB4h+ZtUdHIlcGvnfMI/ bHTj1W91/ClGkjVw12k= X-Received: by 10.28.29.21 with SMTP id d21mr1914819wmd.37.1499949657238; Thu, 13 Jul 2017 05:40:57 -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.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 05:40:56 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 14:40:43 +0200 Message-Id: <20170713124052.13708-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.4 Cc: Romain Naour Subject: [Buildroot] [PATCH v3 01/10] package/minetest: 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: Simplify Config.in entry (ThomasP) fix Alphabetic ordering (ThomasP) Improve license informations (ThomasP) jpeg removed from mendatory dependencies (minetest client only) Drop Intl patch that was required before BR2_SYSTEM_ENABLE_NLS. Add license hash. v2: add package dependencies comments add hash file (Bernd) bump to 0.4.16 (Bernd) version 0.4.15 Tested-by Bernd Add a new patch fixing linking with libintl when necessary --- DEVELOPERS | 1 + package/Config.in | 1 + package/minetest/Config.in | 53 ++++++++++++++++++++++++++++++++++++++++++ package/minetest/minetest.hash | 4 ++++ package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 package/minetest/Config.in create mode 100644 package/minetest/minetest.hash create mode 100644 package/minetest/minetest.mk diff --git a/DEVELOPERS b/DEVELOPERS index f392838..ace8058 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1437,6 +1437,7 @@ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/lugaru/ F: package/mcelog/ +F: package/minetest/ F: package/openpowerlink/ F: package/physfs/ F: package/stress-ng/ diff --git a/package/Config.in b/package/Config.in index b48ab5e..cb1cdb1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -228,6 +228,7 @@ menu "Games" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" source "package/lugaru/Config.in" + source "package/minetest/Config.in" source "package/opentyrian/Config.in" source "package/opentyrian-data/Config.in" source "package/prboom/Config.in" diff --git a/package/minetest/Config.in b/package/minetest/Config.in new file mode 100644 index 0000000..a76c319 --- /dev/null +++ b/package/minetest/Config.in @@ -0,0 +1,53 @@ +config BR2_PACKAGE_MINETEST + bool "minetest" + depends on BR2_INSTALL_LIBSTDCPP # irrlicht + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_XORG7 # irrlicht + depends on BR2_PACKAGE_HAS_LIBGL # irrlicht + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + select BR2_PACKAGE_IRRLICHT + select BR2_PACKAGE_GMP + select BR2_PACKAGE_JSONCPP + select BR2_PACKAGE_LUAJIT + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_ZLIB + # At least one option must be enabled + select BR2_PACKAGE_MINETEST_CLIENT if !BR2_PACKAGE_MINETEST_SERVER + help + Minetest is a near-infinite-world block sandbox game and a + game engine, inspired by InfiniMiner, Minecraft, and the + like. + + http://www.minetest.net + +if BR2_PACKAGE_MINETEST + +config BR2_PACKAGE_MINETEST_CLIENT + bool "minetest client" + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_XLIB_LIBXXF86VM + help + Build Minetest client. + +config BR2_PACKAGE_MINETEST_SERVER + bool "minetest server" + help + Build Minetest server. + +endif + +comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads" + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + || !BR2_TOOLCHAIN_HAS_THREADS + +comment "minetest needs X11 and an OpenGL provider" + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on (BR2_INSTALL_LIBSTDCPP \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + && BR2_TOOLCHAIN_HAS_THREADS) + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash new file mode 100644 index 0000000..5e6aeff --- /dev/null +++ b/package/minetest/minetest.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 0ef3793de9f569746ea78af7a66fe96ef65400019e5e64a04a5c3fa26a707655 minetest-0.4.16.tar.gz + +sha256 e48121374512b8f2fada00ac1c8e100a767e2a2edd2853557ccf1995e35a4be0 README.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk new file mode 100644 index 0000000..df9c00d --- /dev/null +++ b/package/minetest/minetest.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# minetest +# +################################################################################ + +MINETEST_VERSION = 0.4.16 +MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) +MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) +MINETEST_LICENSE_FILES = README.txt + +MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib + +MINETEST_CONF_OPTS = \ + -DDEFAULT_RUN_IN_PLACE=OFF \ + -DENABLE_CURL=OFF \ + -DENABLE_GETTEXT=OFF \ + -DENABLE_SOUND=OFF \ + -DENABLE_GLES=OFF \ + -DENABLE_FREETYPE=OFF \ + -DENABLE_LUAJIT=ON \ + -DENABLE_CURSES=OFF \ + -DENABLE_POSTGRESQL=OFF \ + -DENABLE_LEVELDB=OFF \ + -DENABLE_REDIS=OFF \ + -DENABLE_SPATIAL=OFF \ + -DAPPLY_LOCALE_BLACKLIST=OFF \ + -DENABLE_SYSTEM_GMP=ON \ + -DENABLE_SYSTEM_JSONCPP=ON + +ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) +MINETEST_DEPENDENCIES += bzip2 jpeg libgl libpng xlib_libXxf86vm +MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON +else +MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF +endif + +ifeq ($(BR2_PACKAGE_MINETEST_SERVER),y) +MINETEST_CONF_OPTS += -DBUILD_SERVER=ON +else +MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF +endif + +$(eval $(cmake-package))