Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1cb189de52c9f6a0f658e15b16b1c026b20d6874)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1cb189de52c9f6a0f658e15b16b1c026b20d6874)
  • Date: Mon, 28 May 2018 14:39:40 +0000

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

libs/jsoncpp/BUILD | 3 ---
libs/jsoncpp/CONFIGURE | 2 +-
libs/jsoncpp/DEPENDS | 5 +++--
libs/jsoncpp/DETAILS | 9 +++++----
libs/jsoncpp/HISTORY | 4 ++++
libs/jsoncpp/INSTALL | 1 -
python-pypi/simplejson/DETAILS | 4 ++--
python-pypi/simplejson/HISTORY | 3 +++
utils/xdg-user-dirs/DETAILS | 8 ++++----
utils/xdg-user-dirs/HISTORY | 3 +++
video/mlt/DETAILS | 4 ++--
video/mlt/HISTORY | 3 +++
12 files changed, 30 insertions(+), 19 deletions(-)

New commits:
commit 1cb189de52c9f6a0f658e15b16b1c026b20d6874
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

jsoncpp: => 1.8.4, convert to meson build, otherwise install step is
broken

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

xdg-user-dirs: => 0.17

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

mlt: => 6.8.0

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

simplejson: => 3.15.0

diff --git a/libs/jsoncpp/BUILD b/libs/jsoncpp/BUILD
deleted file mode 100755
index 5f5413d..0000000
--- a/libs/jsoncpp/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-TEST="${CM_TESTS/BUILD_TESTING/JSONCPP_WITH_TESTS}" &&
-OPTS+=" -DBUILD_SHARED_LIBS=1 -DBUILD_STATIC_LIBS=0 $TEST" &&
-cmake_build
diff --git a/libs/jsoncpp/CONFIGURE b/libs/jsoncpp/CONFIGURE
index b2f02c3..d0bac55 100755
--- a/libs/jsoncpp/CONFIGURE
+++ b/libs/jsoncpp/CONFIGURE
@@ -1 +1 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
+source $GRIMOIRE/MESON_CONFIGURE
diff --git a/libs/jsoncpp/DEPENDS b/libs/jsoncpp/DEPENDS
index 8bc4e23..9bf0965 100755
--- a/libs/jsoncpp/DEPENDS
+++ b/libs/jsoncpp/DEPENDS
@@ -1,3 +1,4 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
-
+depends meson &&
+depends ninja-build-system &&
+depends python3 &&
depends -sub CXX gcc
diff --git a/libs/jsoncpp/DETAILS b/libs/jsoncpp/DETAILS
index e2eb922..3f91464 100755
--- a/libs/jsoncpp/DETAILS
+++ b/libs/jsoncpp/DETAILS
@@ -1,10 +1,11 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=jsoncpp
if [[ $JSONCPP_BRANCH == "stable" ]]; then
- VERSION=1.8.3
-
SOURCE_HASH=sha512:a5170ccbc440c1bd2b365e34f7367a55731d4fa86b2d323d11431cead771127364bad9d8e2e59dcbe41bc111d11a5da94988dec5e40b9119f793f43e487d7429
+ VERSION=1.8.4
+
SOURCE_HASH=sha512:f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
else
- VERSION=0.10.6
-
SOURCE_HASH=sha512:9fcf584d14c31fc135c9789b36c02c5985daecc7396eb21912d5ea3e757d1fd0d516d7a060e14b4955c73f6b4aa256529281da908726919236fa65310de9f1aa
+ VERSION=1.8.4
+
SOURCE_HASH=sha512:f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
fi
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/open-source-parsers/$SPELL/archive/$VERSION.tar.gz
diff --git a/libs/jsoncpp/HISTORY b/libs/jsoncpp/HISTORY
index b050f03..dee67d1 100644
--- a/libs/jsoncpp/HISTORY
+++ b/libs/jsoncpp/HISTORY
@@ -1,3 +1,7 @@
+2018-05-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.4
+ * *: convert to meson build, otherwise cmake is broken
+
2017-12-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.3

diff --git a/libs/jsoncpp/INSTALL b/libs/jsoncpp/INSTALL
deleted file mode 100755
index 157bcdc..0000000
--- a/libs/jsoncpp/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-cmake_install
diff --git a/python-pypi/simplejson/DETAILS b/python-pypi/simplejson/DETAILS
index c71ddab..3fd4a8b 100755
--- a/python-pypi/simplejson/DETAILS
+++ b/python-pypi/simplejson/DETAILS
@@ -1,6 +1,6 @@
SPELL=simplejson
- VERSION=3.13.2
-
SOURCE_HASH=sha512:b1d6c68e1a6c967dfb695d0cd3d8dca19d458b650ddc0c8273328378eab7f52b801ee29431a6b3bde16608e886259267f41cbefabb7fbe7adb1e243479f91132
+ VERSION=3.15.0
+
SOURCE_HASH=sha512:74ce937478ffc629e468e27cb8476880c70d7c35c33c7c6f703c3733d15b11ff6614d4335e1df7271573e3f17db33779a5bf05809202eb942a1e7f116e1bfb57
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://github.com/simplejson/simplejson
diff --git a/python-pypi/simplejson/HISTORY b/python-pypi/simplejson/HISTORY
index c6b4b72..71ff4b94 100644
--- a/python-pypi/simplejson/HISTORY
+++ b/python-pypi/simplejson/HISTORY
@@ -1,3 +1,6 @@
+2018-05-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.15.0
+
2018-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.13.2

diff --git a/utils/xdg-user-dirs/DETAILS b/utils/xdg-user-dirs/DETAILS
index dddeb4c..a6f2062 100755
--- a/utils/xdg-user-dirs/DETAILS
+++ b/utils/xdg-user-dirs/DETAILS
@@ -1,11 +1,11 @@
SPELL=xdg-user-dirs
- VERSION=0.15
-
SOURCE_HASH=sha512:2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9
+ VERSION=0.17
+
SOURCE_HASH=sha512:a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://user-dirs.freedesktop.org/releases/${SOURCE}
+ SOURCE_URL[0]=https://user-dirs.freedesktop.org/releases/${SOURCE}
LICENSE[0]=LGPL
- WEB_SITE=http://www.freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs
+
WEB_SITE=https://www.freedesktop.org/wiki/Software_2fxdg_2duser_2ddirs
ENTERED=20070416
KEYWORDS="theme gnome2 libs"
SHORT="Tool to help manage well known user directories"
diff --git a/utils/xdg-user-dirs/HISTORY b/utils/xdg-user-dirs/HISTORY
index 32d5a10..be04ebc 100644
--- a/utils/xdg-user-dirs/HISTORY
+++ b/utils/xdg-user-dirs/HISTORY
@@ -1,3 +1,6 @@
+2018-05-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.17
+
20`4-09-21 TreeveJelbrt <treeve AT sourcemage.org>
* DETAILS: version 0.15

diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index 01e753c..dc1dd4b 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -8,8 +8,8 @@ if [[ $MLT_BRANCH == scm ]];then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=on
else
- VERSION=6.6.0
-
SOURCE_HASH=sha512:06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
+ VERSION=6.8.0
+
SOURCE_HASH=sha512:85f115639380f42383b2b5e70b368f9d095d586c3d9c72275da0a2df18d948fd8babedd95afe486a17e5fd33278b52d1a1039f0d58cb993b49ced348494b5e8a
SOURCE=$SPELL-v$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/mltframework/mlt/archive/v$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 409f722..bb71d67 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2018-05-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.8.0
+
2018-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.6.0
* xlocale.patch PRE_BUILD: deleted



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1cb189de52c9f6a0f658e15b16b1c026b20d6874), Treeve Jelbert, 05/28/2018

Archive powered by MHonArc 2.6.24.

Top of Page