Skip to contentSkip to conversation

package/hiredis: add missing library symlink

PATCH New Romain Naour 4 participants 23 messages Apr 11, 2017 – Jun 12, 2017 1 message not in the archive

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/14 package/hiredis: add missing library symlink

While testing minetest with libhiredis library, the game crached due to missing libhiredis.so.0.13 library.

Since the build system doesn't use "make install" and install manually headers and library file, it must also create the symlink libhiredis.so.0.13 -> libhiredis.so

Signed-off-by Romain Naour <[email protected]>
Cc Fabrice Fontaine <[email protected]>
---
 package/hiredis/hiredis.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/hiredis/hiredis.mk +4 -1
index 53ad0b9..6472934 100644
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-HIREDIS_VERSION = v0.13.3
+HIREDIS_VERSION_MAJOR = 0.13
+HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).3
 HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION))
 HIREDIS_LICENSE = BSD-3-Clause
 HIREDIS_LICENSE_FILES = COPYING

@@ -37,12 +38,14 @@ define HIREDIS_INSTALL_STAGING_CMDS
 		$(@D)/adapters $(HIREDIS_INCLUDE_DIR)
 	$(INSTALL) -D -m 0644 $(@D)/hiredis.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc
+	ln -sf libhiredis.so $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
 	$(INSTALL) -m 0644 -t $(STAGING_DIR)/usr/lib $(@D)/libhiredis*
 endef
 
 define HIREDIS_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/lib $(@D)/libhiredis*
+	ln -sf libhiredis.so $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 2/14 package/irrlicht: new package

Signed-off-by Romain Naour <[email protected]>
---
 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
DEVELOPERS +1 -0
index a298669..354866e 100644
@@ -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/
package/Config.in +1 -0
index c12e5b5..19315f7 100644
@@ -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"
package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch new file +44 -0

44 lines not on this page · raw message

package/irrlicht/0002-remove-sys-sysctl.h.patch new file +38 -0
new file mode 100644
index 0000000..d9142a9
@@ -0,0 +1,38 @@
+From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+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 <[email protected]>
+---
+ 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
+
package/irrlicht/Config.in new file +17 -0
new file mode 100644
index 0000000..edd182b
@@ -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
package/irrlicht/irrlicht.hash new file +5 -0
new file mode 100644
index 0000000..489790e
@@ -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
package/irrlicht/irrlicht.mk new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
2.9.3
#2 lore raw

PATCH 2/14 package/irrlicht: new package

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:

Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>
---
 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.

Quoted 10 lines
package/irrlicht/irrlicht.mk new file +4 -0
new file mode 100644
index 0000000..ab6187c
@@ -0,0 +1,57 @@
+################################################################################
+#
+# irrlicht
+#

package/irrlicht/irrlicht.mk line 14

Quoted 10 lines
package/irrlicht/irrlicht.mk new file +10 -0
+################################################################################
+
+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

author
#3 lore raw

PATCH 3/14 package/libspatialindex: new package

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>

---
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
DEVELOPERS +1 -0
index 354866e..64fe583 100644
@@ -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/
package/Config.in +1 -0
index 19315f7..58b196b 100644
@@ -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"
package/libspatialindex/Config.in new file +30 -0
new file mode 100644
index 0000000..0d066f6
@@ -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
package/libspatialindex/libspatialindex.hash new file +4 -0
new file mode 100644
index 0000000..3aa636d
@@ -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
package/libspatialindex/libspatialindex.mk new file +14 -0
new file mode 100644
index 0000000..d815364
@@ -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))
Signature · 1 line
2.9.3
#4 lore raw

PATCH 3/14 package/libspatialindex: new package

Am Wed, 12 Apr 2017 00:26:32 +0200 schrieb Romain Naour:

Quoted 1 line
Signed-off-by Romain Naour <romain.naour-

[email protected]>

Quoted 2 lines

---
test-pkg reported an internal compiler error on microblaze (br-

microblazeel-full)

Quoted 1 line

Index.cc: In member function 'void

SpatialIndex::RTree::Index::adjustTree(SpatialIndex::RTree::Node*, std::stack<long long int>&)':

Quoted 1 line

Index.cc:327:1: internal compiler error: in gen_reg_rtx, at emit-

