Skip to Content.
Sympa Menu

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

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 (5525c5f30164099460e406037a2e889444fd1b0c)
  • Date: Tue, 1 Dec 2015 16:51:44 +0000

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

devel/ocaml/DETAILS | 6 +++---
devel/ocaml/HISTORY | 3 +++
science-libs/avogadrolibs/BUILD | 2 +-
science-libs/avogadrolibs/DEPENDS | 3 ++-
science-libs/avogadrolibs/DETAILS | 4 ++--
science-libs/avogadrolibs/HISTORY | 5 +++++
science-libs/vtk/BUILD | 11 ++++++++---
science-libs/vtk/CONFIGURE | 1 +
science-libs/vtk/DEPENDS | 30 ++++++++++++++++++------------
science-libs/vtk/DETAILS | 4 ++--
science-libs/vtk/HISTORY | 10 ++++++++++
11 files changed, 55 insertions(+), 24 deletions(-)

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

ocaml: => 4.02.3

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

avogadrolibs: => 0.8.0

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

vtk - qt5 support

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

vtk: => 6.3.0

diff --git a/devel/ocaml/DETAILS b/devel/ocaml/DETAILS
index 48d736e..bc2fb52 100755
--- a/devel/ocaml/DETAILS
+++ b/devel/ocaml/DETAILS
@@ -1,10 +1,10 @@
SPELL=ocaml
- VERSION=4.02.1
-
SOURCE_HASH=sha512:79d257210c0ddfb0367250a688ffb58f143fcc8c159f7d6e149d42b074e811eaf69449b66ad39da399e1bdcb2bab5924d195fc7c5ebc29d44cb637c093b9931d
+ VERSION=4.02.3
+
SOURCE_HASH=sha512:a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%pl*}

SOURCE_URL[0]=http://caml.inria.fr/pub/distrib/$SPELL-${VERSION:0:4}/$SOURCE
- WEB_SITE=http://caml.inria.fr/
+ WEB_SITE=http://caml.inria.fr
ENTERED=20040325
LICENSE[0]=GPL
# MAKE_NJOBS=1
diff --git a/devel/ocaml/HISTORY b/devel/ocaml/HISTORY
index 42aef3c..c5ad5b1 100644
--- a/devel/ocaml/HISTORY
+++ b/devel/ocaml/HISTORY
@@ -1,3 +1,6 @@
+2015-12-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.02.3
+
2015-11-13 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Removed Labltk from the distribution, now available as a
third-party library
diff --git a/science-libs/avogadrolibs/BUILD b/science-libs/avogadrolibs/BUILD
index 2113434..182a954 100755
--- a/science-libs/avogadrolibs/BUILD
+++ b/science-libs/avogadrolibs/BUILD
@@ -1 +1 @@
-qt4_cmake_build
+qt5_cmake_build
diff --git a/science-libs/avogadrolibs/DEPENDS
b/science-libs/avogadrolibs/DEPENDS
index af4b4d8..594d5cd 100755
--- a/science-libs/avogadrolibs/DEPENDS
+++ b/science-libs/avogadrolibs/DEPENDS
@@ -6,5 +6,6 @@ depends glew &&
depends libx11 &&
depends OPENGL &&
depends python &&
-depends qt4 &&
+depends qtbase &&
+depends vtk &&
depends molequeue
diff --git a/science-libs/avogadrolibs/DETAILS
b/science-libs/avogadrolibs/DETAILS
index 13ecd81..26981a8 100755
--- a/science-libs/avogadrolibs/DETAILS
+++ b/science-libs/avogadrolibs/DETAILS
@@ -1,6 +1,6 @@
SPELL=avogadrolibs
- VERSION=0.7.2
-
SOURCE_HASH=sha512:32e94c124d650f0aaae9df6216a2c9082ab184915cfc7acab5abd8ab688d7934b6941411fd93fb0ea962d4bb7d9ea85df64872c47154841fcfce60627cd120e2
+ VERSION=0.8.0
+
SOURCE_HASH=sha512:edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openchemistry.org
diff --git a/science-libs/avogadrolibs/HISTORY
b/science-libs/avogadrolibs/HISTORY
index f6d761c..e0a8732 100644
--- a/science-libs/avogadrolibs/HISTORY
+++ b/science-libs/avogadrolibs/HISTORY
@@ -1,3 +1,8 @@
+2015-09-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.0
+ * DEPENDS: qt4=> qtbase, add vtk
+ * BUILD: now uses qt5
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD
index 67e73c2..8374160 100755
--- a/science-libs/vtk/BUILD
+++ b/science-libs/vtk/BUILD
@@ -1,7 +1,8 @@
CFLAGS="${CFLAGS//-ffast-math}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math}" &&
-
-OPTS+=" -DBUILD_SHARED_LIBS=ON -DWTK_USE_HYBRID=ON" &&
+OPTS+=" -DVTK_USE_SYSTEM_LIBRARIES=1" &&
+OPTS+=" -DVTK_FORBID_DOWNLOADS=1" &&
+#OPTS+=" -DBUILD_SHARED_LIBS=ON -DVTK_USE_HYBRID=ON" &&

