* [Buildroot] [PATCH 02/14] package/irrlicht: new package
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-06-11 16:54 ` Bernd Kuhls
2017-04-11 22:26 ` [Buildroot] [PATCH 03/14] package/libspatialindex: " Romain Naour
` (13 subsequent siblings)
14 siblings, 1 reply; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
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 | 57 ++++++++++++++++++++++
7 files changed, 163 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 a298669..354866e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1336,6 +1336,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 c12e5b5..19315f7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -263,6 +263,7 @@ comment "Graphic libraries"
source "package/fbv/Config.in"
source "package/freerdp/Config.in"
source "package/imagemagick/Config.in"
+ source "package/irrlicht/Config.in"
source "package/linux-fusion/Config.in"
source "package/lite/Config.in"
source "package/mesa3d/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..ab6187c
--- /dev/null
+++ b/package/irrlicht/irrlicht.mk
@@ -0,0 +1,57 @@
+################################################################################
+#
+# 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,
+IRRLICHT_LICENSE = bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng, Zlib
+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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 02/14] package/irrlicht: new package
2017-04-11 22:26 ` [Buildroot] [PATCH 02/14] package/irrlicht: new package Romain Naour
@ 2017-06-11 16:54 ` Bernd Kuhls
0 siblings, 0 replies; 23+ messages in thread
From: Bernd Kuhls @ 2017-06-11 16:54 UTC (permalink / raw)
To: buildroot
Hi Romain,
afaics the irrlicht package only provides libirrlicht.so.
What about naming the package libirrlicht and move it to
"Target packages > Libraries > Graphics"?
Am Wed, 12 Apr 2017 00:26:31 +0200 schrieb Romain Naour:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> ...-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch | 44 +++++++++++++++++
> package/irrlicht/0002-remove-sys-sysctl.h.patch | 38 +++++++++++++++
Did you send the patches upstream?
@Whoever will commit the patches to buildroot: The irrlicht source code
has DOS line endings, please adjust the patch files accordingly.
> diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk
> new file mode 100644
> index 0000000..ab6187c
> --- /dev/null
> +++ b/package/irrlicht/irrlicht.mk
> @@ -0,0 +1,57 @@
> +################################################################################
> +#
> +# 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,
> +IRRLICHT_LICENSE = bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng, Zlib
Please mention the license of the irrlicht package itself.
Regards, Bernd
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH 03/14] package/libspatialindex: new package
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 02/14] package/irrlicht: new package Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-06-11 17:02 ` Bernd Kuhls
2017-04-11 22:26 ` [Buildroot] [PATCH 04/14] package/minetest: " Romain Naour
` (12 subsequent siblings)
14 siblings, 1 reply; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
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 354866e..64fe583 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1339,6 +1339,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 19315f7..58b196b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1385,6 +1385,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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 03/14] package/libspatialindex: new package
2017-04-11 22:26 ` [Buildroot] [PATCH 03/14] package/libspatialindex: " Romain Naour
@ 2017-06-11 17:02 ` Bernd Kuhls
0 siblings, 0 replies; 23+ messages in thread
From: Bernd Kuhls @ 2017-06-11 17:02 UTC (permalink / raw)
To: buildroot
Am Wed, 12 Apr 2017 00:26:32 +0200 schrieb Romain Naour:
> Signed-off-by: Romain Naour <romain.naour-
Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> 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
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de
(build-tested using http://autobuild.buildroot.net/toolchains/configs/br-
bfin-full.config )
Small note: The package also builds fine as cmake-package.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH 04/14] package/minetest: new package
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 02/14] package/irrlicht: new package Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 03/14] package/libspatialindex: " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-06-11 17:38 ` Bernd Kuhls
2017-04-11 22:26 ` [Buildroot] [PATCH 05/14] package/minetest: add libcurl optional dependency Romain Naour
` (11 subsequent siblings)
14 siblings, 1 reply; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/minetest/Config.in | 58 ++++++++++++++++++++++++++++++++++++++++++++
package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++
4 files changed, 104 insertions(+)
create mode 100644 package/minetest/Config.in
create mode 100644 package/minetest/minetest.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 64fe583..2c25281 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1343,6 +1343,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 58b196b..23d2c5e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -225,6 +225,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..ac6c954
--- /dev/null
+++ b/package/minetest/Config.in
@@ -0,0 +1,58 @@
+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
+ depends on BR2_PACKAGE_LUAJIT
+ select BR2_PACKAGE_IRRLICHT
+ select BR2_PACKAGE_GMP
+ select BR2_PACKAGE_JSONCPP
+ 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
diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
new file mode 100644
index 0000000..f110f7c
--- /dev/null
+++ b/package/minetest/minetest.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# minetest
+#
+################################################################################
+
+MINETEST_VERSION = 0.4.15
+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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 04/14] package/minetest: new package
2017-04-11 22:26 ` [Buildroot] [PATCH 04/14] package/minetest: " Romain Naour
@ 2017-06-11 17:38 ` Bernd Kuhls
2017-06-11 21:18 ` Romain Naour
0 siblings, 1 reply; 23+ messages in thread
From: Bernd Kuhls @ 2017-06-11 17:38 UTC (permalink / raw)
To: buildroot
Hi Romain,
Am Wed, 12 Apr 2017 00:26:33 +0200 schrieb Romain Naour:
> Signed-off-by: Romain Naour <romain.naour-
Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/minetest/Config.in | 58 +++++++++++++++++++++++++++++++++++++
+++++++
> package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++
please add a hash file, support for tarballs created by the github helper
was merged today.
> diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
> new file mode 100644
> index 0000000..f110f7c
> --- /dev/null
> +++ b/package/minetest/minetest.mk
> @@ -0,0 +1,44 @@
>
+################################################################################
> +#
> +# minetest
> +#
>
+################################################################################
> +
> +MINETEST_VERSION = 0.4.15
Version 0.4.16 was released meanwhile.
Building with this defconfig worked fine:
BR2_TOOLCHAIN_BUILDROOT_MUSL=y
BR2_BINUTILS_VERSION_2_28_X=y
BR2_GCC_VERSION_7_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_MINETEST=y
BR2_PACKAGE_MINETEST_CLIENT_SERVER=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_LUAJIT=y
Regards, Bernd
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH 04/14] package/minetest: new package
2017-06-11 17:38 ` Bernd Kuhls
@ 2017-06-11 21:18 ` Romain Naour
2017-06-12 3:59 ` Bernd Kuhls
0 siblings, 1 reply; 23+ messages in thread
From: Romain Naour @ 2017-06-11 21:18 UTC (permalink / raw)
To: buildroot
Hi Bernd,
Le 11/06/2017 ? 19:38, Bernd Kuhls a ?crit :
> Hi Romain,
>
> Am Wed, 12 Apr 2017 00:26:33 +0200 schrieb Romain Naour:
>
>> Signed-off-by: Romain Naour <romain.naour-
> Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>
>> ---
>> DEVELOPERS | 1 +
>> package/Config.in | 1 +
>> package/minetest/Config.in | 58 +++++++++++++++++++++++++++++++++++++
> +++++++
>> package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++
>
> please add a hash file, support for tarballs created by the github helper
> was merged today.
Ok, I'll add it.
>
>> diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
>> new file mode 100644
>> index 0000000..f110f7c
>> --- /dev/null
>> +++ b/package/minetest/minetest.mk
>> @@ -0,0 +1,44 @@
>>
> +################################################################################
>> +#
>> +# minetest
>> +#
>>
> +################################################################################
>> +
>> +MINETEST_VERSION = 0.4.15
>
> Version 0.4.16 was released meanwhile.
Yes, it's an very active project and this series has been in the patchwork
during 2 months. I'll bump the version for the respin.
>
> Building with this defconfig worked fine:
>
> BR2_TOOLCHAIN_BUILDROOT_MUSL=y
> BR2_BINUTILS_VERSION_2_28_X=y
> BR2_GCC_VERSION_7_X=y
> BR2_TOOLCHAIN_BUILDROOT_CXX=y
> BR2_PACKAGE_MINETEST=y
> BR2_PACKAGE_MINETEST_CLIENT_SERVER=y
> BR2_PACKAGE_MESA3D=y
> BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
> BR2_PACKAGE_XORG7=y
> BR2_PACKAGE_LUAJIT=y
It means that I can add your Tested-by tag?
Best regards,
Romain
>
> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH 04/14] package/minetest: new package
2017-06-11 21:18 ` Romain Naour
@ 2017-06-12 3:59 ` Bernd Kuhls
0 siblings, 0 replies; 23+ messages in thread
From: Bernd Kuhls @ 2017-06-12 3:59 UTC (permalink / raw)
To: buildroot
Am Sun, 11 Jun 2017 23:18:45 +0200 schrieb Romain Naour:
>>
>> Building with this defconfig worked fine:
>>
>> BR2_TOOLCHAIN_BUILDROOT_MUSL=y
>> BR2_BINUTILS_VERSION_2_28_X=y
>> BR2_GCC_VERSION_7_X=y
>> BR2_TOOLCHAIN_BUILDROOT_CXX=y
>> BR2_PACKAGE_MINETEST=y
>> BR2_PACKAGE_MINETEST_CLIENT_SERVER=y
>> BR2_PACKAGE_MESA3D=y
>> BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
>> BR2_PACKAGE_XORG7=y
>> BR2_PACKAGE_LUAJIT=y
>
> It means that I can add your Tested-by tag?
Hi Romain,
yes.
Regards, Bernd
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH 05/14] package/minetest: add libcurl optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (2 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 04/14] package/minetest: " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 06/14] package/minetest: add gettext " Romain Naour
` (10 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 f110f7c..51ef14f 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 06/14] package/minetest: add gettext optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (3 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 05/14] package/minetest: add libcurl optional dependency Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 07/14] package/minetest: add freetype " Romain Naour
` (9 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 51ef14f..0d1e8f3 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 07/14] package/minetest: add freetype optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (4 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 06/14] package/minetest: add gettext " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 08/14] package/minetest: add gles " Romain Naour
` (8 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 0d1e8f3..9cffc78 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 08/14] package/minetest: add gles optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (5 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 07/14] package/minetest: add freetype " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 09/14] package/minetest: enable sound support Romain Naour
` (7 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 9cffc78..fe6e015 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 09/14] package/minetest: enable sound support
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (6 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 08/14] package/minetest: add gles " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 10/14] package/minetest: add postgresql optional dependency Romain Naour
` (6 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 ac6c954..b151905 100644
--- a/package/minetest/Config.in
+++ b/package/minetest/Config.in
@@ -55,4 +55,12 @@ 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
diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index fe6e015..29f804e 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 10/14] package/minetest: add postgresql optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (7 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 09/14] package/minetest: enable sound support Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 11/14] package/minetest: add hiredis " Romain Naour
` (5 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 29f804e..93b99fa 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 11/14] package/minetest: add hiredis optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (8 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 10/14] package/minetest: add postgresql optional dependency Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 12/14] package/minetest: add leveldb " Romain Naour
` (4 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 93b99fa..2b46401 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 12/14] package/minetest: add leveldb optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (9 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 11/14] package/minetest: add hiredis " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 13/14] package/minetest: add libspatialindex " Romain Naour
` (3 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 2b46401..1560592 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 13/14] package/minetest: add libspatialindex optional dependency
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (10 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 12/14] package/minetest: add leveldb " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-11 22:26 ` [Buildroot] [PATCH 14/14] package/minetest_game: new package Romain Naour
` (2 subsequent siblings)
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 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 1560592..292050c 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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 14/14] package/minetest_game: new package
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (11 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 13/14] package/minetest: add libspatialindex " Romain Naour
@ 2017-04-11 22:26 ` Romain Naour
2017-04-12 19:37 ` [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Thomas Petazzoni
[not found] ` <1108a7ef-12c0-8e55-1a6f-22f9b4bae251@t-online.de>
14 siblings, 0 replies; 23+ messages in thread
From: Romain Naour @ 2017-04-11 22:26 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/minetest_game/Config.in | 7 ++++++
package/minetest_game/minetest_game.mk | 40 ++++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+)
create mode 100644 package/minetest_game/Config.in
create mode 100644 package/minetest_game/minetest_game.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 2c25281..5891ae1 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1344,6 +1344,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 23d2c5e..c9cb31c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -226,6 +226,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/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.mk b/package/minetest_game/minetest_game.mk
new file mode 100644
index 0000000..2422e8d
--- /dev/null
+++ b/package/minetest_game/minetest_game.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# minetest_game
+#
+################################################################################
+
+MINETEST_GAME_VERSION = 0.4.15
+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 = README.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.3
^ permalink raw reply related [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink
2017-04-11 22:26 [Buildroot] [PATCH 01/14] package/hiredis: add missing library symlink Romain Naour
` (12 preceding siblings ...)
2017-04-11 22:26 ` [Buildroot] [PATCH 14/14] package/minetest_game: new package Romain Naour
@ 2017-04-12 19:37 ` Thomas Petazzoni
[not found] ` <1108a7ef-12c0-8e55-1a6f-22f9b4bae251@t-online.de>
14 siblings, 0 replies; 23+ messages in thread
From: Thomas Petazzoni @ 2017-04-12 19:37 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 12 Apr 2017 00:26:30 +0200, Romain Naour wrote:
> + ln -sf libhiredis.so $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
I don't think this was the correct fix, the symbolic link should be the
other way around, and indeed the "make install" of hiredis does it the
other way around.
So I've tweaked your patch to instead install the library itself as
libhiredis.so.0.13, and create a symbolic link named libhiredis.so.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 23+ messages in thread[parent not found: <1108a7ef-12c0-8e55-1a6f-22f9b4bae251@t-online.de>]
* [Buildroot] [PATCH 02/14] package/irrlicht: new package
[not found] ` <1108a7ef-12c0-8e55-1a6f-22f9b4bae251@t-online.de>
@ 2017-06-11 21:09 ` Romain Naour
2017-06-11 21:33 ` Arnout Vandecappelle
0 siblings, 1 reply; 23+ messages in thread
From: Romain Naour @ 2017-06-11 21:09 UTC (permalink / raw)
To: buildroot
Hi Bernd,
Thank for the review, it's very appreciated :)
Le 11/06/2017 ? 18:54, Bernd Kuhls a ?crit :
> Hi Romain,
>
> afaics the irrlicht package only provides libirrlicht.so.
> What about naming the package libirrlicht and move it to
> "Target packages > Libraries > Graphics"?
Make sense even if irrlicht is the upstream name.
In the past, I hesitated to do so for efl package which can be named libefl.
>
> Am Wed, 12 Apr 2017 00:26:31 +0200 schrieb Romain Naour:
>
>> Signed-off-by: Romain Naour <romain.naour-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>> DEVELOPERS | 1 +
>> package/Config.in | 1 +
>> ...-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch | 44 +++++++++++++++++
>> package/irrlicht/0002-remove-sys-sysctl.h.patch | 38 +++++++++++++++
>
> Did you send the patches upstream?
Not yet. I'll do it.
>
> @Whoever will commit the patches to buildroot: The irrlicht source code
> has DOS line endings, please adjust the patch files accordingly.
Indeed, thanks for the warning.
>
>> diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk
>> new file mode 100644
>> index 0000000..ab6187c
>> --- /dev/null
>> +++ b/package/irrlicht/irrlicht.mk
>> @@ -0,0 +1,57 @@
>> +################################################################################
>> +#
>> +# 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,
>> +IRRLICHT_LICENSE = bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng, Zlib
>
> Please mention the license of the irrlicht package itself.
Irrlicht itself use Zlib license.
http://pkgs.fedoraproject.org/cgit/rpms/irrlicht.git/tree/irrlicht.spec#n9
Best regards,
Romain
>
> Regards, Bernd
>
^ permalink raw reply [flat|nested] 23+ messages in thread* [Buildroot] [PATCH 02/14] package/irrlicht: new package
2017-06-11 21:09 ` [Buildroot] [PATCH 02/14] package/irrlicht: new package Romain Naour
@ 2017-06-11 21:33 ` Arnout Vandecappelle
2017-06-12 4:08 ` Bernd Kuhls
0 siblings, 1 reply; 23+ messages in thread
From: Arnout Vandecappelle @ 2017-06-11 21:33 UTC (permalink / raw)
To: buildroot
On 11-06-17 23:09, Romain Naour wrote:
> Hi Bernd,
>
> Thank for the review, it's very appreciated :)
>
> Le 11/06/2017 ? 18:54, Bernd Kuhls a ?crit :
>> Hi Romain,
>>
>> afaics the irrlicht package only provides libirrlicht.so.
>> What about naming the package libirrlicht and move it to
>> "Target packages > Libraries > Graphics"?
>
> Make sense even if irrlicht is the upstream name.
> In the past, I hesitated to do so for efl package which can be named libefl.
No, in Buildroot, we always use the upstream name (except for python-* etc.).
[snip]
>>> +# Bundled libraries: bzip2, libaesGladman, libpng, lzma, zlib,
>>> +IRRLICHT_LICENSE = bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng, Zlib
>>
>> Please mention the license of the irrlicht package itself.
>
> Irrlicht itself use Zlib license.
Then Zlib license should be first, and the license of the bundled libraries
should mention which bit they apply to between brackets.
By the way, could you mention in the commit message why unbundling is not possible?
Regards,
Arnout
>
> http://pkgs.fedoraproject.org/cgit/rpms/irrlicht.git/tree/irrlicht.spec#n9
>
> Best regards,
> Romain
>
>>
>> Regards, Bernd
>>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Buildroot] [PATCH 02/14] package/irrlicht: new package
2017-06-11 21:33 ` Arnout Vandecappelle
@ 2017-06-12 4:08 ` Bernd Kuhls
0 siblings, 0 replies; 23+ messages in thread
From: Bernd Kuhls @ 2017-06-12 4:08 UTC (permalink / raw)
To: buildroot
Am Sun, 11 Jun 2017 23:33:27 +0200 schrieb Arnout Vandecappelle:
> On 11-06-17 23:09, Romain Naour wrote:
>> Hi Bernd,
>>
>> Thank for the review, it's very appreciated :)
>>
>> Le 11/06/2017 ? 18:54, Bernd Kuhls a ?crit :
>>> Hi Romain,
>>>
>>> afaics the irrlicht package only provides libirrlicht.so.
>>> What about naming the package libirrlicht and move it to
>>> "Target packages > Libraries > Graphics"?
>>
>> Make sense even if irrlicht is the upstream name.
>> In the past, I hesitated to do so for efl package which can be named
libefl.
>
> No, in Buildroot, we always use the upstream name (except for python-*
etc.).
Hi Arnout,
this is not true for example for libcurl, libfribidi, libglew, libglfw
and libspandsp whose respective upstream project names also lack "lib".
Regards, Bernd
^ permalink raw reply [flat|nested] 23+ messages in thread