Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 ChangeLog            |    3 +++
 MESON_FUNCTIONS      |   25 +++++++++++++++++++++++++
 disk/fuse3/BUILD     |   17 -----------------
 disk/fuse3/DEPENDS   |    2 ++
 disk/fuse3/DETAILS   |    1 +
 disk/fuse3/HISTORY   |    6 ++++++
 disk/fuse3/PRE_BUILD |    4 ++++
 libs/fmt/DETAILS     |    4 ++--
 libs/fmt/HISTORY     |    3 +++
 9 files changed, 46 insertions(+), 19 deletions(-)

New commits:
commit 0770f56db290eee4120851112304be441d269d96
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    fmt: => 4.0.0

commit 0caeadbb95daae0caee37b636d1eeab70a80baf1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    fuse3 - use meson build

commit ac466fd6eb09e0304cb5e91584200c5b4a8a9980
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    add MESON_FUNCTIONS

diff --git a/ChangeLog b/ChangeLog
index 6ed2cb1..ab7a83d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-06-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * MESON_FUNCTIONS: added, for use with meson builds
+
 2017-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * python-pypi/python-cycler: new spell, composable style cycles
 
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
new file mode 100755
index 0000000..cda06d6
--- /dev/null
+++ b/MESON_FUNCTIONS
@@ -0,0 +1,25 @@
+# special functions for projects shich use meson build system
+meson_build () {
+  export LANG=$LC_ALL
+  cd $SOURCE_DIRECTORY
+  SCRIPT="meson --prefix ${INSTALL_ROOT}/usr --buildtype release 
--default-library shared"
+  for LL in $OPTS; do
+    SCRIPT+=" -D$LL"
+  done
+  SCRIPT+=" .  builddir/"
+  $SCRIPT &&
+  ninja -C builddir/
+}
+
+meson_install () {
+  cd $SOURCE_DIRECTORY
+  ninja -C builddir/ install
+}
+
+default_build() {
+ meson_build
+}
+
+default_install() {
+  meson_install
+}
diff --git a/disk/fuse3/BUILD b/disk/fuse3/BUILD
deleted file mode 100755
index f8a0de0..0000000
--- a/disk/fuse3/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-OPTS+=" --disable-mtab" &&
-OPTS+=" --enable-lib"   &&
-OPTS+=" --enable-util"  &&
-OPTS+=" --disable-example" &&
-OPTS+=" --disable-test" &&
-
-OPTS="--exec-prefix=$INSTALL_ROOT/ \
-      --with-pkgconfigdir=$INSTALL_ROOT/usr/lib/pkgconfig \
-      $OPTS" &&
-
-default_build_configure &&
-
-# patching generated Makefile to disable installation of init.d script
-sedit 's?\$(mkdir_p) \$(DESTDIR)\$(INIT_D_PATH)?#\$(mkdir_p) 
\$(DESTDIR)\$(INIT_D_PATH)?' util/Makefile &&
-sedit 's?\$(INSTALL_PROGRAM) \$(srcdir)/init_script 
\$(DESTDIR)\$(INIT_D_PATH)/fuse?#\$(INSTALL_PROGRAM) \$(srcdir)/init_script 
\$(DESTDIR)\$(INIT_D_PATH)/fuse?' util/Makefile &&
-
-default_build_make
diff --git a/disk/fuse3/DEPENDS b/disk/fuse3/DEPENDS
index 9853372..b38e9cc 100755
--- a/disk/fuse3/DEPENDS
+++ b/disk/fuse3/DEPENDS
@@ -1 +1,3 @@
+depends meson &&
+depends ninja-build-system &&
 runtime_depends util-linux
diff --git a/disk/fuse3/DETAILS b/disk/fuse3/DETAILS
index 986545b..d6b66c5 100755
--- a/disk/fuse3/DETAILS
+++ b/disk/fuse3/DETAILS
@@ -1,4 +1,5 @@
 . "$GRIMOIRE/FUNCTIONS"
+. "$GRIMOIRE/MESON_FUNCTIONS"
            SPELL=fuse3
           SPELLX=fuse
          VERSION=3.0.2
diff --git a/disk/fuse3/HISTORY b/disk/fuse3/HISTORY
index 2ea0aa0..d015183 100644
--- a/disk/fuse3/HISTORY
+++ b/disk/fuse3/HISTORY
@@ -1,3 +1,9 @@
+2017-06-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_BUILD: added
+       * BUILD: deleted
+       * DEPENDS: add meson, ninja
+       * DETAILS: force meson build
+
 2017-05-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.0.2
 
diff --git a/disk/fuse3/PRE_BUILD b/disk/fuse3/PRE_BUILD
new file mode 100755
index 0000000..b097f71
--- /dev/null
+++ b/disk/fuse3/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+# do not install init script
+sed -i '/init_script/,/fi/D' util/install_helper.sh
diff --git a/libs/fmt/DETAILS b/libs/fmt/DETAILS
index 5af4c3e..0fc4bb0 100755
--- a/libs/fmt/DETAILS
+++ b/libs/fmt/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fmt
-         VERSION=3.0.2
-     
SOURCE_HASH=sha512:50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117
+         VERSION=4.0.0
+     
SOURCE_HASH=sha512:8b9f7ce4720c3caef6de4a75b8d4b0fd7db4f1638edca98d5ea95f4a5157aef8faefbac68438236691bd373111ca089b4d3864f7352f3fba1fe44392e9644f8b
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
        WEB_SITE=https://github.com/fmtlib/fmt
diff --git a/libs/fmt/HISTORY b/libs/fmt/HISTORY
index d598e51..f676660 100644
--- a/libs/fmt/HISTORY
+++ b/libs/fmt/HISTORY
@@ -1,3 +1,6 @@
+2017-06-28 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.0.0
+
 2017-06-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.0.2