# Building examples fails on VTK 6.1.0
#OPTS+=' -DBUILD_EXAMPLES=ON'
@@ -17,4 +18,8 @@ OPTS+=" -DBUILD_SHARED_LIBS=ON -DWTK_USE_HYBRID=ON" &&
# OPTS+=" -DJAVA_AWT_LIBRARY=$JAVA_HOME/jre/lib/i386/libawt.so"
# fi

-cmake_build
+if is_depends_enabled $SPELL qtbase;then
+ qt5_cmake_build
+else
+ cmake_build
+fi
diff --git a/science-libs/vtk/CONFIGURE b/science-libs/vtk/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/science-libs/vtk/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS
index b2e086a..1afdc15 100755
--- a/science-libs/vtk/DEPENDS
+++ b/science-libs/vtk/DEPENDS
@@ -5,20 +5,26 @@ optdep() {
}

optsyslib() {
- optdep "$1" WITH_SYSTEM "$2" "Use system's $1 library"
+ local SS
+ if [[ -z $2 ]];then
+ SS=${1^^}
+ else
+ SS=$2
+ fi
+ optdep "$1" VTK_USE_SYSTEM "$SS" "Use system's $1 library"
}

optwrap() {
optdep "$1" VTK_WRAP "$2" "Wrap VTK classes into the $1 language"
}

-depends cmake &&
-depends xorg-libs &&
-depends tk &&
-
-#optwrap JAVA &&
-optwrap python &&
-optwrap tcl &&
+depends -sub CXX gcc &&
+depends cmake &&
+depends OPENGL &&
+depends libx11 &&
+#optwrap JAVA &&
+optwrap python &&
+optwrap tcl &&

optsyslib zlib &&
optsyslib tiff &&
@@ -31,11 +37,11 @@ optsyslib gl2ps &&
optsyslib hdf5 &&
optsyslib netcdf &&
optsyslib libtheora OGGTHEORA &&
+optsyslib jsoncpp &&
+optsyslib libproj4 &&
+optsyslib xdmf2 XDMF &&

-#optsyslib jsoncpp &&
-#optsyslib libproj4 &&
-#optsyslib xdmf2 &&
-
+optional_depends qtbase ' -DVTK_Group_Qt=1 -DVTK_QT_VERSION=5' '' 'Qt
support' &&
optional_depends doxygen \
-DBUILD_DOCUMENTATION=O{N,FF} \
"build documentation"
diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS
index e52186c..1d92431 100755
--- a/science-libs/vtk/DETAILS
+++ b/science-libs/vtk/DETAILS
@@ -1,11 +1,11 @@
SPELL=vtk
- VERSION=6.1.0
+ VERSION=6.3.0
+
SOURCE_HASH=sha512:a05598ed2a70fae9f07a8d9172cb963194cf75d0fcd995c9ebb614a488d4272988212494b1e9aa87272c0ed732161bba8ff97a0cf6874391c1c5fcf7dc22c309
SOURCE=VTK-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK-$VERSION
SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION%.*}/$SOURCE
WEB_SITE=http://www.vtk.org/
LICENSE[0]=modified-bsd
-
SOURCE_HASH=sha512:3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
ENTERED=20020606
KEYWORDS="science libs"
SHORT="library for visualization, image processing, 3D graphics"
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index 9b0a867..a4c7842 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -1,3 +1,13 @@
+2015-12-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD, DEPENDS: qt5 support
+
+2015-09-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.3.0
+ * DEPENDS: remove xorg-libs, add OPENGL, CXX, libx11
+ fix optsyslib
+ * CONFIGURE: added
+ * BUILD: VTK_USE_SYSTEM_LIBRARIES
+
2014-09-25 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE, SOURCE_DIRECTORY, WEB_SITE and LICENSE
Disabled building examples



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5525c5f30164099460e406037a2e889444fd1b0c), Treeve Jelbert, 12/01/2015

Archive powered by MHonArc 2.6.24.

Top of Page