Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Jul 2014 14:21:27 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360015 - head/math/vtk6
Message-ID:  <201407011421.s61ELR7o004242@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue Jul  1 14:21:27 2014
New Revision: 360015
URL: http://svnweb.freebsd.org/changeset/ports/360015
QAT: https://qat.redports.org/buildarchive/r360015/

Log:
  - Add OPTIONal off-screen rendering support with graphics/libosmesa

Modified:
  head/math/vtk6/Makefile
  head/math/vtk6/pkg-plist

Modified: head/math/vtk6/Makefile
==============================================================================
--- head/math/vtk6/Makefile	Tue Jul  1 14:14:03 2014	(r360014)
+++ head/math/vtk6/Makefile	Tue Jul  1 14:21:27 2014	(r360015)
@@ -46,12 +46,13 @@ VTK_WRAPS=	JAVA TCLTK # PYTHON
 OPTIONS_GROUP=	Groups Wrapping
 OPTIONS_GROUP_Groups=${VTK_GROUPS}
 OPTIONS_GROUP_Wrapping=${VTK_WRAPS}
-OPTIONS_DEFINE=	DESIGNER DOCS
+OPTIONS_DEFINE=	DESIGNER DOCS OSMESA
 OPTIONS_RADIO=	Qt
 OPTIONS_RADIO_Qt=	QT4 QT5
 Qt_DESC=	Qt GUI support
 QT4_DESC=	Qt 4 toolkit support
 QT5_DESC=	Qt 5 toolkit support
+OSMESA_DESC=	Use Mesa for off-screen rendering
 #OPTIONS_DEFAULT=MPI Qt JAVA PYTHON TCLTK DESIGNER
 
 .for g in ${VTK_GROUPS}
@@ -87,8 +88,18 @@ CMAKE_ARGS+=	-DVTK_Group_${g}:BOOL=OFF
 .  endif
 .endfor
 
-.if ${PORT_OPTIONS:MDOCS}
-CMAKE_ARGS+=	-DBUILD_DOCUMENTATION:BOOL=ON
+.if ${PORT_OPTIONS:MOSMESA}
+LIB_DEPENDS+=	libOSMesa.so:${PORTSDIR}/graphics/libosmesa
+CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
+		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
+		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
+		-DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so \
+		-DVTK_USE_X:BOOL=OFF
+PLIST_SUB+=	X11="@comment " \
+		OSMESA=""
+.else
+PLIST_SUB+=	X11="" \
+		OSMESA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}

Modified: head/math/vtk6/pkg-plist
==============================================================================
--- head/math/vtk6/pkg-plist	Tue Jul  1 14:14:03 2014	(r360014)
+++ head/math/vtk6/pkg-plist	Tue Jul  1 14:21:27 2014	(r360015)
@@ -2157,8 +2157,9 @@ include/vtk-%%VER2%%/vtkXMLUnstructuredG
 include/vtk-%%VER2%%/vtkXMLUtilities.h
 include/vtk-%%VER2%%/vtkXMLWriter.h
 include/vtk-%%VER2%%/vtkXMLWriterC.h
-include/vtk-%%VER2%%/vtkXOpenGLRenderWindow.h
-include/vtk-%%VER2%%/vtkXRenderWindowInteractor.h
+%%X11%%include/vtk-%%VER2%%/vtkXOpenGLRenderWindow.h
+%%X11%%include/vtk-%%VER2%%/vtkXRenderWindowInteractor.h
+%%OSMESA%%include/vtk-%%VER2%%/vtkOSOpenGLRenderWindow.h
 include/vtk-%%VER2%%/vtkXYPlotActor.h
 include/vtk-%%VER2%%/vtkXYPlotWidget.h
 include/vtk-%%VER2%%/vtkXYZMolReader.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407011421.s61ELR7o004242>