Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master games grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 CMAKE_CONFIGURE                |   12 -----------
 CMAKE_DEPENDS                  |    5 ----
 FUNCTIONS                      |   44 
+++++++++++++++++++++++++++++++++++++----
 games-engines/irrlicht/BUILD   |    3 --
 games-engines/irrlicht/DETAILS |    4 +--
 games-engines/irrlicht/HISTORY |    5 ++++
 games-engines/irrlicht/INSTALL |    8 ++++---
 7 files changed, 55 insertions(+), 26 deletions(-)

New commits:
commit 950e372a5e93743aeaa0aebca7529b5040e0d262
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    irrlicht 1.8.5

commit 86254442ebe9ba8e069dd7458e9b56984e98feed
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    Update CMake functions from main grimoire

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
index ae19da8..f03d7d4 100755
--- a/CMAKE_CONFIGURE
+++ b/CMAKE_CONFIGURE
@@ -2,14 +2,4 @@ config_query_list  CM_BUILD_TYPE  'which build type?' 
Release Debug RelWithDebIn
 #if is_depends_enabled $SPELL extra-cmake-modules;then
  config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1" 
"-DBUILD_TESTING=0"
 #fi
-
-# Default to Ninja cmake generator if it's installed, otherwise the standard 
Unix way
-if spell_ok ninja-build-system; then
-  message 
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is 
using ${SPELL_COLOR}ninja${DEFAULT_COLOR}${MESSAGE_COLOR} for CMAKE 
GENERATOR."  &&
-  CMAKE_GEN='Ninja'
-else
-  message 
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is 
using \"Unix Makefiles\" for CMAKE GENERATOR."  &&
-  CMAKE_GEN='Unix Makefiles'
-fi  &&
-
-persistent_add CMAKE_GEN
+persistent_remove CMAKE_GEN
diff --git a/CMAKE_DEPENDS b/CMAKE_DEPENDS
index 8840cf4..90b3ead 100755
--- a/CMAKE_DEPENDS
+++ b/CMAKE_DEPENDS
@@ -1,5 +1,2 @@
 depends cmake  &&
-
-if [[ $CMAKE_GEN == Ninja ]];then
-  depends ninja-build-system
-fi
+optional_depends ninja-build-system ' -G Ninja' '' 'faster builds'
diff --git a/FUNCTIONS b/FUNCTIONS
index f397166..8d7d2bc 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -77,17 +77,53 @@ function default_games_build() {
   default_build
 }
 
+# cmake flags use : which is an internal sorcery delimiter.
+# In order to facilitate the passing of depends flags, use % instead and call
+# this function at the start of BUILD. Don't use it anywhere else.
+# Example:
+# DEPENDS: depends kdelibs4 -DCRUFT%BOOL=FALSE; ...
+# BUILD: prepare_cmake_flags; ...
+function prepare_cmake_flags()
+{
+  OPTS="${OPTS//%/:}"
+}
+
 #---
 ## @Synopsis cmake_build function to build
 ## @Synopsis source code with cmake
 #---
 
-function cmake_build() {
-  cd $SOURCE_DIRECTORY  &&
+cmake_build() {
   mkdir -p build        &&
   cd build              &&
-  cmake -DCMAKE_INSTALL_LIBDIR:PATH=lib 
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ -DCMAKE_INSTALL_BINDIR=games 
-DCMAKE_INSTALL_DATAROOTDIR=share/games $OPTS &&
-  make
+  prepare_cmake_flags   &&
+
+  if [[ -z $1 ]];then
+    CMAKE_INSTALL_PREFIX="$INSTALL_ROOT/usr"
+  else
+    CMAKE_INSTALL_PREFIX="$1"
+  fi &&
+
+  message INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX &&
+
+  if is_depends_enabled $SPELL qt6base;then
+    OPTS+=" -DCMAKE_PREFIX_PATH=$QT6DIR/lib/cmake"
+  fi &&
+
+  cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
+        -DCMAKE_INSTALL_BINDIR=games \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -DCMAKE_INSTALL_DATAROOTDIR=share/games \
+        -DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
+        -DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
+        -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+        -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+         $OPTS ../  &&
+  cmake --build .
+}
+
+function cmake_install() {
+  cmake --install .
 }
 
 #---
diff --git a/games-engines/irrlicht/BUILD b/games-engines/irrlicht/BUILD
index 36a2ebb..0c178c0 100755
--- a/games-engines/irrlicht/BUILD
+++ b/games-engines/irrlicht/BUILD
@@ -1,2 +1 @@
-cd source/Irrlicht/     &&
-make NDEBUG=1 sharedlib
+make -C source/Irrlicht NDEBUG=1 sharedlib
diff --git a/games-engines/irrlicht/DETAILS b/games-engines/irrlicht/DETAILS
index 58f3e7c..0ecd4dc 100755
--- a/games-engines/irrlicht/DETAILS
+++ b/games-engines/irrlicht/DETAILS
@@ -1,8 +1,8 @@
            SPELL=irrlicht
-         VERSION=1.8.1
+         VERSION=1.8.5
           SOURCE="${SPELL}-${VERSION}.zip"
    SOURCE_URL[0]=http://downloads.sourceforge.net/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb
+     
SOURCE_HASH=sha512:d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://irrlicht.sourceforge.net/";
       LICENSE[0]=ZLIB
diff --git a/games-engines/irrlicht/HISTORY b/games-engines/irrlicht/HISTORY
index 2bc401b..dc638c5 100644
--- a/games-engines/irrlicht/HISTORY
+++ b/games-engines/irrlicht/HISTORY
@@ -1,3 +1,8 @@
+2021-12-30 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 1.8.5
+       * BUILD, INSTALL: simplified
+         don't call ldconfig on non-glibc systems
+
 2014-09-18 Jeremy Blosser <jblosser AT sourcemage.org>
        * *: moved to games
 
diff --git a/games-engines/irrlicht/INSTALL b/games-engines/irrlicht/INSTALL
index d18fb8a..72b5023 100755
--- a/games-engines/irrlicht/INSTALL
+++ b/games-engines/irrlicht/INSTALL
@@ -3,6 +3,8 @@ cd "${SOURCE_DIRECTORY}"                                      
 &&
 install -m 755 -d ${INSTALL_ROOT}/usr/include/irrlicht         &&
 install -m 644 include/* ${INSTALL_ROOT}/usr/include/irrlicht/ &&
 
-cd source/Irrlicht/                                            &&
-make install                                                   &&
-ldconfig
+make -C source/Irrlicht install &&
+case "$HOST" in
+  (*-gnu)
+    ldconfig ;;
+esac