Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jun 2026 15:56:27 +0000
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c0d9906bb9a7 - main - science/paraview: Remove the OSMESA option
Message-ID:  <6a3020ab.416a9.73d6f2be@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c0d9906bb9a7aff601d02007b03a5daa345bb5df

commit c0d9906bb9a7aff601d02007b03a5daa345bb5df
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-05-15 19:07:51 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-15 15:54:36 +0000

    science/paraview: Remove the OSMESA option
---
 science/paraview/Makefile  | 13 +++----------
 science/paraview/pkg-plist | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 1db9dbf73707..16a312a8eebe 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -92,11 +92,13 @@ CMAKE_ARGS+=	-DPARAVIEW_BUILD_SHARED_LIBS=ON \
 		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION:BOOL=OFF \
 		-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF \
 		-DVTK_FORBID_DOWNLOADS:BOOL=OFF \
+		-DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=OFF \
 		-DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \
+		-DVTK_USE_X:BOOL=ON \
 		-DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \
 		-DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2"
 # TODO: port Viskores - https://viskores.org/
@@ -115,10 +117,9 @@ SHEBANG_FILES=	VTK/Examples/SearchScript.sh	\
 		VTK/Utilities/Maintenance/*.sh	\
 		Clients/CommandLineExecutables/paraview-config.in
 
-OPTIONS_DEFINE=	DOCS EXAMPLES OMPI OSMESA TEST
+OPTIONS_DEFINE=	DOCS EXAMPLES OMPI TEST
 OPTIONS_SUB=	yes
 OMPI_DESC=	OpenMPI (Message Passing Interface) support
-OSMESA_DESC=	Use Mesa for off-screen rendering
 
 # mpi4py and other programs must be compiled against the same MPI provider
 OMPI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>=0:net/py-mpi4py@${PY_FLAVOR}
@@ -127,14 +128,6 @@ OMPI_USES=		mpi:openmpi
 OMPI_CMAKE_ON=		-DPARAVIEW_USE_MPI:BOOL=ON
 OMPI_CMAKE_OFF=		-DPARAVIEW_USE_MPI:BOOL=OFF
 
-OSMESA_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
-OSMESA_USES_OFF=	desktop-file-utils
-OSMESA_CMAKE_BOOL=	VTK_OPENGL_HAS_OSMESA
-OSMESA_CMAKE_ON=	-DVTK_USE_X:BOOL="OFF" \
-			-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-			-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
-OSMESA_CMAKE_OFF=	-DVTK_USE_X:BOOL="ON"
-
 EXAMPLES_CMAKE_BOOL=	PARAVIEW_ENABLE_EXAMPLES
 PORTEXAMPLES=		*
 
diff --git a/science/paraview/pkg-plist b/science/paraview/pkg-plist
index f50820633e3b..e493896df06d 100644
--- a/science/paraview/pkg-plist
+++ b/science/paraview/pkg-plist
@@ -1,6 +1,6 @@
-%%NO_OSMESA%%bin/paraview
+bin/paraview
 bin/paraview-config
-%%NO_OSMESA%%bin/paraview.conf
+bin/paraview.conf
 bin/pvbatch
 bin/pvdataserver
 bin/pvpython
@@ -4599,8 +4599,8 @@ include/paraview-%%VERMAJORMINOR%%/vtkXMLWriter.h
 include/paraview-%%VERMAJORMINOR%%/vtkXMLWriter2.h
 include/paraview-%%VERMAJORMINOR%%/vtkXMLWriterBase.h
 include/paraview-%%VERMAJORMINOR%%/vtkXMLWriterC.h
-%%NO_OSMESA%%include/paraview-%%VERMAJORMINOR%%/vtkXOpenGLRenderWindow.h
-%%NO_OSMESA%%include/paraview-%%VERMAJORMINOR%%/vtkXRenderWindowInteractor.h
+include/paraview-%%VERMAJORMINOR%%/vtkXOpenGLRenderWindow.h
+include/paraview-%%VERMAJORMINOR%%/vtkXRenderWindowInteractor.h
 include/paraview-%%VERMAJORMINOR%%/vtkXYChartRepresentation.h
 include/paraview-%%VERMAJORMINOR%%/vtkXYPlotActor.h
 include/paraview-%%VERMAJORMINOR%%/vtkXYPlotWidget.h
@@ -4792,10 +4792,10 @@ include/paraview-%%VERMAJORMINOR%%/vtkglad/include/EGL/eglplatform.h
 include/paraview-%%VERMAJORMINOR%%/vtkglad/include/KHR/khrplatform.h
 include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/egl.h
 include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/gl.h
-%%NO_OSMESA%%include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/glx.h
+include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/glx.h
 include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/vtk_egl_mangle.h
 include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/vtk_gl_mangle.h
-%%NO_OSMESA%%include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/vtk_glx_mangle.h
+include/paraview-%%VERMAJORMINOR%%/vtkglad/include/glad/vtk_glx_mangle.h
 include/paraview-%%VERMAJORMINOR%%/vtkh5part/src/H5Block.h
 include/paraview-%%VERMAJORMINOR%%/vtkh5part/src/H5BlockErrors.h
 include/paraview-%%VERMAJORMINOR%%/vtkh5part/src/H5BlockPrivate.h
@@ -5337,8 +5337,8 @@ lib/cmake/paraview-%%VERMAJORMINOR%%/ParaView-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/paraview-%%VERMAJORMINOR%%/ParaView-targets.cmake
 lib/cmake/paraview-%%VERMAJORMINOR%%/ParaView-vtk-module-find-packages.cmake
 lib/cmake/paraview-%%VERMAJORMINOR%%/ParaView-vtk-module-properties.cmake
-%%NO_OSMESA%%lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClient-targets-%%CMAKE_BUILD_TYPE%%.cmake
-%%NO_OSMESA%%lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClient-targets.cmake
+lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClient-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClient-targets.cmake
 lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClient.cmake
 lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClients-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/paraview-%%VERMAJORMINOR%%/ParaViewClients-targets.cmake
@@ -7055,10 +7055,10 @@ lib/vtk/hierarchy/ParaView/vtkViewsContext2D-hierarchy.txt
 lib/vtk/hierarchy/ParaView/vtkViewsCore-hierarchy.txt
 lib/vtk/hierarchy/ParaView/vtkWebCore-hierarchy.txt
 lib/vtk/hierarchy/ParaView/vtkWebGLExporter-hierarchy.txt
-%%NO_OSMESA%%share/applications/org.paraview.ParaView.desktop
-%%NO_OSMESA%%share/icons/hicolor/22x22/apps/paraview.png
-%%NO_OSMESA%%share/icons/hicolor/32x32/apps/paraview.png
-%%NO_OSMESA%%share/icons/hicolor/96x96/apps/paraview.png
-%%NO_OSMESA%%share/metainfo/org.paraview.ParaView.appdata.xml
-%%NO_OSMESA%%%%DATADIR%%-%%VERMAJORMINOR%%/xmls/ParaViewFilters.xml
-%%NO_OSMESA%%%%DATADIR%%-%%VERMAJORMINOR%%/xmls/ParaViewSources.xml
+share/applications/org.paraview.ParaView.desktop
+share/icons/hicolor/22x22/apps/paraview.png
+share/icons/hicolor/32x32/apps/paraview.png
+share/icons/hicolor/96x96/apps/paraview.png
+share/metainfo/org.paraview.ParaView.appdata.xml
+%%DATADIR%%-%%VERMAJORMINOR%%/xmls/ParaViewFilters.xml
+%%DATADIR%%-%%VERMAJORMINOR%%/xmls/ParaViewSources.xml


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3020ab.416a9.73d6f2be>