Attachment #234959 for bug #264917

View | Details | Raw Unified | Return to bug 264917 | Differences between
Collapse All | Expand All




LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg \
		libexpat.so:textproc/expat2

USES=		alias cmake compiler:c++11-lang pkgconfig python:build tar:bzip2 ssl
USE_LDCONFIG=	yes

OPTIONS_DEFINE=		VTK
OPTIONS_SUB=		yes

VTK_DESC=		Build VTK integration classes
VTK_CXXFLAGS=		-I${LOCALBASE}/include/vtk-${VTK_VERSION}
VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VERSION}.so:math/vtk${VTK_VERSION:R}
VTK_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK_VERSION}
VTK_USES=		gl
VTK_USE=		GL=glu
#VTK_BROKEN=		Fails to compile with VTK-9.1, see https://sourceforge.net/p/gdcm/bugs/537/

# Change this when updating the port
GDCM_MAJOR=	3

GDCM_PATCH=	14

# Change this whenever VTK is updated
VTK_VERSION=	9.1

USE_LDCONFIG=	yes
CFLAGS+=	-I${LOCALBASE}/include
CMAKE_ARGS=	-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
		-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \

		-DGDCM_BUILD_EXAMPLES:BOOL=OFF \
		-DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL} \
		-DGDCM_DOCUMENTATION:BOOL=OFF \
		-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF \
		-DPython3_EXECUTABLE=${PYTHON_CMD} \
		-DGDCM_DEFAULT_PYTHON_VERSION=${PYTHON_VER}

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MVTK}
DESKTOP_ENTRIES="Gdcmviewer" "Simple DICOM Viewer" "" "gdcmviewer" "" ""
PLIST_SUB+=	VTK=""
.else




- workaround for https://sourceforge.net/p/gdcm/bugs/536/

--- Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx.orig	2022-06-26 20:39:45 UTC
+++ Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx
@@ -37,6 +37,8 @@
 #include "vtkScalarsToColors.h"
 #include "vtkPointData.h"
 
+#include <math.h>
+
 //vtkCxxRevisionMacro(vtkImageMapToWindowLevelColors2, "$Revision: 1.3 $")
 vtkStandardNewMacro(vtkImageMapToWindowLevelColors2)
 




- Choose exact Python version, see https://sourceforge.net/p/gdcm/bugs/538/

--- Wrapping/Python/CMakeLists.txt.orig	2022-06-26 20:16:42 UTC
+++ Wrapping/Python/CMakeLists.txt
@@ -48,8 +48,8 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-find_package(PythonInterp ${GDCM_DEFAULT_PYTHON_VERSION} REQUIRED)
-find_package(PythonLibs ${GDCM_DEFAULT_PYTHON_VERSION} REQUIRED)
+find_package(PythonInterp ${GDCM_DEFAULT_PYTHON_VERSION} EXACT REQUIRED)
+find_package(PythonLibs ${GDCM_DEFAULT_PYTHON_VERSION} EXACT REQUIRED)
 # TODO Need to check consistency python interp and python libs...
 mark_as_advanced(PYTHON_LIBRARY PYTHON_INCLUDE_PATH)
 # Lamest excuse ever:

Return to bug 264917

Lines 13-29 LICENSE= BSD3CLAUSE Link Here

(-)b/devel/gdcm/Makefile (-12 / +16 lines)
13	LIB_DEPENDS= libopenjp2.so:graphics/openjpeg \	13	LIB_DEPENDS= libopenjp2.so:graphics/openjpeg \
14	libexpat.so:textproc/expat2	14	libexpat.so:textproc/expat2
15		15
16	USES= alias cmake compiler:c++11-lang pkgconfig tar:bzip2 ssl	16	USES= alias cmake compiler:c++11-lang pkgconfig python:build tar:bzip2 ssl
		17	USE_LDCONFIG= yes
