All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 01/13] package/irrlicht: new package
@ 2017-06-12 20:53 Romain Naour
  2017-06-12 20:53 ` [Buildroot] [PATCH v2 02/13] package/libspatialindex: " Romain Naour
                   ` (12 more replies)
  0 siblings, 13 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:53 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
v2: Move to Target packages > Libraries > Graphics (Bernd)
    Place Zlib license first (Arnout)
    Add an explanation why we can't use libraries provided by Buildroot. (Arnout))
---
 DEVELOPERS                                         |  1 +
 package/Config.in                                  |  1 +
 ...-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch | 44 ++++++++++++++++
 package/irrlicht/0002-remove-sys-sysctl.h.patch    | 38 ++++++++++++++
 package/irrlicht/Config.in                         | 17 +++++++
 package/irrlicht/irrlicht.hash                     |  5 ++
 package/irrlicht/irrlicht.mk                       | 58 ++++++++++++++++++++++
 7 files changed, 164 insertions(+)
 create mode 100644 package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
 create mode 100644 package/irrlicht/0002-remove-sys-sysctl.h.patch
 create mode 100644 package/irrlicht/Config.in
 create mode 100644 package/irrlicht/irrlicht.hash
 create mode 100644 package/irrlicht/irrlicht.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 7d8b410..5ec1d7d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1382,6 +1382,7 @@ F:	package/efl/
 F:	package/enlightenment/
 F:	package/expedite/
 F:	package/iqvlinux/
+F:	package/irrlicht/
 F:	package/liblinear/
 F:	package/lensfun/
 F:	package/linux-syscall-support/
diff --git a/package/Config.in b/package/Config.in
index 3a99c86..938235f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1029,6 +1029,7 @@ menu "Graphics"
 	source "package/gtksourceview/Config.in"
 	source "package/harfbuzz/Config.in"
 	source "package/ijs/Config.in"
+	source "package/irrlicht/Config.in"
 	source "package/imlib2/Config.in"
 	source "package/jasper/Config.in"
 	source "package/jpeg/Config.in"
