Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a43118164333d1d2c756982e7ce41143cde03506)

Chronological Thread  
    < 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 (a43118164333d1d2c756982e7ce41143cde03506)
  • Date: Sun, 7 Feb 2016 11:53:44 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics/gl2ps/CONFIGURE | 1 +
graphics/gl2ps/DEPENDS | 3 ++-
graphics/gl2ps/DETAILS | 4 ++--
graphics/gl2ps/HISTORY | 5 +++++
graphics/gl2ps/INSTALL | 1 +
libs/flatbuffers/BUILD | 1 +
libs/flatbuffers/DETAILS | 6 +++---
libs/flatbuffers/HISTORY | 4 ++++
libs/jsoncpp/BUILD | 1 +
libs/jsoncpp/CONFIGURE | 1 +
libs/jsoncpp/HISTORY | 4 ++++
libs/jsoncpp/INSTALL | 1 +
science-libs/vtk/BUILD | 1 +
science-libs/vtk/CONFIGURE | 1 +
science-libs/vtk/DEPENDS | 3 ++-
science-libs/vtk/DETAILS | 4 ++--
science-libs/vtk/HISTORY | 8 ++++++++
science-libs/vtk/UP_TRIGGERS | 9 +++++++++
18 files changed, 49 insertions(+), 9 deletions(-)

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

vtk - choose render backend

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

gl2ps: => 1.3.9

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

vtk: => 7.0.0

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

jsoncpp - install shared lib

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

flatbuffers: => 1.3.0

diff --git a/graphics/gl2ps/CONFIGURE b/graphics/gl2ps/CONFIGURE
new file mode 100755
index 0000000..33b4034
--- /dev/null
+++ b/graphics/gl2ps/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE//CMAKE_CONFIGURE
diff --git a/graphics/gl2ps/DEPENDS b/graphics/gl2ps/DEPENDS
index f113c63..0ae765a 100755
--- a/graphics/gl2ps/DEPENDS
+++ b/graphics/gl2ps/DEPENDS
@@ -1,8 +1,9 @@
+depends cmake &&
depends OPENGL &&
depends GLUT &&
optional_depends zlib "-DENABLE_ZLIB=on" "-DENABLE_ZLIB=off" "for zlib
compression support" &&
optional_depends libpng "-DENABLE_PNG=on" "-DENABLE_PNG=off" "support for
png images" &&
-depends texlive &&
+optional_depends texlive '' '' 'Latex support' &&
depends libxext &&
depends libx11 &&
depends libice
diff --git a/graphics/gl2ps/DETAILS b/graphics/gl2ps/DETAILS
index 74d47bd..087d84e 100755
--- a/graphics/gl2ps/DETAILS
+++ b/graphics/gl2ps/DETAILS
@@ -1,8 +1,8 @@
SPELL=gl2ps
- VERSION=1.3.8
+ VERSION=1.3.9
+
SOURCE_HASH=sha512:e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://geuz.org/${SPELL}/src/${SOURCE}
-
SOURCE_HASH=sha512:76e90d675764196d249d87c6041088736a8b41d9b93620c6171a40362a259d50e34d5efc06e4ea17e6c147bc26b6a3a7356d95ea5e204193ef631fb48e0c0a4e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-source"
WEB_SITE="http://www.geuz.org/gl2ps/";
LICENSE[0]=GPL
diff --git a/graphics/gl2ps/HISTORY b/graphics/gl2ps/HISTORY
index 2cc4f50..eac7041 100644
--- a/graphics/gl2ps/HISTORY
+++ b/graphics/gl2ps/HISTORY
@@ -1,3 +1,8 @@
+2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.9
+ * DEPENDS: add cmake; texlive is optional
+ * CONFIGURE INSTALL: added
+
2013-01-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS,
0001-add-libm-to-EXTERNAL_LIBRARIES.patch: spell created
diff --git a/graphics/gl2ps/INSTALL b/graphics/gl2ps/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/graphics/gl2ps/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/libs/flatbuffers/BUILD b/libs/flatbuffers/BUILD
index e013b8d..4220a04 100755
--- a/libs/flatbuffers/BUILD
+++ b/libs/flatbuffers/BUILD
@@ -1 +1,2 @@
+CMAKE_GEN="Make"
cmake_build
diff --git a/libs/flatbuffers/DETAILS b/libs/flatbuffers/DETAILS
index 852cd1c..1a69792 100755
--- a/libs/flatbuffers/DETAILS
+++ b/libs/flatbuffers/DETAILS
@@ -1,8 +1,8 @@
SPELL=flatbuffers
- VERSION=1.2.0
-
SOURCE_HASH=sha512:10eb7cc35dcebe4e09e3b0c2ea691271d733c17141ec163d9423a06fd89f09e7edda39ceaee04f847e496c2514edba33d397248286f86c87923fce6cdf0c2a12
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:249341ce96d76dcd46e1907e8579d436c953e7782555b9cd9d12712db167e63669d97f084dcce15940e06378a6e91f6d4cbe5bb8bb1383a73e2f9190a700daaa
SOURCE=$SPELL-v$VERSION.tar.gz
-SOURCE_URL=https://github.com/google/flatbuffers/archive/$VERSION.tar.gz
+SOURCE_URL=https://github.com/google/flatbuffers/archive/v$VERSION.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://google.github.io/flatbuffers/
ENTERED=20141202
diff --git a/libs/flatbuffers/HISTORY b/libs/flatbuffers/HISTORY
index 1bf60b4..99e448b 100644
--- a/libs/flatbuffers/HISTORY
+++ b/libs/flatbuffers/HISTORY
@@ -1,3 +1,7 @@
+2016-02-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version v1.3.0
+ * BUILD: do not use ninja
+
2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: added, use cmake_install