17		18
18	OPTIONS_DEFINE= VTK6	19	OPTIONS_DEFINE= VTK
19	OPTIONS_SUB= yes	20	OPTIONS_SUB= yes
20		21
21	VTK6_DESC= Build VTK 6 integration classes	22	VTK_DESC= Build VTK integration classes
22	VTK6_LIB_DEPENDS= libvtkCommonCore-${VTK6_VERSION}.so:math/vtk6	23	VTK_CXXFLAGS= -I${LOCALBASE}/include/vtk-${VTK_VERSION}
23	VTK6_CMAKE_ON= -DGDCM_USE_VTK:BOOL=ON \	24	VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VERSION}.so:math/vtk${VTK_VERSION:R}
24	-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION}	25	VTK_CMAKE_ON= -DGDCM_USE_VTK:BOOL=ON \
25	VTK6_USES= gl	26	-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK_VERSION}
26	VTK6_USE= GL=glu	27	VTK_USES= gl
		28	VTK_USE= GL=glu
		29	#VTK_BROKEN= Fails to compile with VTK-9.1, see https://sourceforge.net/p/gdcm/bugs/537/
27		30
28	# Change this when updating the port	31	# Change this when updating the port
29	GDCM_MAJOR= 3	32	GDCM_MAJOR= 3
Lines 31-39 GDCM_MINOR= 0 Link Here
31	GDCM_PATCH= 14	34	GDCM_PATCH= 14
32		35
33	# Change this whenever VTK is updated	36	# Change this whenever VTK is updated
34	VTK6_VERSION= 6.2	37	VTK_VERSION= 9.1
35		38
36	USE_LDCONFIG= yes
37	CFLAGS+= -I${LOCALBASE}/include	39	CFLAGS+= -I${LOCALBASE}/include
38	CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \	40	CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
39	-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \	41	-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
Lines 44-54 CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \ Link Here
44	-DGDCM_BUILD_EXAMPLES:BOOL=OFF \	46	-DGDCM_BUILD_EXAMPLES:BOOL=OFF \
45	-DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL} \	47	-DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL} \
46	-DGDCM_DOCUMENTATION:BOOL=OFF \	48	-DGDCM_DOCUMENTATION:BOOL=OFF \
47	-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF	49	-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF \
		50	-DPython3_EXECUTABLE=${PYTHON_CMD} \
		51	-DGDCM_DEFAULT_PYTHON_VERSION=${PYTHON_VER}
48		52
49	.include <bsd.port.options.mk>	53	.include <bsd.port.options.mk>
50		54
51	.if ${PORT_OPTIONS:MVTK6}	55	.if ${PORT_OPTIONS:MVTK}
52	DESKTOP_ENTRIES="Gdcmviewer" "Simple DICOM Viewer" "" "gdcmviewer" "" ""	56	DESKTOP_ENTRIES="Gdcmviewer" "Simple DICOM Viewer" "" "gdcmviewer" "" ""
53	PLIST_SUB+= VTK=""	57	PLIST_SUB+= VTK=""
54	.else	58	.else

Added Link Here

(-)b/devel/gdcm/files/patch-Utilities_VTK_vtkImageMapToWindowLevelColors2.cxx (+13 lines)
1	- workaround for https://sourceforge.net/p/gdcm/bugs/536/
2
3	--- Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx.orig 2022-06-26 20:39:45 UTC
4	+++ Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx
5	@@ -37,6 +37,8 @@
6	#include "vtkScalarsToColors.h"
7	#include "vtkPointData.h"
8
9	+#include <math.h>
10	+
11	//vtkCxxRevisionMacro(vtkImageMapToWindowLevelColors2, "$Revision: 1.3 $")
12	vtkStandardNewMacro(vtkImageMapToWindowLevelColors2)
13

Added Link Here

(-)b/devel/gdcm/files/patch-Wrapping_Python_CMakeLists.txt (+15 lines)
1	- Choose exact Python version, see https://sourceforge.net/p/gdcm/bugs/538/
2
3	--- Wrapping/Python/CMakeLists.txt.orig 2022-06-26 20:16:42 UTC
4	+++ Wrapping/Python/CMakeLists.txt
5	@@ -48,8 +48,8 @@ include_directories(
6	${CMAKE_CURRENT_SOURCE_DIR}
7	)
8
9	-find_package(PythonInterp ${GDCM_DEFAULT_PYTHON_VERSION} REQUIRED)
10	-find_package(PythonLibs ${GDCM_DEFAULT_PYTHON_VERSION} REQUIRED)
11	+find_package(PythonInterp ${GDCM_DEFAULT_PYTHON_VERSION} EXACT REQUIRED)
12	+find_package(PythonLibs ${GDCM_DEFAULT_PYTHON_VERSION} EXACT REQUIRED)
13	# TODO Need to check consistency python interp and python libs...
14	mark_as_advanced(PYTHON_LIBRARY PYTHON_INCLUDE_PATH)
15	# Lamest excuse ever: