svn commit: r533086 - in head: graphics/pcl-pointclouds graphics/vv math/vtk8 math/vtk8/files science/avogadrolibs science/liggghts
Yuri Victorovich
yuri at FreeBSD.org
Sun Apr 26 22:04:13 UTC 2020
Author: yuri
Date: Sun Apr 26 22:04:10 2020
New Revision: 533086
URL: https://svnweb.freebsd.org/changeset/ports/533086
Log:
math/vtk8: Update 8.1.2 -> 8.2.0
science/liggght is updated 3.8.0 -> 3.8.0-26 because only later revisions support vtk8-8.2.0
3 dependent ports bumped.
Added:
head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c (contents, props changed)
Deleted:
head/math/vtk8/files/patch-IO_EnSight_vtkEnSight6BinaryReader.cxx
head/math/vtk8/files/patch-IO_EnSight_vtkEnSightGoldBinaryReader.cxx
head/math/vtk8/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake
head/math/vtk8/files/patch-ThirdParty_libproj4_vtklibproj4_CMakeLists.txt
head/math/vtk8/files/patch-Wrapping_Tcl_CMakeLists.txt
Modified:
head/graphics/pcl-pointclouds/Makefile
head/graphics/vv/Makefile
head/math/vtk8/Makefile
head/math/vtk8/distinfo
head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt
head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt
head/science/avogadrolibs/Makefile
head/science/liggghts/Makefile
head/science/liggghts/distinfo
Modified: head/graphics/pcl-pointclouds/Makefile
==============================================================================
--- head/graphics/pcl-pointclouds/Makefile Sun Apr 26 21:32:58 2020 (r533085)
+++ head/graphics/pcl-pointclouds/Makefile Sun Apr 26 22:04:10 2020 (r533086)
@@ -54,7 +54,7 @@ QT5_BROKEN= WITH_QT doesn't do anything, should be us
VTK_DESC= Build VTK-Visualizations
VTK_CMAKE_BOOL= WITH_VTK
-VTK_LIB_DEPENDS= libvtkCommonCore-8.1.so:math/vtk8
+VTK_LIB_DEPENDS= libvtkCommonCore-8.2.so:math/vtk8
VTK_BROKEN= VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/issues/17444
.include <bsd.port.pre.mk>
Modified: head/graphics/vv/Makefile
==============================================================================
--- head/graphics/vv/Makefile Sun Apr 26 21:32:58 2020 (r533085)
+++ head/graphics/vv/Makefile Sun Apr 26 22:04:10 2020 (r533086)
@@ -4,7 +4,7 @@ PORTNAME= vv
DISTVERSIONPREFIX= v
DISTVERSION= 1.4.0-377
DISTVERSIONSUFFIX= -g7c3a1ed4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= yuri at FreeBSD.org
@@ -22,7 +22,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libpng.so:graphics/png \
libsz.so:science/szip \
libtiff.so:graphics/tiff \
- libvtkIOSQL-8.1.so:math/vtk8
+ libvtkIOSQL-8.2.so:math/vtk8
USES= cmake compiler:c++11-lang eigen:3 jpeg qt:5 xorg
USE_GITHUB= yes
@@ -30,6 +30,8 @@ GH_ACCOUNT= open-vv
USE_QT= core designer gui network sql widgets xml buildtools_build qmake_build
USE_XORG= ice sm x11 xext xt
USE_CXXSTD= c++11
+
+CMAKE_ARGS= -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
PLIST_FILES= bin/vv
Modified: head/math/vtk8/Makefile
==============================================================================
--- head/math/vtk8/Makefile Sun Apr 26 21:32:58 2020 (r533085)
+++ head/math/vtk8/Makefile Sun Apr 26 22:04:10 2020 (r533086)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vtk
-DISTVERSION= 8.1.2
-PORTREVISION= 6
+DISTVERSION= 8.2.0
CATEGORIES= math graphics
MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/
PKGNAMESUFFIX= 8
@@ -122,7 +121,11 @@ USES+= gl
USE_GL= gl glu
.endif
-post-install: # autoplist: thousands of files, complex dependencies on options
+post-install:
+ ## 8.2 installs cmake files into a wrong location
+ #@cd ${STAGEDIR}${PREFIX} && \
+ # ${MV} lib/vtk-${VTK_SHORT_VER}/cmake lib/
+ # autoplist: thousands of files, complex dependencies on options
@cd ${STAGEDIR}${PREFIX} && \
${FIND} * -type f -or -type l >> ${TMPPLIST}
Modified: head/math/vtk8/distinfo
==============================================================================
--- head/math/vtk8/distinfo Sun Apr 26 21:32:58 2020 (r533085)
+++ head/math/vtk8/distinfo Sun Apr 26 22:04:10 2020 (r533086)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541961840
-SHA256 (VTK-8.1.2.tar.gz) = 0995fb36857dd76ccfb8bb07350c214d9f9099e80b1e66b4a8909311f24ff0db
-SIZE (VTK-8.1.2.tar.gz) = 33479307
+TIMESTAMP = 1587775906
+SHA256 (VTK-8.2.0.tar.gz) = 34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb
+SIZE (VTK-8.2.0.tar.gz) = 35511819
Modified: head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt
==============================================================================
--- head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt Sun Apr 26 21:32:58 2020 (r533085)
+++ head/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt Sun Apr 26 22:04:10 2020 (r533086)
@@ -1,15 +1,12 @@
---- GUISupport/Qt/CMakeLists.txt.orig 2018-05-11 14:34:24 UTC
+--- GUISupport/Qt/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC
+++ GUISupport/Qt/CMakeLists.txt
-@@ -145,7 +145,7 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_
- find_package(Qt5 COMPONENTS ${qt_component} REQUIRED QUIET)
- add_definitions(${Qt5${qt_component}_DEFINITIONS})
- include_directories(${Qt5${qt_component}_INCLUDE_DIRS})
-- qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin)
-+ qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
- set(QT_LIBRARIES Qt5::${qt_component})
- else()
- find_package(Qt4 COMPONENTS QtCore QtGui QtDesignerComponents REQUIRED QUIET)
-@@ -157,16 +157,16 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_
+@@ -128,21 +128,21 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_qvtkwidget)
+ find_package(Qt5 COMPONENTS ${qt_component} REQUIRED QUIET)
+ add_definitions(${Qt5${qt_component}_DEFINITIONS})
+ include_directories(${Qt5${qt_component}_INCLUDE_DIRS})
+- qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin)
++ qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
+ set(QT_LIBRARIES Qt5::${qt_component})
# add QVTK plugin from sources
# stand-alone as it doesn't depend on QVTK library
Added: head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c Sun Apr 26 22:04:10 2020 (r533086)
@@ -0,0 +1,11 @@
+--- ThirdParty/libproj/vtklibproj/src/pj_mutex.c.orig 2020-04-25 01:23:01 UTC
++++ ThirdParty/libproj/vtklibproj/src/pj_mutex.c
+@@ -124,7 +124,7 @@ void pj_acquire_lock()
+ pthread_mutex_lock( &pj_precreated_lock);
+
+ pthread_mutexattr_init(&mutex_attr);
+-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
++#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
+ pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+ #else
+ pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
Modified: head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt
==============================================================================
--- head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt Sun Apr 26 21:32:58 2020 (r533085)
+++ head/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt Sun Apr 26 22:04:10 2020 (r533086)
@@ -1,6 +1,6 @@
---- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2017-08-30 20:55:05 UTC
+--- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC
+++ ThirdParty/verdict/vtkverdict/CMakeLists.txt
-@@ -123,14 +123,14 @@ endif ()
+@@ -128,14 +128,14 @@ endif ()
# Installation stuff
#
IF(NOT verdict_INSTALL_NO_DEVELOPMENT)
Modified: head/science/avogadrolibs/Makefile
==============================================================================
--- head/science/avogadrolibs/Makefile Sun Apr 26 21:32:58 2020 (r533085)
+++ head/science/avogadrolibs/Makefile Sun Apr 26 22:04:10 2020 (r533086)
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
CMAKE_ON= BUILD_SHARED_LIBS
OPTIONS_DEFINE= HDF5 LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB VTK
-OPTIONS_DEFAULT= LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB
+OPTIONS_DEFAULT= LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB VTK
OPTIONS_SUB= yes
HDF5_CMAKE_BOOL= USE_HDF5
@@ -60,7 +60,7 @@ SPGLIB_LIB_DEPENDS= libsymspg.so:science/spglib
VTK_DESC= Enable libraries that use VTK
VTK_CMAKE_BOOL= USE_VTK
-VTK_LIB_DEPENDS= libvtksys-8.1.so.1:math/vtk8
+VTK_LIB_DEPENDS= libvtksys-8.2.so:math/vtk8
VTK_IMPLIES= QT5
VTK_BROKEN= Needs https://github.com/psavery/genXrdPattern, etc
Modified: head/science/liggghts/Makefile
==============================================================================
--- head/science/liggghts/Makefile Sun Apr 26 21:32:58 2020 (r533085)
+++ head/science/liggghts/Makefile Sun Apr 26 22:04:10 2020 (r533086)
@@ -1,8 +1,9 @@
# $FreeBSD$
PORTNAME= liggghts
-DISTVERSION= 3.8.0
-PORTREVISION= 6
+DISTVERSION= 3.8.0-26
+PORTREVISION= 1
+DISTVERSIONSUFFIX= -g6e873439
CATEGORIES= science
MAINTAINER= yuri at FreeBSD.org
@@ -17,7 +18,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libmpi.so:net/openmpi \
libpng.so:graphics/png \
libtiff.so:graphics/tiff \
- libvtkViewsCore-8.1.so:math/vtk8
+ libvtkViewsCore-8.2.so:math/vtk8
USES= compiler:c++17-lang cmake fortran jpeg qt:5 xorg
USE_GITHUB= yes
@@ -29,7 +30,7 @@ USE_LDCONFIG= yes
CMAKE_ARGS= -DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicc" \
-DMPI_CXX_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicxx" \
- -DVTK_DIR:FILEPATH="${LOCALBASE}/lib/cmake/vtk-8.1"
+ -DVTK_DIR:FILEPATH="${LOCALBASE}/lib/cmake/vtk-8.2"
WRKSRC_SUBDIR= src
Modified: head/science/liggghts/distinfo
==============================================================================
--- head/science/liggghts/distinfo Sun Apr 26 21:32:58 2020 (r533085)
+++ head/science/liggghts/distinfo Sun Apr 26 22:04:10 2020 (r533086)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541105259
-SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0_GH0.tar.gz) = 9cb2e6596f584463ac2f80e3ff7b9588b7e3638c44324635b6329df87b90ab03
-SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0_GH0.tar.gz) = 35989481
+TIMESTAMP = 1587928829
+SHA256 (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-26-g6e873439_GH0.tar.gz) = ac2f9100d31c6a9dc92a7b30057e0e36a3505f437e33ac56055c67f864a09262
+SIZE (CFDEMproject-LIGGGHTS-PUBLIC-3.8.0-26-g6e873439_GH0.tar.gz) = 36209540
More information about the svn-ports-all
mailing list