diff --git a/libs/jsoncpp/BUILD b/libs/jsoncpp/BUILD
index e013b8d..6b8fd32 100755
--- a/libs/jsoncpp/BUILD
+++ b/libs/jsoncpp/BUILD
@@ -1 +1,2 @@
+OPTS+=" -DBUILD_SHARED_LIBS=1 -DBUILD_STATIC_LIBS=0" &&
cmake_build
diff --git a/libs/jsoncpp/CONFIGURE b/libs/jsoncpp/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/jsoncpp/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/jsoncpp/HISTORY b/libs/jsoncpp/HISTORY
index 82f456c..66ae5e4 100644
--- a/libs/jsoncpp/HISTORY
+++ b/libs/jsoncpp/HISTORY
@@ -1,2 +1,6 @@
+2016-02-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE INSTALL: added
+ * BUILD" build shared lib
+
2015-12-09 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DETAILS: spell created
diff --git a/libs/jsoncpp/INSTALL b/libs/jsoncpp/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/libs/jsoncpp/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD
index 8374160..1da5dc5 100755
--- a/science-libs/vtk/BUILD
+++ b/science-libs/vtk/BUILD
@@ -2,6 +2,7 @@ CFLAGS="${CFLAGS//-ffast-math}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math}" &&
OPTS+=" -DVTK_USE_SYSTEM_LIBRARIES=1" &&
OPTS+=" -DVTK_FORBID_DOWNLOADS=1" &&
+OPTS+=" -DVTK_RENDERING_BACKEND_DEFAULT=$VTK_GL" &&
#OPTS+=" -DBUILD_SHARED_LIBS=ON -DVTK_USE_HYBRID=ON" &&

# Building examples fails on VTK 6.1.0
diff --git a/science-libs/vtk/CONFIGURE b/science-libs/vtk/CONFIGURE
index b2f02c3..c66e2c1 100755
--- a/science-libs/vtk/CONFIGURE
+++ b/science-libs/vtk/CONFIGURE
@@ -1 +1,2 @@
source $GRIMOIRE/CMAKE_CONFIGURE
+config_query_list VTK_GL 'which render backend' OpenGL2 OpenGL
diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS
index 1afdc15..a1c0675 100755
--- a/science-libs/vtk/DEPENDS
+++ b/science-libs/vtk/DEPENDS
@@ -39,9 +39,10 @@ optsyslib netcdf &&
optsyslib libtheora OGGTHEORA &&
optsyslib jsoncpp &&
optsyslib libproj4 &&
-optsyslib xdmf2 XDMF &&
+#optsyslib xdmf2 XDMF &&

optional_depends qtbase ' -DVTK_Group_Qt=1 -DVTK_QT_VERSION=5' '' 'Qt
support' &&
+optional_depends qtwebkit ' -DVTK_Group_Web=1' ' -DVTK_Group_Web=0'
'Browsing support' &&
optional_depends doxygen \
-DBUILD_DOCUMENTATION=O{N,FF} \
"build documentation"
diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS
index 1d92431..f5bb3ae 100755
--- a/science-libs/vtk/DETAILS
+++ b/science-libs/vtk/DETAILS
@@ -1,6 +1,6 @@
SPELL=vtk
- VERSION=6.3.0
-
SOURCE_HASH=sha512:a05598ed2a70fae9f07a8d9172cb963194cf75d0fcd995c9ebb614a488d4272988212494b1e9aa87272c0ed732161bba8ff97a0cf6874391c1c5fcf7dc22c309
+ VERSION=7.0.0
+
SOURCE_HASH=sha512:4ce51ff6ddf56f1fb45c1b09a09389bc43dffd892f80c833ea861537e02a61079e9cfd3931308f7d72f37d1977806ed2ce010a7b5c2c1a0c5bb1435e09e1f049
SOURCE=VTK-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK-$VERSION
SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION%.*}/$SOURCE
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index 20f523c..c14f3f8 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -1,3 +1,11 @@
+2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD CONFIGURE: choose render backend
+
+2016-02-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.0.0
+ * DEPENDS: add optional qtwebkit
+ * UP_TRIGGERS: added
+
2016-01-01 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: added,for cmake_install

diff --git a/science-libs/vtk/UP_TRIGGERS b/science-libs/vtk/UP_TRIGGERS
new file mode 100755
index 0000000..9d6c1e6
--- /dev/null
+++ b/science-libs/vtk/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
+ message "This is an incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a43118164333d1d2c756982e7ce41143cde03506), Treeve Jelbert, 02/07/2016

Archive powered by MHonArc 2.6.24.

Top of Page