Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 libs/jsoncpp/DEPENDS |    3 +++
 libs/jsoncpp/DETAILS |    9 +++++++--
 libs/jsoncpp/HISTORY |    5 +++++
 libs/jsoncpp/PREPARE |    9 +++++++++
 utils/sysdig/DEPENDS |    5 +++--
 utils/sysdig/HISTORY |    3 +++
 6 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit f1e512b381ed2fd23cdc0f981689c6cb40dec8cd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    sysdig: switched to system jsoncpp

commit 890a98c82cbd7fd03f456a624453d62ca7e7c630
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    jsoncpp: => 1.7.6 (stable), 0.10.6 (legacy)

diff --git a/libs/jsoncpp/DEPENDS b/libs/jsoncpp/DEPENDS
new file mode 100755
index 0000000..9a0777a
--- /dev/null
+++ b/libs/jsoncpp/DEPENDS
@@ -0,0 +1,3 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
+
+depends -sub CXX gcc
\ No newline at end of file
diff --git a/libs/jsoncpp/DETAILS b/libs/jsoncpp/DETAILS
index fc7f724..f6c68ce 100755
--- a/libs/jsoncpp/DETAILS
+++ b/libs/jsoncpp/DETAILS
@@ -1,6 +1,11 @@
            SPELL=jsoncpp
-         VERSION=1.7.2
-     
SOURCE_HASH=sha512:32702147229ea7a3679654325572c38f4188f258ab6ac21f9e04059d53ef2a7cd0542ec4ec3b0e7b9089acd2b7bce389f16b9ff24b2e63e0ba2a5bcd46bab766
+if [[ $JSONCPP_BRANCH == "stable" ]]; then
+         VERSION=1.7.6
+     
SOURCE_HASH=sha512:514428ec6eeb3082d1399024e3eca0e5f022082654e5015cdaa74234a1625e973dc43c88b572b4ca3dc9a52529e768d60f1252e3bfee3b917b990a2672595065
+else
+         VERSION=0.10.6
+     
SOURCE_HASH=sha512:9fcf584d14c31fc135c9789b36c02c5985daecc7396eb21912d5ea3e757d1fd0d516d7a060e14b4955c73f6b4aa256529281da908726919236fa65310de9f1aa
+fi
           SOURCE="$SPELL-$VERSION.tar.gz"
    
SOURCE_URL[0]=https://github.com/open-source-parsers/$SPELL/archive/$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/jsoncpp/HISTORY b/libs/jsoncpp/HISTORY
index 98339cf..765a7a4 100644
--- a/libs/jsoncpp/HISTORY
+++ b/libs/jsoncpp/HISTORY
@@ -1,3 +1,8 @@
+2016-09-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.7.6
+       * PREPARE: added, to support legacy branch
+       * DEPENDS: added, for missing dependencies
+
 2016-05-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.7.2
 
diff --git a/libs/jsoncpp/PREPARE b/libs/jsoncpp/PREPARE
new file mode 100755
index 0000000..deebf0f
--- /dev/null
+++ b/libs/jsoncpp/PREPARE
@@ -0,0 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+persistent_add JSONCPP_BRANCH &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+  JSONCPP_BRANCH="legacy"
+else
+  JSONCPP_BRANCH="stable"
+fi
diff --git a/utils/sysdig/DEPENDS b/utils/sysdig/DEPENDS
index 216dab9..c6576a3 100755
--- a/utils/sysdig/DEPENDS
+++ b/utils/sysdig/DEPENDS
@@ -6,5 +6,6 @@ depends ncurses '-DUSE_BUNDLED_NCURSES=NO' &&
 depends luajit '-DUSE_BUNDLED_LUAJIT=NO' &&
 depends zlib '-DUSE_BUNDLED_ZLIB=NO' &&
 depends SSL '-DUSE_BUNDLED_OPENSSL=NO' &&
-depends curl '-DUSE_BUNDLED_CURL=NO'
-depends jq '-DUSE_BUNDLED_JQ=NO'
+depends curl '-DUSE_BUNDLED_CURL=NO' &&
+depends jq '-DUSE_BUNDLED_JQ=NO' &&
+depends jsoncpp '-DUSE_BUNDLED_JSONCPP=NO'
diff --git a/utils/sysdig/HISTORY b/utils/sysdig/HISTORY
index 8c832b6..81ba843 100644
--- a/utils/sysdig/HISTORY
+++ b/utils/sysdig/HISTORY
@@ -1,3 +1,6 @@
+2016-09-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: switched to system jsoncpp
+
 2016-07-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.11.0
        * DEPENDS: added new jq dependency