rtl.c:1027

Quoted 4 lines
---
 DEVELOPERS                                   |  1 +
 package/Config.in                            |  1 +
 package/libspatialindex/Config.in            | 30 +++++++++++++++++++++

+++++++

Quoted 6 lines
 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 <[email protected]

(build-tested using http://autobuild.buildroot.net/toolchains/configs/br-
bfin-full.config )

Small note: The package also builds fine as cmake-package.

author
#5 lore raw

PATCH 4/14 package/minetest: new package

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 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
DEVELOPERS +1 -0
index 64fe583..2c25281 100644
@@ -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/
package/Config.in +1 -0
index 58b196b..23d2c5e 100644
@@ -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"
package/minetest/Config.in new file +58 -0

58 lines not on this page · raw message

package/minetest/minetest.mk new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
2.9.3
#6 lore raw

PATCH 4/14 package/minetest: new package

Hi Romain,

Am Wed, 12 Apr 2017 00:26:33 +0200 schrieb Romain Naour:

Quoted 1 line
Signed-off-by Romain Naour <romain.naour-

[email protected]>

Quoted 4 lines
---
 DEVELOPERS                   |  1 +
 package/Config.in            |  1 +
 package/minetest/Config.in   | 58 +++++++++++++++++++++++++++++++++++++

+++++++

Quoted 1 line
 package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++

please add a hash file, support for tarballs created by the github helper was merged today.

package/minetest/minetest.mk

Quoted 7 lines
package/minetest/minetest.mk new file +0 -0
new file mode 100644
index 0000000..f110f7c
@@ -0,0 +1,44 @@

+################################################################################

package/minetest/minetest.mk line 4

Quoted 4 lines
package/minetest/minetest.mk new file +3 -0
+#
+# minetest
+#

+################################################################################

package/minetest/minetest.mk line 7

Quoted 2 lines
package/minetest/minetest.mk new file +2 -0
+
+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

author
#7 lore raw

PATCH 4/14 package/minetest: new package

Hi Bernd,

Le 11/06/2017 ? 19:38, Bernd Kuhls a ?crit :

Quoted 10 lines

Hi Romain,

Am Wed, 12 Apr 2017 00:26:33 +0200 schrieb Romain Naour:

Quoted 1 line
Signed-off-by Romain Naour <romain.naour-

Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>

Quoted 4 lines
---
 DEVELOPERS                   |  1 +
 package/Config.in            |  1 +
 package/minetest/Config.in   | 58 +++++++++++++++++++++++++++++++++++++
Quoted 5 lines

+++++++

Quoted 1 line
 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.

Quoted 14 lines

package/minetest/minetest.mk

Quoted 8 lines
package/minetest/minetest.mk new file +0 -0
new file mode 100644
index 0000000..f110f7c
@@ -0,0 +1,44 @@

+################################################################################

package/minetest/minetest.mk line 4

Quoted 4 lines
package/minetest/minetest.mk new file +3 -0
+#
+# minetest
+#

+################################################################################

Quoted 4 lines

package/minetest/minetest.mk line 7

Quoted 2 lines
package/minetest/minetest.mk new file +2 -0
+
+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.

Quoted 13 lines

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

Quoted 8 lines

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#8 lore raw

PATCH 4/14 package/minetest: new package

Am Sun, 11 Jun 2017 23:18:45 +0200 schrieb Romain Naour:

Quoted 14 lines
Quoted 13 lines

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

Quoted 1 line

It means that I can add your Tested-by tag?

Hi Romain,

yes.

Regards, Bernd

author
#9 lore raw

PATCH 5/14 package/minetest: add libcurl optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index f110f7c..51ef14f 100644
@@ -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))
Signature · 1 line
2.9.3
author
#10 lore raw

PATCH 6/14 package/minetest: add gettext optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 51ef14f..0d1e8f3 100644
@@ -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
Signature · 1 line
2.9.3
author
#11 lore raw

PATCH 7/14 package/minetest: add freetype optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 0d1e8f3..9cffc78 100644
@@ -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
Signature · 1 line
2.9.3
author
#12 lore raw

PATCH 8/14 package/minetest: add gles optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 9cffc78..fe6e015 100644
@@ -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
Signature · 1 line
2.9.3
author
#13 lore raw

