From owner-svn-ports-all@FreeBSD.ORG Tue Jul 1 14:21:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DDE5B02; Tue, 1 Jul 2014 14:21:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 023A02669; Tue, 1 Jul 2014 14:21:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61ELR84004245; Tue, 1 Jul 2014 14:21:27 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61ELR7o004242; Tue, 1 Jul 2014 14:21:27 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201407011421.s61ELR7o004242@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 1 Jul 2014 14:21:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360015 - head/math/vtk6 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 14:21:28 -0000 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