diff --git a/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch b/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
new file mode 100644
index 0000000..d6e4b63
--- /dev/null
+++ b/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
@@ -0,0 +1,44 @@
+From 5c5e6d0f469c8b4384bbe5d6c8f78069c182daf0 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 9 Apr 2017 19:56:55 +0200
+Subject: [PATCH] override CPPFLAGS, CXXFLAGS and CFLAGS in Makefile
+
+When CPPFLAGS is passed on the command line, include paths for the
+bundled libraries are lost. Since the hand written Makefile want
+to use them unconditionally, we need to use the key word "override"
+before CPPFLAGS.
+
+Do the same for CXXFLAGS and CFLAGS otherwise -fPIC is lost.
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ source/Irrlicht/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
+index 0712b07..b334e9c 100644
+--- a/source/Irrlicht/Makefile
++++ b/source/Irrlicht/Makefile
+@@ -62,7 +62,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ ###############
+ #Compiler flags
+ CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
+-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
++override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+@@ -74,8 +74,8 @@ CXXFLAGS += -pg
+ endif
+ CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+ 
+-sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+-sharedlib sharedlib_osx: CFLAGS += -fPIC
++sharedlib sharedlib_osx: override CXXFLAGS += -fPIC
++sharedlib sharedlib_osx: override CFLAGS += -fPIC
+ 
+ #multilib handling
+ ifeq ($(HOSTTYPE), x86_64)
+-- 
+2.9.3
+
diff --git a/package/irrlicht/0002-remove-sys-sysctl.h.patch b/package/irrlicht/0002-remove-sys-sysctl.h.patch
new file mode 100644
index 0000000..d9142a9
--- /dev/null
+++ b/package/irrlicht/0002-remove-sys-sysctl.h.patch
@@ -0,0 +1,38 @@
+From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 9 Apr 2017 22:20:19 +0200
+Subject: [PATCH] remove sys/sysctl.h
+
+With musl irrlicht doesn't build due to missing sys/sysctl.h
+
+fatal error: sys/sysctl.h: No such file or directory
+
+From [1]
+"sysctl does not work, and NEVER worked. using it is bogus.
+it was a bogus experimental syscall that was deprecated before
+it was ever used (basically, a broken binary version of
+/proc/sys, without any stability between kernel versions for
+what the binary constants meant)."
+
+[1] https://devsonacid.wordpress.com/tag/musl/
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ source/Irrlicht/COSOperator.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
+index 0899d1d..ccf5ef5 100644
+--- a/source/Irrlicht/COSOperator.cpp
++++ b/source/Irrlicht/COSOperator.cpp
+@@ -13,7 +13,6 @@
+ #include <unistd.h>
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #endif
+ 
+-- 
+2.9.3
+
diff --git a/package/irrlicht/Config.in b/package/irrlicht/Config.in
new file mode 100644
index 0000000..edd182b
--- /dev/null
+++ b/package/irrlicht/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_IRRLICHT
+	bool "irrlicht"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_HAS_LIBGL # use GLX
+	select BR2_PACKAGE_XLIB_LIBXXF86VM # libXxf86vm
+	help
+	  An open source high performance realtime 3D graphics engine.
+
+	  http://irrlicht.sourceforge.net/
+
+comment "irrlicht needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+comment "irrlicht needs X11 and an OpenGL provider"
+	depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
diff --git a/package/irrlicht/irrlicht.hash b/package/irrlicht/irrlicht.hash
new file mode 100644
index 0000000..489790e
--- /dev/null
+++ b/package/irrlicht/irrlicht.hash
@@ -0,0 +1,5 @@
+# From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4
+md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip
+sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip
+# locally calculated
+sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433  irrlicht-1.8.4.zip
diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk
new file mode 100644
index 0000000..61d5ccf
--- /dev/null
+++ b/package/irrlicht/irrlicht.mk
@@ -0,0 +1,58 @@
+################################################################################
+#
+# irrlicht
+#
+################################################################################
+
+IRRLICHT_VERSION_MAJOR = 1.8
+IRRLICHT_VERSION = $(IRRLICHT_VERSION_MAJOR).4
+IRRLICHT_SOURCE = irrlicht-$(IRRLICHT_VERSION).zip
+IRRLICHT_SITE = https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/$(IRRLICHT_VERSION_MAJOR)/$(IRRLICHT_VERSION)
+IRRLICHT_INSTALL_STAGING = YES
+
+# Bundled libraries: bzip2, libaesGladman, libpng, lzma, zlib,
+# The handcrafted Makefile can only use bundled libraries.
+IRRLICHT_LICENSE = Zlib (irrlicht), bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng
+IRRLICHT_LICENSE_FILES = \
+	doc/aesGladman.txt \
+	doc/bzip2-license.txt \
+	doc/irrlicht-license.txt \
+	doc/jpglib-license.txt \
+	doc/libpng-license.txt
+
+IRRLICHT_SUBDIR = source/Irrlicht
+
+IRRLICHT_DEPENDENCIES = libgl xlib_libXxf86vm
+
+define IRRLICHT_EXTRACT_CMDS
+	$(UNZIP) -d $(@D) $(DL_DIR)/$(IRRLICHT_SOURCE)
+	mv $(@D)/irrlicht-$(IRRLICHT_VERSION)/* $(@D)
+	$(RM) -r $(@D)/irrlicht-$(IRRLICHT_VERSION)
+endef
+
+IRRLICHT_CONF_OPTS = $(TARGET_CONFIGURE_OPTS)
+
+# Build a static library OR a shared library, otherwise we need to compile with -fPIC
+# "relocation R_X86_64_32S can not be used when making a shared object; recompile with -fPIC"
+ifeq ($(BR2_STATIC_LIBS),)
+IRRLICHT_CONF_OPTS += sharedlib
+endif
+
+define IRRLICHT_BUILD_CMDS
+	$(TARGET_MAKE_ENV)
+		$(MAKE) -C $(@D)/$(IRRLICHT_SUBDIR) $(IRRLICHT_CONF_OPTS)
+endef
+
+define IRRLICHT_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		INSTALL_DIR=$(STAGING_DIR)/usr/lib \
+		-C $(@D)/$(IRRLICHT_SUBDIR) install
+endef
+
+define IRRLICHT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		INSTALL_DIR=$(TARGET_DIR)/usr/lib \
+		-C $(@D)/$(IRRLICHT_SUBDIR) install
+endef
+
+$(eval $(generic-package))
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 02/13] package/libspatialindex: new package
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
@ 2017-06-12 20:53 ` Romain Naour
  2017-06-12 21:45   ` Thomas Petazzoni
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 03/13] package/minetest: " Romain Naour
                   ` (11 subsequent siblings)
  12 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:53 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>

---
test-pkg reported an internal compiler error on microblaze (br-microblazeel-full)
Index.cc: In member function 'void SpatialIndex::RTree::Index::adjustTree(SpatialIndex::RTree::Node*, std::stack<long long int>&)':
Index.cc:327:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1027
---
 DEVELOPERS                                   |  1 +
 package/Config.in                            |  1 +
 package/libspatialindex/Config.in            | 30 ++++++++++++++++++++++++++++
 package/libspatialindex/libspatialindex.hash |  4 ++++
 package/libspatialindex/libspatialindex.mk   | 14 +++++++++++++
 5 files changed, 50 insertions(+)
 create mode 100644 package/libspatialindex/Config.in
 create mode 100644 package/libspatialindex/libspatialindex.hash
 create mode 100644 package/libspatialindex/libspatialindex.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 5ec1d7d..dd12cfe 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1385,6 +1385,7 @@ F:	package/iqvlinux/
 F:	package/irrlicht/
 F:	package/liblinear/
 F:	package/lensfun/
+F:	package/libspatialindex/
 F:	package/linux-syscall-support/
 F:	package/lugaru/
 F:	package/mcelog/
diff --git a/package/Config.in b/package/Config.in
index 938235f..75b2436 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1409,6 +1409,7 @@ menu "Other"
 	source "package/libseccomp/Config.in"
 	source "package/libsigc/Config.in"
 	source "package/libsigsegv/Config.in"
+	source "package/libspatialindex/Config.in"
 	source "package/libtasn1/Config.in"
 	source "package/libtommath/Config.in"
 	source "package/libtpl/Config.in"
diff --git a/package/libspatialindex/Config.in b/package/libspatialindex/Config.in
new file mode 100644
index 0000000..0d066f6
--- /dev/null
+++ b/package/libspatialindex/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_LIBSPATIALINDEX
+	bool "libspatialindex"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  The purpose of libspatialindex is to provide:
+
+	  * An extensible framework that will support robust spatial
+	    indexing methods.
+
+	  * Support for sophisticated spatial queries. Range, point
+	    location, nearest neighbor and k-nearest neighbor as well
+	    as parametric queries (defined by spatial constraints)
+	    should be easy to deploy and run.
+
+	  * Easy to use interfaces for inserting, deleting and updating
+	    information.
+
+	  * Wide variety of customization capabilities. Basic index and
+	    storage characteristics like the page size, node capacity,
+	    minimum fan-out, splitting algorithm, etc. should be easy
+	    to customize.
+
+	  * Index persistence. Internal memory and external memory
+	    structures should be supported. Clustered and non-clustered
+	    indices should be easy to be persisted.
+
+	  https://libspatialindex.github.io
+
+comment "libspatialindex needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libspatialindex/libspatialindex.hash b/package/libspatialindex/libspatialindex.hash
new file mode 100644
index 0000000..3aa636d
--- /dev/null
+++ b/package/libspatialindex/libspatialindex.hash
@@ -0,0 +1,4 @@
+# From http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.5.tar.bz2.md5
+md5 3303c47fd85aa17e64ef52ebec212762 spatialindex-src-1.8.5.tar.bz2
+# Locally computed
+sha256 31ec0a9305c3bd6b4ad60a5261cba5402366dd7d1969a8846099717778e9a50a spatialindex-src-1.8.5.tar.bz2
diff --git a/package/libspatialindex/libspatialindex.mk b/package/libspatialindex/libspatialindex.mk
new file mode 100644
index 0000000..d815364
--- /dev/null
+++ b/package/libspatialindex/libspatialindex.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libspatialindex
+#
+################################################################################
+
+LIBSPATIALINDEX_VERSION = 1.8.5
+LIBSPATIALINDEX_SITE = http://download.osgeo.org/libspatialindex
+LIBSPATIALINDEX_SOURCE = spatialindex-src-$(LIBSPATIALINDEX_VERSION).tar.bz2
+LIBSPATIALINDEX_INSTALL_STAGING = YES
+LIBSPATIALINDEX_LICENSE = MIT
+LIBSPATIALINDEX_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 03/13] package/minetest: new package
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
  2017-06-12 20:53 ` [Buildroot] [PATCH v2 02/13] package/libspatialindex: " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-24 15:19   ` Thomas Petazzoni
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 04/13] package/minetest: add libcurl optional dependency Romain Naour
                   ` (10 subsequent siblings)
  12 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
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 +
 .../0001-CMake-link-with-Intl-when-necessary.patch | 55 +++++++++++++++++
 package/minetest/Config.in                         | 70 ++++++++++++++++++++++
 package/minetest/minetest.hash                     |  2 +
 package/minetest/minetest.mk                       | 44 ++++++++++++++
 6 files changed, 173 insertions(+)
 create mode 100644 package/minetest/0001-CMake-link-with-Intl-when-necessary.patch
 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 dd12cfe..6ef7b23 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1389,6 +1389,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 75b2436..4d59a68 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -226,6 +226,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/0001-CMake-link-with-Intl-when-necessary.patch b/package/minetest/0001-CMake-link-with-Intl-when-necessary.patch
new file mode 100644
index 0000000..61083f9
--- /dev/null
+++ b/package/minetest/0001-CMake-link-with-Intl-when-necessary.patch
@@ -0,0 +1,55 @@
+From 45ed3aa6be6d70cf76a4f10c81684ab86cb5017f Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Mon, 12 Jun 2017 21:57:05 +0200
+Subject: [PATCH] CMake: link with Intl when necessary
+
+On non Glibc system linking with Intl library may be needed when
+Gettext support is enabled.
+
+Fixes:
+clientlauncher.cpp:(.text+0xcac): undefined reference to `libintl_gettext'
+clientlauncher.cpp:(.text+0xdf0): undefined reference to `libintl_gettext'
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/CMakeLists.txt | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7c1a4ee..3f6b3f0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -70,6 +70,14 @@ if(ENABLE_GETTEXT)
+ 		endif()
+ 		set(USE_GETTEXT TRUE)
+ 		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
++		# On some platforms, such as Linux with GNU libc, the gettext
++		# functions are present in the C standard library and libintl
++		# is not required. For other libc (uClibc-ng or musl) libintl
++		# may be required.
++		find_package(Intl)
++		if(NOT Intl_LIBRARIES STREQUAL "")
++			message(STATUS "GetText Intl : ${Intl_LIBRARIES}")
++		endif()
+ 	endif(GETTEXT_FOUND)
+ else()
+ 	mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
+@@ -585,6 +593,7 @@ if(BUILD_CLIENT)
+ 		${PNG_LIBRARIES}
+ 		${X11_LIBRARIES}
+ 		${GETTEXT_LIBRARY}
++		${Intl_LIBRARIES}
+ 		${SOUND_LIBRARIES}
+ 		${SQLITE3_LIBRARY}
+ 		${LUA_LIBRARY}
+@@ -650,6 +659,7 @@ if(BUILD_SERVER)
+ 		${SQLITE3_LIBRARY}
+ 		${JSON_LIBRARY}
+ 		${GETTEXT_LIBRARY}
++		${Intl_LIBRARIES}
+ 		${LUA_LIBRARY}
+ 		${GMP_LIBRARY}
+ 		${PLATFORM_LIBS}
+-- 
+2.9.4
+
diff --git a/package/minetest/Config.in b/package/minetest/Config.in
new file mode 100644
index 0000000..d0613a2
--- /dev/null
+++ b/package/minetest/Config.in
@@ -0,0 +1,70 @@
+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
+	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
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+
+config BR2_PACKAGE_MINETEST_SERVER
+	bool
+
+choice
+	prompt "minetest build"
+
+config BR2_PACKAGE_MINETEST_CLIENT_ONLY
+	bool "client only"
+	select BR2_PACKAGE_MINETEST_CLIENT
+	help
+	  Build Minetest client only.
+
+config BR2_PACKAGE_MINETEST_SERVER_ONLY
+	bool "server only"
+	select BR2_PACKAGE_MINETEST_SERVER
+	help
+	  Build Minetest server only.
+
+config BR2_PACKAGE_MINETEST_CLIENT_SERVER
+	bool "client and server"
+	select BR2_PACKAGE_MINETEST_CLIENT
+	select BR2_PACKAGE_MINETEST_SERVER
+	help
+	  Build Minetest client and server.
+
+endchoice
+
+endif
+
+comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
+		|| !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "minetest needs X11, an OpenGL provider, luajit"
+	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 \
+		|| !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash
new file mode 100644
index 0000000..e4276c6
--- /dev/null
+++ b/package/minetest/minetest.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 0ef3793de9f569746ea78af7a66fe96ef65400019e5e64a04a5c3fa26a707655  minetest-0.4.16.tar.gz
diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
new file mode 100644
index 0000000..929016a
--- /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+, CC-BY-SA-3.0
+MINETEST_LICENSE_FILES = README.txt
+
+MINETEST_DEPENDENCIES = irrlicht gmp jpeg 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))
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 04/13] package/minetest: add libcurl optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
  2017-06-12 20:53 ` [Buildroot] [PATCH v2 02/13] package/libspatialindex: " Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 03/13] package/minetest: " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 05/13] package/minetest: add gettext " Romain Naour
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 929016a..e9abb04 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
 
 MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
-	-DENABLE_CURL=OFF \
 	-DENABLE_GETTEXT=OFF \
 	-DENABLE_SOUND=OFF \
 	-DENABLE_GLES=OFF \
@@ -41,4 +40,11 @@ else
 MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+MINETEST_DEPENDENCIES += libcurl
+MINETEST_CONF_OPTS += -DENABLE_CURL=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_CURL=OFF
+endif
+
 $(eval $(cmake-package))
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 05/13] package/minetest: add gettext optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (2 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 04/13] package/minetest: add libcurl optional dependency Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-24 15:20   ` Thomas Petazzoni
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 06/13] package/minetest: add freetype " Romain Naour
                   ` (8 subsequent siblings)
  12 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index e9abb04..3b2668b 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
 
 MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
-	-DENABLE_GETTEXT=OFF \
 	-DENABLE_SOUND=OFF \
 	-DENABLE_GLES=OFF \
 	-DENABLE_FREETYPE=OFF \
@@ -40,6 +39,13 @@ else
 MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+MINETEST_DEPENDENCIES += gettext
+MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 MINETEST_DEPENDENCIES += libcurl
 MINETEST_CONF_OPTS += -DENABLE_CURL=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 06/13] package/minetest: add freetype optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (3 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 05/13] package/minetest: add gettext " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 07/13] package/minetest: add gles " Romain Naour
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 3b2668b..5075fc0 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -15,7 +15,6 @@ MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
 	-DENABLE_SOUND=OFF \
 	-DENABLE_GLES=OFF \
-	-DENABLE_FREETYPE=OFF \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
 	-DENABLE_POSTGRESQL=OFF \
@@ -39,6 +38,13 @@ else
 MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+MINETEST_DEPENDENCIES += freetype
+MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_FREETYPE=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_GETTEXT),y)
 MINETEST_DEPENDENCIES += gettext
 MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 07/13] package/minetest: add gles optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (4 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 06/13] package/minetest: add freetype " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-24 15:21   ` Thomas Petazzoni
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support Romain Naour
                   ` (6 subsequent siblings)
  12 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 5075fc0..0302bd3 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -14,7 +14,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
 MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
 	-DENABLE_SOUND=OFF \
-	-DENABLE_GLES=OFF \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
 	-DENABLE_POSTGRESQL=OFF \
@@ -52,6 +51,13 @@ else
 MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
+MINETEST_DEPENDENCIES += libgles
+MINETEST_CONF_OPTS += -DENABLE_GLES=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_GLES=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 MINETEST_DEPENDENCIES += libcurl
 MINETEST_CONF_OPTS += -DENABLE_CURL=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (5 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 07/13] package/minetest: add gles " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-24 15:21   ` Thomas Petazzoni
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 09/13] package/minetest: add postgresql optional dependency Romain Naour
                   ` (5 subsequent siblings)
  12 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/Config.in   | 8 ++++++++
 package/minetest/minetest.mk | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package/minetest/Config.in b/package/minetest/Config.in
index d0613a2..a15a8f7 100644
--- a/package/minetest/Config.in
+++ b/package/minetest/Config.in
@@ -55,6 +55,14 @@ config BR2_PACKAGE_MINETEST_CLIENT_SERVER
 
 endchoice
 
+config BR2_PACKAGE_MINETEST_SOUND
+	bool "enable sound"
+	depends on BR2_PACKAGE_MINETEST_CLIENT
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_OPENAL
+
 endif
 
 comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads"
diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 0302bd3..42c8888 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
 
 MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
-	-DENABLE_SOUND=OFF \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
 	-DENABLE_POSTGRESQL=OFF \
@@ -37,6 +36,13 @@ else
 MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_MINETEST_SOUND),y)
+MINETEST_DEPENDENCIES += libvorbis openal
+MINETEST_CONF_OPTS += -DENABLE_SOUND=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_SOUND=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 MINETEST_DEPENDENCIES += freetype
 MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 09/13] package/minetest: add postgresql optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (6 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 10/13] package/minetest: add hiredis " Romain Naour
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 42c8888..742b2d1 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -15,7 +15,6 @@ MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
-	-DENABLE_POSTGRESQL=OFF \
 	-DENABLE_LEVELDB=OFF \
 	-DENABLE_REDIS=OFF \
 	-DENABLE_SPATIAL=OFF \
@@ -71,4 +70,11 @@ else
 MINETEST_CONF_OPTS += -DENABLE_CURL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
+MINETEST_DEPENDENCIES += postgresql
+MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=OFF
+endif
+
 $(eval $(cmake-package))
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 10/13] package/minetest: add hiredis optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (7 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 09/13] package/minetest: add postgresql optional dependency Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 11/13] package/minetest: add leveldb " Romain Naour
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 742b2d1..40df470 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -16,7 +16,6 @@ MINETEST_CONF_OPTS = \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
 	-DENABLE_LEVELDB=OFF \
-	-DENABLE_REDIS=OFF \
 	-DENABLE_SPATIAL=OFF \
 	-DAPPLY_LOCALE_BLACKLIST=OFF \
 	-DENABLE_SYSTEM_GMP=ON \
@@ -49,6 +48,13 @@ else
 MINETEST_CONF_OPTS += -DENABLE_FREETYPE=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_HIREDIS),y)
+MINETEST_DEPENDENCIES += hiredis
+MINETEST_CONF_OPTS += -DENABLE_REDIS=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_REDIS=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_GETTEXT),y)
 MINETEST_DEPENDENCIES += gettext
 MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 11/13] package/minetest: add leveldb optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (8 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 10/13] package/minetest: add hiredis " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 12/13] package/minetest: add libspatialindex " Romain Naour
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 40df470..ba8b2a1 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -15,7 +15,6 @@ MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
-	-DENABLE_LEVELDB=OFF \
 	-DENABLE_SPATIAL=OFF \
 	-DAPPLY_LOCALE_BLACKLIST=OFF \
 	-DENABLE_SYSTEM_GMP=ON \
@@ -62,6 +61,13 @@ else
 MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LEVELDB),y)
+MINETEST_DEPENDENCIES += leveldb
+MINETEST_CONF_OPTS += -DENABLE_LEVELDB=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_LEVELDB=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
 MINETEST_DEPENDENCIES += libgles
 MINETEST_CONF_OPTS += -DENABLE_GLES=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 12/13] package/minetest: add libspatialindex optional dependency
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (9 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 11/13] package/minetest: add leveldb " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 13/13] package/minetest_game: new package Romain Naour
  2017-06-24 15:14 ` [Buildroot] [PATCH v2 01/13] package/irrlicht: " Thomas Petazzoni
  12 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index ba8b2a1..d2b9651 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -15,7 +15,6 @@ MINETEST_CONF_OPTS = \
 	-DDEFAULT_RUN_IN_PLACE=OFF \
 	-DENABLE_LUAJIT=ON \
 	-DENABLE_CURSES=OFF \
-	-DENABLE_SPATIAL=OFF \
 	-DAPPLY_LOCALE_BLACKLIST=OFF \
 	-DENABLE_SYSTEM_GMP=ON \
 	-DENABLE_SYSTEM_JSONCPP=ON
@@ -82,6 +81,13 @@ else
 MINETEST_CONF_OPTS += -DENABLE_CURL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSPATIALINDEX),y)
+MINETEST_DEPENDENCIES += libspatialindex
+MINETEST_CONF_OPTS += -DENABLE_SPATIAL=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_SPATIAL=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
 MINETEST_DEPENDENCIES += postgresql
 MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=ON
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 13/13] package/minetest_game: new package
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (10 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 12/13] package/minetest: add libspatialindex " Romain Naour
@ 2017-06-12 20:54 ` Romain Naour
  2017-06-24 15:29   ` Thomas Petazzoni
  2017-06-24 15:14 ` [Buildroot] [PATCH v2 01/13] package/irrlicht: " Thomas Petazzoni
  12 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 20:54 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
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           |  2 +
 package/minetest_game/minetest_game.mk             | 40 ++++++++++++++++
 6 files changed, 105 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 6ef7b23..a610ac7 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1390,6 +1390,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 4d59a68..f922d35 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -227,6 +227,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 at web.de" <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 <romain.naour@gmail.com>
+---
+ 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..1e8ca90
--- /dev/null
+++ b/package/minetest_game/minetest_game.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 ea914555949b4faccda5e13143cb021d2f9a5fa19abd1f5e4b7b65004cbd2b5a minetest_game-0.4.16.tar.gz
diff --git a/package/minetest_game/minetest_game.mk b/package/minetest_game/minetest_game.mk
new file mode 100644
index 0000000..c01aae5
--- /dev/null
+++ b/package/minetest_game/minetest_game.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# 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+, CC-BY-SA-2.0, CC-BY-SA-3.0, \
+	CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0
+MINETEST_GAME_LICENSE_FILES = LICENSE.txt \
+	mods/screwdriver/license.txt \
+	mods/tnt/license.txt \
+	mods/stairs/license.txt \
+	mods/bucket/license.txt \
+	mods/walls/license.txt \
+	mods/wool/license.txt \
+	mods/flowers/license.txt \
+	mods/bones/license.txt \
+	mods/boats/license.txt \
+	mods/default/license.txt \
+	mods/give_initial_stuff/license.txt \
+	mods/dye/license.txt \
+	mods/farming/license.txt \
+	mods/xpanes/license.txt \
+	mods/vessels/license.txt \
+	mods/carts/license.txt \
+	mods/sethome/license.txt \
+	mods/fire/license.txt \
+	mods/nyancat/license.txt \
+	mods/doors/license.txt \
+	mods/creative/license.txt \
+	mods/beds/license.txt
+
+define MINETEST_GAME_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/minetest/games/minetest_game
+	rsync -av $(@D)/* --exclude=".*" $(TARGET_DIR)/usr/share/minetest/games/minetest_game
+endef
+
+$(eval $(generic-package))
-- 
2.9.4

^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 02/13] package/libspatialindex: new package
  2017-06-12 20:53 ` [Buildroot] [PATCH v2 02/13] package/libspatialindex: " Romain Naour
@ 2017-06-12 21:45   ` Thomas Petazzoni
  2017-06-12 21:49     ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-12 21:45 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:53:59 +0200, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Applied, thanks!

> test-pkg reported an internal compiler error on microblaze (br-microblazeel-full)
> Index.cc: In member function 'void SpatialIndex::RTree::Index::adjustTree(SpatialIndex::RTree::Node*, std::stack<long long int>&)':
> Index.cc:327:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1027

Does this bug still exists with gcc 7.x? If so, can we report the bug
to upstream gcc? Or is it a bug that has already been reported, because
it happens with other packages as well?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 02/13] package/libspatialindex: new package
  2017-06-12 21:45   ` Thomas Petazzoni
@ 2017-06-12 21:49     ` Romain Naour
  2017-06-12 22:24       ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-06-12 21:49 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 12/06/2017 ? 23:45, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Mon, 12 Jun 2017 22:53:59 +0200, Romain Naour wrote:
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> 
> Applied, thanks!
> 
>> test-pkg reported an internal compiler error on microblaze (br-microblazeel-full)
>> Index.cc: In member function 'void SpatialIndex::RTree::Index::adjustTree(SpatialIndex::RTree::Node*, std::stack<long long int>&)':
>> Index.cc:327:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1027
> 
> Does this bug still exists with gcc 7.x? If so, can we report the bug
> to upstream gcc? Or is it a bug that has already been reported, because
> it happens with other packages as well?

I need to test again with the new br-microblazeel-full toolchain added today.

Best regards,
Romain

> 
> Thanks!
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 02/13] package/libspatialindex: new package
  2017-06-12 21:49     ` Romain Naour
@ 2017-06-12 22:24       ` Romain Naour
  0 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-06-12 22:24 UTC (permalink / raw)
  To: buildroot

Thomas,

Le 12/06/2017 ? 23:49, Romain Naour a ?crit :
> Hi Thomas,
> 
> Le 12/06/2017 ? 23:45, Thomas Petazzoni a ?crit :
>> Hello,
>>
>> On Mon, 12 Jun 2017 22:53:59 +0200, Romain Naour wrote:
>>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>>> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>>
>> Applied, thanks!
>>
>>> test-pkg reported an internal compiler error on microblaze (br-microblazeel-full)
>>> Index.cc: In member function 'void SpatialIndex::RTree::Index::adjustTree(SpatialIndex::RTree::Node*, std::stack<long long int>&)':
>>> Index.cc:327:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1027
>>
>> Does this bug still exists with gcc 7.x? If so, can we report the bug
>> to upstream gcc? Or is it a bug that has already been reported, because
>> it happens with other packages as well?
> 
> I need to test again with the new br-microblazeel-full toolchain added today.

Reproduced with br-microblaze-full-2017.05-444-g6c704ba.tar.bz2

Node.cc:1082:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1025
 }
 ^
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://bugs.buildroot.net/> for instructions.
Makefile:388 : la recette pour la cible ? Node.lo ? a ?chou?e
make[4]: *** [Node.lo] Erreur 1
make[4]: *** Attente des t?ches non termin?es....
Index.cc: In member function 'void
SpatialIndex::RTree::Index::adjustTree(SpatialIndex::RTree::Node*,
std::stack<long long int>&)':
Index.cc:327:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1025
 }
 ^
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://bugs.buildroot.net/> for instructions.
Makefile:388 : la recette pour la cible ? Index.lo ? a ?chou?e
make[4]: *** [Index.lo] Erreur 1
RTree.cc: In member function 'virtual bool
SpatialIndex::RTree::RTree::isIndexValid()':
RTree.cc:800:1: internal compiler error: in gen_reg_rtx, at emit-rtl.c:1025
 }
 ^
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://bugs.buildroot.net/> for instructions.

I don't really know if there is an existing bug report.
I'll check that later.

Best regards,
Romain

> 
> Best regards,
> Romain
> 
>>
>> Thanks!
>>
>> Thomas
>>
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 01/13] package/irrlicht: new package
  2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
                   ` (11 preceding siblings ...)
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 13/13] package/minetest_game: new package Romain Naour
@ 2017-06-24 15:14 ` Thomas Petazzoni
  12 siblings, 0 replies; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-24 15:14 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:53:58 +0200, Romain Naour wrote:
> +# Bundled libraries: bzip2, libaesGladman, libpng, lzma, zlib,
> +# The handcrafted Makefile can only use bundled libraries.
> +IRRLICHT_LICENSE = Zlib (irrlicht), bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng

Why didn't you use SPDX license codes here? Also, what we put between
parenthesis is not details about the license, but the components on
which the license applies. So I've changed this line to:

IRRLICHT_LICENSE = Zlib (irrlicht), BSD-3-Clause (libaesGladman), bzip2-1.0.5 (bzip2), IJG (libjpeg), Libpng (libpng)

Applied to master after fixing this. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 03/13] package/minetest: new package
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 03/13] package/minetest: " Romain Naour
@ 2017-06-24 15:19   ` Thomas Petazzoni
  2017-07-12 16:37     ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-24 15:19 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:54:00 +0200, Romain Naour wrote:

> + 		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
> ++		# On some platforms, such as Linux with GNU libc, the gettext
> ++		# functions are present in the C standard library and libintl
> ++		# is not required. For other libc (uClibc-ng or musl) libintl

Only uClibc-ng in fact. musl has stub gettext functionality.

> +if BR2_PACKAGE_MINETEST
> +
> +config BR2_PACKAGE_MINETEST_CLIENT
> +	bool
> +	select BR2_PACKAGE_BZIP2
> +	select BR2_PACKAGE_LIBPNG
> +	select BR2_PACKAGE_JPEG
> +	select BR2_PACKAGE_XLIB_LIBXXF86VM
> +
> +config BR2_PACKAGE_MINETEST_SERVER
> +	bool
> +
> +choice
> +	prompt "minetest build"
> +
> +config BR2_PACKAGE_MINETEST_CLIENT_ONLY
> +	bool "client only"
> +	select BR2_PACKAGE_MINETEST_CLIENT
> +	help
> +	  Build Minetest client only.
> +
> +config BR2_PACKAGE_MINETEST_SERVER_ONLY
> +	bool "server only"
> +	select BR2_PACKAGE_MINETEST_SERVER
> +	help
> +	  Build Minetest server only.
> +
> +config BR2_PACKAGE_MINETEST_CLIENT_SERVER
> +	bool "client and server"
> +	select BR2_PACKAGE_MINETEST_CLIENT
> +	select BR2_PACKAGE_MINETEST_SERVER
> +	help
> +	  Build Minetest client and server.
> +
> +endchoice

Why are you doing all this instead of having just two sub-options, one
to enable the client, one to enable the server?

Is it because you need at least one of them to be enabled? If so, then
just add a "select BR2_PACKAGE_MINETEST_CLIENT
if !BR2_PACKAGE_MINETEST_SERVER" in the BR2_PACKAGE_MINETEST definition.

> +comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads"
> +	depends on !BR2_INSTALL_LIBSTDCPP \
> +		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
> +		|| !BR2_TOOLCHAIN_HAS_THREADS

Missing depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

> +
> +comment "minetest needs X11, an OpenGL provider, luajit"
> +	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 \
> +		|| !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Mentioning LuaJIT is useless, since you're selecting it. However, you
shouldn't display this comment if BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is
not enabled.

BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is an architecture dependency, very
much like BR2_USE_MMU, so we don't add comments about it, since there's
nothing the user can do about it.

> +MINETEST_VERSION = 0.4.16
> +MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION))
> +MINETEST_LICENSE = LGPL-2.1+, CC-BY-SA-3.0

Maybe mention what is under LGPL, what is under CC-BY-SA? if it's
clearly understood.

> +MINETEST_LICENSE_FILES = README.txt
> +
> +MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib

Alphabetic ordering would be nicer (j before g).

> +
> +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

jpeg is already part of the unconditional dependencies.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 05/13] package/minetest: add gettext optional dependency
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 05/13] package/minetest: add gettext " Romain Naour
@ 2017-06-24 15:20   ` Thomas Petazzoni
  2017-07-12 16:43     ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-24 15:20 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:54:02 +0200, Romain Naour wrote:

>  MINETEST_CONF_OPTS = \
>  	-DDEFAULT_RUN_IN_PLACE=OFF \
> -	-DENABLE_GETTEXT=OFF \
>  	-DENABLE_SOUND=OFF \
>  	-DENABLE_GLES=OFF \
>  	-DENABLE_FREETYPE=OFF \
> @@ -40,6 +39,13 @@ else
>  MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_GETTEXT),y)
> +MINETEST_DEPENDENCIES += gettext
> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
> +else
> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
> +endif

What is this ENABLE_GETTEXT=ON/OFF option doing exactly?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 07/13] package/minetest: add gles optional dependency
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 07/13] package/minetest: add gles " Romain Naour
@ 2017-06-24 15:21   ` Thomas Petazzoni
  2017-07-12 16:46     ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-24 15:21 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:54:04 +0200, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
>  package/minetest/minetest.mk | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
> index 5075fc0..0302bd3 100644
> --- a/package/minetest/minetest.mk
> +++ b/package/minetest/minetest.mk
> @@ -14,7 +14,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
>  MINETEST_CONF_OPTS = \
>  	-DDEFAULT_RUN_IN_PLACE=OFF \
>  	-DENABLE_SOUND=OFF \
> -	-DENABLE_GLES=OFF \
>  	-DENABLE_LUAJIT=ON \
>  	-DENABLE_CURSES=OFF \
>  	-DENABLE_POSTGRESQL=OFF \
> @@ -52,6 +51,13 @@ else
>  MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
>  endif
>  
> +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
> +MINETEST_DEPENDENCIES += libgles
> +MINETEST_CONF_OPTS += -DENABLE_GLES=ON
> +else
> +MINETEST_CONF_OPTS += -DENABLE_GLES=OFF
> +endif

The overall minetest package already depends on libGL support,
inherited from irrlicht. Do we have useful situations where GLES
support can be leveraged, since anyway you require libGL+X11 ?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support Romain Naour
@ 2017-06-24 15:21   ` Thomas Petazzoni
  2017-07-12 16:56     ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-24 15:21 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:54:05 +0200, Romain Naour wrote:

> diff --git a/package/minetest/Config.in b/package/minetest/Config.in
> index d0613a2..a15a8f7 100644
> --- a/package/minetest/Config.in
> +++ b/package/minetest/Config.in
> @@ -55,6 +55,14 @@ config BR2_PACKAGE_MINETEST_CLIENT_SERVER
>  
>  endchoice
>  
> +config BR2_PACKAGE_MINETEST_SOUND
> +	bool "enable sound"
> +	depends on BR2_PACKAGE_MINETEST_CLIENT
> +	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
> +	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal

 -> Config.in comment for this dependency?

> +	select BR2_PACKAGE_LIBVORBIS
> +	select BR2_PACKAGE_OPENAL
> +
>  endif

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 13/13] package/minetest_game: new package
  2017-06-12 20:54 ` [Buildroot] [PATCH v2 13/13] package/minetest_game: new package Romain Naour
@ 2017-06-24 15:29   ` Thomas Petazzoni
  2017-07-12 17:05     ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-06-24 15:29 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 12 Jun 2017 22:54:10 +0200, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> v2: update to 0.4.16
>     update license file
>     Add a hash file
>     backport an upstream patch due to regression.

I'm not a big fan of underscores in the name of packages, but I agree
it's the upstream name... and we already have a few packages with
underscores in their name, so I guess it's more a personal taste than a
real rule here.

> +define MINETEST_GAME_INSTALL_TARGET_CMDS
> +	mkdir -p $(TARGET_DIR)/usr/share/minetest/games/minetest_game
> +	rsync -av $(@D)/* --exclude=".*" $(TARGET_DIR)/usr/share/minetest/games/minetest_game

What about using "cp -dpfr", which we use more commonly in packages to
copy entire file/directory hierarchies?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 03/13] package/minetest: new package
  2017-06-24 15:19   ` Thomas Petazzoni
@ 2017-07-12 16:37     ` Romain Naour
  2017-07-13  8:24       ` Thomas Petazzoni
  0 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-07-12 16:37 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 24/06/2017 ? 17:19, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Mon, 12 Jun 2017 22:54:00 +0200, Romain Naour wrote:
> 
>> + 		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
>> ++		# On some platforms, such as Linux with GNU libc, the gettext
>> ++		# functions are present in the C standard library and libintl
>> ++		# is not required. For other libc (uClibc-ng or musl) libintl
> 
> Only uClibc-ng in fact. musl has stub gettext functionality.

So, with your series applied during the summer camp this is not true even with
uClibc-ng.
I think BR2_SYSTEM_ENABLE_NLS should be used in minetest.mk.

> 
>> +if BR2_PACKAGE_MINETEST
>> +
>> +config BR2_PACKAGE_MINETEST_CLIENT
>> +	bool
>> +	select BR2_PACKAGE_BZIP2
>> +	select BR2_PACKAGE_LIBPNG
>> +	select BR2_PACKAGE_JPEG
>> +	select BR2_PACKAGE_XLIB_LIBXXF86VM
>> +
>> +config BR2_PACKAGE_MINETEST_SERVER
>> +	bool
>> +
>> +choice
>> +	prompt "minetest build"
>> +
>> +config BR2_PACKAGE_MINETEST_CLIENT_ONLY
>> +	bool "client only"
>> +	select BR2_PACKAGE_MINETEST_CLIENT
>> +	help
>> +	  Build Minetest client only.
>> +
>> +config BR2_PACKAGE_MINETEST_SERVER_ONLY
>> +	bool "server only"
>> +	select BR2_PACKAGE_MINETEST_SERVER
>> +	help
>> +	  Build Minetest server only.
>> +
>> +config BR2_PACKAGE_MINETEST_CLIENT_SERVER
>> +	bool "client and server"
>> +	select BR2_PACKAGE_MINETEST_CLIENT
>> +	select BR2_PACKAGE_MINETEST_SERVER
>> +	help
>> +	  Build Minetest client and server.
>> +
>> +endchoice
> 
> Why are you doing all this instead of having just two sub-options, one
> to enable the client, one to enable the server?
> 
> Is it because you need at least one of them to be enabled?

Indeed.

 If so, then
> just add a "select BR2_PACKAGE_MINETEST_CLIENT
> if !BR2_PACKAGE_MINETEST_SERVER" in the BR2_PACKAGE_MINETEST definition

Done.

> 
>> +comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads"
>> +	depends on !BR2_INSTALL_LIBSTDCPP \
>> +		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
>> +		|| !BR2_TOOLCHAIN_HAS_THREADS
> 
> Missing depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS>
>> +
>> +comment "minetest needs X11, an OpenGL provider, luajit"
>> +	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 \
>> +		|| !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
> 
> Mentioning LuaJIT is useless, since you're selecting it. However, you
> shouldn't display this comment if BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is
> not enabled.
> 
> BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is an architecture dependency, very
> much like BR2_USE_MMU, so we don't add comments about it, since there's
> nothing the user can do about it.

Fixed.

> 
>> +MINETEST_VERSION = 0.4.16
>> +MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION))
>> +MINETEST_LICENSE = LGPL-2.1+, CC-BY-SA-3.0
> 
> Maybe mention what is under LGPL, what is under CC-BY-SA? if it's
> clearly understood.

Done.

> 
>> +MINETEST_LICENSE_FILES = README.txt
>> +
>> +MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
> 
> Alphabetic ordering would be nicer (j before g).

You mean g before i :)
Fixed.

> 
>> +
>> +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
> 
> jpeg is already part of the unconditional dependencies.

Fixed.

Best regards,
Romain

> 
> Best regards,
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 05/13] package/minetest: add gettext optional dependency
  2017-06-24 15:20   ` Thomas Petazzoni
@ 2017-07-12 16:43     ` Romain Naour
  2017-07-13  8:25       ` Thomas Petazzoni
  0 siblings, 1 reply; 31+ messages in thread
From: Romain Naour @ 2017-07-12 16:43 UTC (permalink / raw)
  To: buildroot

Le 24/06/2017 ? 17:20, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Mon, 12 Jun 2017 22:54:02 +0200, Romain Naour wrote:
> 
>>  MINETEST_CONF_OPTS = \
>>  	-DDEFAULT_RUN_IN_PLACE=OFF \
>> -	-DENABLE_GETTEXT=OFF \
>>  	-DENABLE_SOUND=OFF \
>>  	-DENABLE_GLES=OFF \
>>  	-DENABLE_FREETYPE=OFF \
>> @@ -40,6 +39,13 @@ else
>>  MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
>>  endif
>>  
>> +ifeq ($(BR2_PACKAGE_GETTEXT),y)
>> +MINETEST_DEPENDENCIES += gettext
>> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
>> +else
>> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
>> +endif
> 
> What is this ENABLE_GETTEXT=ON/OFF option doing exactly?

It allows using translations.

When enabled msgfmt tool is used to create *.mo files etc...

https://github.com/minetest/minetest/blob/master/README.txt#L180

Best regards,
Romain

> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 07/13] package/minetest: add gles optional dependency
  2017-06-24 15:21   ` Thomas Petazzoni
@ 2017-07-12 16:46     ` Romain Naour
  0 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-07-12 16:46 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 24/06/2017 ? 17:21, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Mon, 12 Jun 2017 22:54:04 +0200, Romain Naour wrote:
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>>  package/minetest/minetest.mk | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
>> index 5075fc0..0302bd3 100644
>> --- a/package/minetest/minetest.mk
>> +++ b/package/minetest/minetest.mk
>> @@ -14,7 +14,6 @@ MINETEST_DEPENDENCIES = irrlicht gmp jpeg jsoncpp luajit sqlite zlib
>>  MINETEST_CONF_OPTS = \
>>  	-DDEFAULT_RUN_IN_PLACE=OFF \
>>  	-DENABLE_SOUND=OFF \
>> -	-DENABLE_GLES=OFF \
>>  	-DENABLE_LUAJIT=ON \
>>  	-DENABLE_CURSES=OFF \
>>  	-DENABLE_POSTGRESQL=OFF \
>> @@ -52,6 +51,13 @@ else
>>  MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
>>  endif
>>  
>> +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
>> +MINETEST_DEPENDENCIES += libgles
>> +MINETEST_CONF_OPTS += -DENABLE_GLES=ON
>> +else
>> +MINETEST_CONF_OPTS += -DENABLE_GLES=OFF
>> +endif
> 
> The overall minetest package already depends on libGL support,
> inherited from irrlicht. Do we have useful situations where GLES
> support can be leveraged, since anyway you require libGL+X11 ?

I looked in the code and it seems that GLES is used only for Android build.

https://github.com/minetest/minetest/blob/master/src/client/tile.cpp#L43

I'll remove this patch the v3.

Best regards,
Romain

> 
> Best regards,
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support
  2017-06-24 15:21   ` Thomas Petazzoni
@ 2017-07-12 16:56     ` Romain Naour
  0 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-07-12 16:56 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 24/06/2017 ? 17:21, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Mon, 12 Jun 2017 22:54:05 +0200, Romain Naour wrote:
> 
>> diff --git a/package/minetest/Config.in b/package/minetest/Config.in
>> index d0613a2..a15a8f7 100644
>> --- a/package/minetest/Config.in
>> +++ b/package/minetest/Config.in
>> @@ -55,6 +55,14 @@ config BR2_PACKAGE_MINETEST_CLIENT_SERVER
>>  
>>  endchoice
>>  
>> +config BR2_PACKAGE_MINETEST_SOUND
>> +	bool "enable sound"
>> +	depends on BR2_PACKAGE_MINETEST_CLIENT
>> +	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
>> +	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
> 
>  -> Config.in comment for this dependency?

Done.

Best regards,
Romain

> 
>> +	select BR2_PACKAGE_LIBVORBIS
>> +	select BR2_PACKAGE_OPENAL
>> +
>>  endif
> 
> Thanks,
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 13/13] package/minetest_game: new package
  2017-06-24 15:29   ` Thomas Petazzoni
@ 2017-07-12 17:05     ` Romain Naour
  0 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-07-12 17:05 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 24/06/2017 ? 17:29, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Mon, 12 Jun 2017 22:54:10 +0200, Romain Naour wrote:
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>> v2: update to 0.4.16
>>     update license file
>>     Add a hash file
>>     backport an upstream patch due to regression.
> 
> I'm not a big fan of underscores in the name of packages, but I agree
> it's the upstream name... and we already have a few packages with
> underscores in their name, so I guess it's more a personal taste than a
> real rule here.
> 
>> +define MINETEST_GAME_INSTALL_TARGET_CMDS
>> +	mkdir -p $(TARGET_DIR)/usr/share/minetest/games/minetest_game
>> +	rsync -av $(@D)/* --exclude=".*" $(TARGET_DIR)/usr/share/minetest/games/minetest_game
> 
> What about using "cp -dpfr", which we use more commonly in packages to
> copy entire file/directory hierarchies?

I wanted to avoid copying .gitignore   .luacheckrc  .travis.yml to
$(TARGET_DIR)/usr/share/minetest/games/minetest_game.

But ok, it's small files...

Done.

Thanks for the review.

Best regards,
Romain

> 
> Thanks,
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 03/13] package/minetest: new package
  2017-07-12 16:37     ` Romain Naour
@ 2017-07-13  8:24       ` Thomas Petazzoni
  2017-07-13 11:17         ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-07-13  8:24 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, 12 Jul 2017 18:37:39 +0200, Romain Naour wrote:

> Le 24/06/2017 ? 17:19, Thomas Petazzoni a ?crit :
> > Hello,
> > 
> > On Mon, 12 Jun 2017 22:54:00 +0200, Romain Naour wrote:
> >   
> >> + 		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
> >> ++		# On some platforms, such as Linux with GNU libc, the gettext
> >> ++		# functions are present in the C standard library and libintl
> >> ++		# is not required. For other libc (uClibc-ng or musl) libintl  
> > 
> > Only uClibc-ng in fact. musl has stub gettext functionality.  
> 
> So, with your series applied during the summer camp this is not true even with
> uClibc-ng.

Correct: now all C libraries provide some gettext implementation.

> I think BR2_SYSTEM_ENABLE_NLS should be used in minetest.mk.

Why?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 05/13] package/minetest: add gettext optional dependency
  2017-07-12 16:43     ` Romain Naour
@ 2017-07-13  8:25       ` Thomas Petazzoni
  2017-07-13 11:18         ` Romain Naour
  0 siblings, 1 reply; 31+ messages in thread
From: Thomas Petazzoni @ 2017-07-13  8:25 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, 12 Jul 2017 18:43:01 +0200, Romain Naour wrote:

> > On Mon, 12 Jun 2017 22:54:02 +0200, Romain Naour wrote:
> >   
> >>  MINETEST_CONF_OPTS = \
> >>  	-DDEFAULT_RUN_IN_PLACE=OFF \
> >> -	-DENABLE_GETTEXT=OFF \
> >>  	-DENABLE_SOUND=OFF \
> >>  	-DENABLE_GLES=OFF \
> >>  	-DENABLE_FREETYPE=OFF \
> >> @@ -40,6 +39,13 @@ else
> >>  MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
> >>  endif
> >>  
> >> +ifeq ($(BR2_PACKAGE_GETTEXT),y)
> >> +MINETEST_DEPENDENCIES += gettext
> >> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
> >> +else
> >> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
> >> +endif  
> > 
> > What is this ENABLE_GETTEXT=ON/OFF option doing exactly?  
> 
> It allows using translations.
> 
> When enabled msgfmt tool is used to create *.mo files etc...
> 
> https://github.com/minetest/minetest/blob/master/README.txt#L180

Then simply do:

MINETEST_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)

ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 pass -DENABLE_GETTEXT=ON
else
 pass -DENABLE_GETTEXT=OFF
endif

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 03/13] package/minetest: new package
  2017-07-13  8:24       ` Thomas Petazzoni
@ 2017-07-13 11:17         ` Romain Naour
  0 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-07-13 11:17 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 13/07/2017 ? 10:24, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Wed, 12 Jul 2017 18:37:39 +0200, Romain Naour wrote:
> 
>> Le 24/06/2017 ? 17:19, Thomas Petazzoni a ?crit :
>>> Hello,
>>>
>>> On Mon, 12 Jun 2017 22:54:00 +0200, Romain Naour wrote:
>>>   
>>>> + 		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
>>>> ++		# On some platforms, such as Linux with GNU libc, the gettext
>>>> ++		# functions are present in the C standard library and libintl
>>>> ++		# is not required. For other libc (uClibc-ng or musl) libintl  
>>>
>>> Only uClibc-ng in fact. musl has stub gettext functionality.  
>>
>> So, with your series applied during the summer camp this is not true even with
>> uClibc-ng.
> 
> Correct: now all C libraries provide some gettext implementation.

So this patch is not required anymore since gettext stub will be used.

> 
>> I think BR2_SYSTEM_ENABLE_NLS should be used in minetest.mk.
> 
> Why?

I mean BR2_SYSTEM_ENABLE_NLS should be used for gettext handling, see the
followup patch.

Best regards,
Romain

> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
* [Buildroot] [PATCH v2 05/13] package/minetest: add gettext optional dependency
  2017-07-13  8:25       ` Thomas Petazzoni
@ 2017-07-13 11:18         ` Romain Naour
  0 siblings, 0 replies; 31+ messages in thread
From: Romain Naour @ 2017-07-13 11:18 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 13/07/2017 ? 10:25, Thomas Petazzoni a ?crit :
> Hello,
> 
> On Wed, 12 Jul 2017 18:43:01 +0200, Romain Naour wrote:
> 
>>> On Mon, 12 Jun 2017 22:54:02 +0200, Romain Naour wrote:
>>>   
>>>>  MINETEST_CONF_OPTS = \
>>>>  	-DDEFAULT_RUN_IN_PLACE=OFF \
>>>> -	-DENABLE_GETTEXT=OFF \
>>>>  	-DENABLE_SOUND=OFF \
>>>>  	-DENABLE_GLES=OFF \
>>>>  	-DENABLE_FREETYPE=OFF \
>>>> @@ -40,6 +39,13 @@ else
>>>>  MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
>>>>  endif
>>>>  
>>>> +ifeq ($(BR2_PACKAGE_GETTEXT),y)
>>>> +MINETEST_DEPENDENCIES += gettext
>>>> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
>>>> +else
>>>> +MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
>>>> +endif  
>>>
>>> What is this ENABLE_GETTEXT=ON/OFF option doing exactly?  
>>
>> It allows using translations.
>>
>> When enabled msgfmt tool is used to create *.mo files etc...
>>
>> https://github.com/minetest/minetest/blob/master/README.txt#L180
> 
> Then simply do:
> 
> MINETEST_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
> 
> ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
>  pass -DENABLE_GETTEXT=ON
> else
>  pass -DENABLE_GETTEXT=OFF
> endif

Yes, that what I wanted to do.

Best regards,
Romain

> 
> Best regards,
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 31+ messages in thread
end of thread, other threads:[~2017-07-13 11:18 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-12 20:53 [Buildroot] [PATCH v2 01/13] package/irrlicht: new package Romain Naour
2017-06-12 20:53 ` [Buildroot] [PATCH v2 02/13] package/libspatialindex: " Romain Naour
2017-06-12 21:45   ` Thomas Petazzoni
2017-06-12 21:49     ` Romain Naour
2017-06-12 22:24       ` Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 03/13] package/minetest: " Romain Naour
2017-06-24 15:19   ` Thomas Petazzoni
2017-07-12 16:37     ` Romain Naour
2017-07-13  8:24       ` Thomas Petazzoni
2017-07-13 11:17         ` Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 04/13] package/minetest: add libcurl optional dependency Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 05/13] package/minetest: add gettext " Romain Naour
2017-06-24 15:20   ` Thomas Petazzoni
2017-07-12 16:43     ` Romain Naour
2017-07-13  8:25       ` Thomas Petazzoni
2017-07-13 11:18         ` Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 06/13] package/minetest: add freetype " Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 07/13] package/minetest: add gles " Romain Naour
2017-06-24 15:21   ` Thomas Petazzoni
2017-07-12 16:46     ` Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 08/13] package/minetest: enable sound support Romain Naour
2017-06-24 15:21   ` Thomas Petazzoni
2017-07-12 16:56     ` Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 09/13] package/minetest: add postgresql optional dependency Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 10/13] package/minetest: add hiredis " Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 11/13] package/minetest: add leveldb " Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 12/13] package/minetest: add libspatialindex " Romain Naour
2017-06-12 20:54 ` [Buildroot] [PATCH v2 13/13] package/minetest_game: new package Romain Naour
2017-06-24 15:29   ` Thomas Petazzoni
2017-07-12 17:05     ` Romain Naour
2017-06-24 15:14 ` [Buildroot] [PATCH v2 01/13] package/irrlicht: " Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.