Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Jeremy Blosser (88601d33ea4beff1a056c8fdb3a8859d0a57397f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Jeremy Blosser (88601d33ea4beff1a056c8fdb3a8859d0a57397f)
  • Date: Thu, 18 Sep 2014 16:11:07 -0500

GIT changes to master games grimoire by Jeremy Blosser
<jblosser AT sourcemage.org>:

games-simulation/minetest/BUILD | 2 -
games-simulation/minetest/CONFIGURE | 13 +++++++
games-simulation/minetest/DEPENDS | 63
+++++++++++++++++++++---------------
games-simulation/minetest/DETAILS | 34 ++++++++++---------
games-simulation/minetest/HISTORY | 4 ++
games-simulation/minetest/PRE_BUILD | 7 ++++
6 files changed, 81 insertions(+), 42 deletions(-)

New commits:
commit 88601d33ea4beff1a056c8fdb3a8859d0a57397f
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

minetest: Allow building just the client or server and allow building
without sound.

Building only the server requires irrlicht source available, but doesn't
require it built, which would also require X installed. I set this spell to
download irrlicht if needed vs relying on the other to have a source-only
option. The source is always included in DETAILS because it will be needed
regardless, but it's only extracted in PRE_BUILD if it's needed.

diff --git a/games-simulation/minetest/BUILD b/games-simulation/minetest/BUILD
index 0c90ec3..a1811ea 100755
--- a/games-simulation/minetest/BUILD
+++ b/games-simulation/minetest/BUILD
@@ -1,4 +1,4 @@
cmake . -DCMAKE_INSTALL_PREFIX=${INSTALL_ROOT}/usr
-DCMAKE_BUILD_TYPE=RELEASE \
- -DRUN_IN_PLACE=0 ${OPTS} &&
+ -DRUN_IN_PLACE=0 ${MINETEST_OPTS} ${OPTS} &&

make
diff --git a/games-simulation/minetest/CONFIGURE
b/games-simulation/minetest/CONFIGURE
new file mode 100755
index 0000000..1f21d27
--- /dev/null
+++ b/games-simulation/minetest/CONFIGURE
@@ -0,0 +1,13 @@
+config_query_option MINETEST_OPTS "Build client?" y \
+ "-DBUILD_CLIENT=1" \
+ "-DBUILD_CLIENT=0" &&
+
+if list_find "${MINETEST_OPTS}" "-DBUILD_CLIENT=1"; then
+ config_query_option MINETEST_OPTS "Enable sound?" y \
+ "-DENABLE_SOUND=1" \
+ "-DENABLE_SOUND=0"
+fi &&
+
+config_query_option MINETEST_OPTS "Build server?" y \
+ "-DBUILD_SERVER=1" \
+ "-DBUILD_SERVER=0"
diff --git a/games-simulation/minetest/DEPENDS
b/games-simulation/minetest/DEPENDS
index a4ba29f..c2bcdf6 100755
--- a/games-simulation/minetest/DEPENDS
+++ b/games-simulation/minetest/DEPENDS
@@ -1,38 +1,49 @@
-depends irrlicht &&
depends cmake &&
-depends bzip2 &&
-depends libpng &&
-depends JPEG &&
-depends libxxf86vm &&
-depends OPENGL &&
+depends zlib &&
depends sqlite &&
-depends libogg &&
-depends libvorbis &&
-depends OPENAL &&

+optional_depends luajit \
+ "-DDISABLE_LUAJIT=0" \
+ "-DDISABLE_LUAJIT=1" \
+ "" &&
optional_depends curl \
"-DENABLE_CURL=1" \
"-DENABLE_CURL=0" \
"online mod repo, public serverlist and remote media
fetching via http" &&
-optional_depends freetype2 \
- "-DENABLE_FREETYPE=1" \
- "-DENABLE_FREETYPE=0" \
- "ttf font support" &&
optional_depends gettext \
"-DENABLE_GETTEXT=1" \
"-DENABLE_GETTEXT=0" \
"translation support" &&
-optional_depends leveldb \
- "-DENABLE_LEVELDB=1" \
- "-DENABLE_LEVELDB=0" \
- "leveldb as map backend" &&
-optional_depends redis \
- "-DENABLE_REDIS" \
- "-DENABLE_REDIS=0" \
- "redis as map backend" &&
-optional_depends luajit \
- "-DDISABLE_LUAJIT=0" \
- "-DDISABLE_LUAJIT=1" \
- "" &&

-suggest_depends minetest_game "" "" "for the main game"
+if list_find "${MINETEST_OPTS}" "-DBUILD_CLIENT=1"; then
+ depends irrlicht &&
+ depends bzip2 &&
+ depends libpng &&
+ depends JPEG &&
+ depends libxxf86vm &&
+ depends OPENGL &&
+
+ optional_depends freetype2 \
+ "-DENABLE_FREETYPE=1" \
+ "-DENABLE_FREETYPE=0" \
+ "ttf font support" &&
+
+ if list_find "${MINETEST_OPTS}" "-DENABLE_SOUND=1"; then
+ depends libogg &&
+ depends libvorbis &&
+ depends OPENAL
+ fi
+fi &&
+
+if list_find "${MINETEST_OPTS}" "-DBUILD_SERVER=1"; then
+ optional_depends leveldb \
+ "-DENABLE_LEVELDB=1" \
+ "-DENABLE_LEVELDB=0" \
+ "leveldb as map backend" &&
+ optional_depends redis \
+ "-DENABLE_REDIS" \
+ "-DENABLE_REDIS=0" \
+ "redis as map backend" &&
+
+ suggest_depends minetest_game "" "" "for the main game"
+fi
diff --git a/games-simulation/minetest/DETAILS
b/games-simulation/minetest/DETAILS
index fc0d7ec..7529b53 100755
--- a/games-simulation/minetest/DETAILS
+++ b/games-simulation/minetest/DETAILS
@@ -1,23 +1,27 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=minetest
+ IRRLICHT_VERSION=1.8.1
if [ "${MINETEST_BRANCH}" == "scm" ]; then
- VERSION=$(get_scm_version)
- SOURCE=${SPELL}-${MINETEST_BRANCH}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${MINETEST_BRANCH}
- FORCE_DOWNLOAD=on
- SOURCE_URL[0]=git://github.com/${SPELL}/${SPELL}.git
- SOURCE_IGNORE=volatile
+ VERSION=$(get_scm_version)
+ SOURCE=${SPELL}-${MINETEST_BRANCH}.tar.bz2
+ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${MINETEST_BRANCH}
+FORCE_DOWNLOAD[1]=on
+ SOURCE_URL[0]=git://github.com/${SPELL}/${SPELL}.git
+ SOURCE_IGNORE=volatile
else
- VERSION=0.4.10
- SOURCE=${SPELL}-${VERSION}.tar.gz
-
SOURCE_URL[0]=https://github.com/${SPELL}/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:882723996b4904b4b9e3653476c2b4a988967600fc2b0897f755dd28d5da2ae5cab45a14fcdf8827c3f2838e952399e1e7d7e264cd26070fef2dbcd33cd1c59a
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ VERSION=0.4.10
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/${SPELL}/${SPELL}/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:882723996b4904b4b9e3653476c2b4a988967600fc2b0897f755dd28d5da2ae5cab45a14fcdf8827c3f2838e952399e1e7d7e264cd26070fef2dbcd33cd1c59a
+ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
- WEB_SITE="http://minetest.net/";
- LICENSE[0]=LGPL
- ENTERED=20140916
- SHORT="infinite-world block sandbox game with survival and
crafting"
+ SOURCE2="irrlicht-${IRRLICHT_VERSION}.zip"
+ SOURCE2_URL[0]=http://downloads.sourceforge.net/irrlicht/${SOURCE2}
+
SOURCE2_HASH=sha512:93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb
+ WEB_SITE="http://minetest.net/";
+ LICENSE[0]=LGPL
+ ENTERED=20140916
+ SHORT="infinite-world block sandbox game with survival and
crafting"
cat << EOF
Minetest is an infinite-world block sandbox game and a game engine, inspired
by InfiniMiner, Minecraft and the like. It has been in development and use
diff --git a/games-simulation/minetest/HISTORY
b/games-simulation/minetest/HISTORY
index 0116d10..07dcde8 100644
--- a/games-simulation/minetest/HISTORY
+++ b/games-simulation/minetest/HISTORY
@@ -1,3 +1,7 @@
+2014-09-18 Jeremy Blosser <jblosser AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD, BUILD, DEPENDS, DETAILS: Allow building just
+ the client or server, allow building without sound support.
+
2014-09-16 Jeremy Blosser <jblosser AT sourcemage.org>
* PREPARE, BUILD, DEPENDS, DETAILS, INSTALL: spell created

diff --git a/games-simulation/minetest/PRE_BUILD
b/games-simulation/minetest/PRE_BUILD
new file mode 100755
index 0000000..3568ac7
--- /dev/null
+++ b/games-simulation/minetest/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+if list_find "${MINETEST_OPTS}" "-DBUILD_SERVER=1" && ! spell_ok irrlicht;
then
+ cd "${SOURCE_DIRECTORY}" &&
+ unpack_file 2 &&
+ OPTS="${OPTS} -DIRRLICHT_SOURCE_DIR=./irrlicht-${IRRLICHT_VERSION}"
+fi



  • [SM-Commit] GIT changes to master games grimoire by Jeremy Blosser (88601d33ea4beff1a056c8fdb3a8859d0a57397f), Jeremy Blosser, 09/18/2014

Archive powered by MHonArc 2.6.24.

Top of Page