summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/minetest/Config.in13
-rw-r--r--package/minetest/minetest.mk8
2 files changed, 20 insertions, 1 deletions
diff --git a/package/minetest/Config.in b/package/minetest/Config.in
index a76c3197cf..4e8b1d0eef 100644
--- a/package/minetest/Config.in
+++ b/package/minetest/Config.in
@@ -37,6 +37,19 @@ config BR2_PACKAGE_MINETEST_SERVER
help
Build Minetest server.
+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
+
+comment "sound support needs a toolchain w/ threads NPTL"
+ depends on BR2_PACKAGE_MINETEST_CLIENT
+ depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+
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 528f1400b3..44a28ce238 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib
MINETEST_CONF_OPTS = \
-DDEFAULT_RUN_IN_PLACE=OFF \
- -DENABLE_SOUND=OFF \
-DENABLE_GLES=OFF \
-DENABLE_LUAJIT=ON \
-DENABLE_CURSES=OFF \
@@ -38,6 +37,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
OpenPOWER on IntegriCloud