PATCH 9/14 package/minetest: enable sound support

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/Config.in   | 8 ++++++++
 package/minetest/minetest.mk | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
package/minetest/Config.in +8 -0
index ac6c954..b151905 100644
@@ -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
package/minetest/minetest.mk +7 -1
index fe6e015..29f804e 100644
@@ -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
Signature · 1 line
2.9.3
author
#14 lore raw

PATCH 10/14 package/minetest: add postgresql optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 29f804e..93b99fa 100644
@@ -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))
Signature · 1 line
2.9.3
author
#15 lore raw

PATCH 11/14 package/minetest: add hiredis optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 93b99fa..2b46401 100644
@@ -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
Signature · 1 line
2.9.3
author
#16 lore raw

PATCH 12/14 package/minetest: add leveldb optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 2b46401..1560592 100644
@@ -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
Signature · 1 line
2.9.3
author
#17 lore raw

PATCH 13/14 package/minetest: add libspatialindex optional dependency

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 package/minetest/minetest.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
index 1560592..292050c 100644
@@ -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
Signature · 1 line
2.9.3
author
#18 lore raw

PATCH 14/14 package/minetest_game: new package

In reply to Romain Naour
Signed-off-by Romain Naour <[email protected]>
---
 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
DEVELOPERS +1 -0
index 2c25281..5891ae1 100644
@@ -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/
package/Config.in +1 -0
index 23d2c5e..c9cb31c 100644
@@ -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"
package/minetest_game/Config.in new file +7 -0
new file mode 100644
index 0000000..75978e9
@@ -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
package/minetest_game/minetest_game.mk new file +40 -0
new file mode 100644
index 0000000..2422e8d
@@ -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))
Signature · 1 line
2.9.3
#19 lore raw

PATCH 1/14 package/hiredis: add missing library symlink

In reply to Romain Naour

Hello,

package/hiredis/hiredis.mk define HIREDIS_INSTALL_STAGING_CMDS · line 41

Quoted 1 line · Romain Naour
package/hiredis/hiredis.mk +1 -0
+	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

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#21 lore raw

PATCH 2/14 package/irrlicht: new package

Hi Bernd,

Thank for the review, it's very appreciated :)

Le 11/06/2017 ? 18:54, Bernd Kuhls a ?crit :

Quoted 5 lines

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.

Quoted 11 lines

Am Wed, 12 Apr 2017 00:26:31 +0200 schrieb Romain Naour:

Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>
---
 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.

Quoted 3 lines

@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.

Quoted 15 lines
Quoted 15 lines
package/irrlicht/irrlicht.mk new file +8 -0
new file mode 100644
index 0000000..ab6187c
@@ -0,0 +1,57 @@
+################################################################################
+#
+# irrlicht
+#
+################################################################################
+
+IRRLICHT_VERSION_MAJOR = 1.8
+IRRLICHT_VERSION = $(IRRLICHT_VERSION_MAJOR).4
Quoted 8 lines

package/irrlicht/irrlicht.mk line 14

Quoted 6 lines
package/irrlicht/irrlicht.mk new file +6 -0
+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

Quoted 3 lines

Regards, Bernd

#22 lore raw

PATCH 2/14 package/irrlicht: new package

Quoted 5 lines · Romain Naour

Hi Bernd,

Thank for the review, it's very appreciated :)

Le 11/06/2017 ? 18:54, Bernd Kuhls a ?crit :

Quoted 8 lines
Quoted 5 lines

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]

Quoted 6 lines
Quoted 4 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+# 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

Quoted 15 lines

http://pkgs.fedoraproject.org/cgit/rpms/irrlicht.git/tree/irrlicht.spec#n9

Best regards,
Romain

Quoted 3 lines

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
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
#23 lore raw

PATCH 2/14 package/irrlicht: new package

Am Sun, 11 Jun 2017 23:33:27 +0200 schrieb Arnout Vandecappelle:

Quoted 6 lines · Romain Naour
Quoted 5 lines

Hi Bernd,

Thank for the review, it's very appreciated :)

Le 11/06/2017 ? 18:54, Bernd Kuhls a ?crit :

Quoted 8 lines
Quoted 8 lines
Quoted 5 lines

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.

Quoted 2 lines

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