Attachment #216699 for bug #248202




# $FreeBSD$

PORTNAME=	ocp
DISTVERSION=	7.4-RC2
CATEGORIES=	cad
# Direct access to github is needed because the release added an extra archive which
# we need to build from, rather than the initial release.
MASTER_SITES=	https://github.com/CadQuery/OCP/releases/download/${DISTVERSION}/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTNAME=	OCP_src_Linux

MAINTAINER=	ports@nicandneal.net
COMMENT=	Python wrapper for OCCT generated using pywrap

LICENSE=	APACHE20

PATCH_DEPENDS=	${LOCALBASE}/include/OpenCASCADE/OpenGl_HaltonSampler.hxx:cad/opencascade

LIB_DEPENDS=	libTKernel.so:cad/opencascade

BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pybind11:devel/py-pybind11@${PY_FLAVOR} \
				${LOCALBASE}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11

USES=	python cmake zip gl
USE_GL=	gl glu glut

WRKSRC=	${WRKDIR}/OCP_src_Ubuntu-16.04

OCCT= ${LOCALBASE}/include/OpenCASCADE
OCCT_LOCAL = ${WRKSRC}/OCCT

CMAKE_ARGS=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
			-DOPENCASCADE_INCLUDE_DIR=${OCCT}

pre-patch:
	# Copy and patch a header file with a troublesome C++ standard mismatch.
	${MKDIR} ${OCCT_LOCAL}
	${CP} ${OCCT}/OpenGl_HaltonSampler.hxx ${OCCT_LOCAL}

do-install:
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
	${INSTALL_LIB} ${BUILD_WRKSRC}/OCP.so ${STAGEDIR}${PYTHON_SITELIBDIR}

.include <bsd.port.mk>

Line 0 Link Here

(-)cad/py-ocp/distinfo (+3 lines)
	1	TIMESTAMP = 1595488164
	2	SHA256 (OCP_src_Linux.zip) = 126953106d7e52d3ec6c606ff3a34ecde5c6598899ab0c31279e185771304192
	3	SIZE (OCP_src_Linux.zip) = 50341316




--- FindOpenCascade.cmake.orig	2020-06-12 09:48:04 UTC
+++ FindOpenCascade.cmake
@@ -69,6 +69,6 @@ foreach( MOD ${OCCT_MODULES})
 
 endforeach()
 
-target_include_directories( OPENCASCADE INTERFACE ${OPENCASCADE_INCLUDE_DIR})
+target_include_directories( OPENCASCADE INTERFACE OCCT ${OPENCASCADE_INCLUDE_DIR})
 
-find_package_handle_standard_args( OPENCASCADE DEFAULT_MSG OPENCASCADE_LIBRARIES OPENCASCADE_INCLUDE_DIR )
\ No newline at end of file
+find_package_handle_standard_args( OPENCASCADE DEFAULT_MSG OPENCASCADE_LIBRARIES OPENCASCADE_INCLUDE_DIR )

Line 0 Link Here

(-)cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx (+11 lines)
	1	--- OCCT/OpenGl_HaltonSampler.hxx.orig 2020-06-15 08:29:45 UTC
	2	+++ OCCT/OpenGl_HaltonSampler.hxx
	3	@@ -180,7 +180,7 @@ void OpenGl_HaltonSampler::initRandom (Random_number_g
	4	{
	5	aPerms[aBase][i] = i;
	6	}
	7	- std::random_shuffle (aPerms[aBase].begin(), aPerms[aBase].end(), theRand);
	8	+ std::shuffle (aPerms[aBase].begin(), aPerms[aBase].end(), theRand);
	9	}
	10	initTables (aPerms);
	11	}




--- Standard.cpp.orig	2020-05-29 13:26:32 UTC
+++ Standard.cpp
@@ -902,10 +902,10 @@ py::module m = static_cast<py::module>(main_module.att
           R"#(None)#"  , py::arg("theOne"),  py::arg("theTwo")
           );
 // ./opencascade/Standard_Time.hxx
-    m.def("IsEqual",
-          (Standard_Boolean (*)( const Standard_Time ,  const Standard_Time  ))  static_cast<Standard_Boolean (*)( const Standard_Time ,  const Standard_Time  )>(&IsEqual),
-          R"#(None)#"  , py::arg("theOne"),  py::arg("theTwo")
-          );
+//    m.def("IsEqual",
+//          (Standard_Boolean (*)( const Standard_Time ,  const Standard_Time  ))  static_cast<Standard_Boolean (*)( const Standard_Time ,  const Standard_Time  )>(&IsEqual),
+//          R"#(None)#"  , py::arg("theOne"),  py::arg("theTwo")
+//          );
 // ./opencascade/Standard_NullValue.hxx
 // ./opencascade/Standard_DefineHandle.hxx
 // ./opencascade/Standard_Mutex.hxx

Line 0 Link Here

(-)cad/py-ocp/pkg-descr (+4 lines)
	1	OCP is a Python wrapper for OCCT (OpenCascade) generated using pywrap
	2	primarily used by CadQuery.
	3
	4	WWW: https://github.com/CadQuery/OCP

Line 0 Link Here

(-)cad/py-ocp/pkg-plist (+1 lines)
	1	%%PYTHON_SITELIBDIR%%/OCP.so

Return to bug 248202

Line 0 Link Here

(-)cad/py-ocp/Makefile (+44 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= ocp
	4	DISTVERSION= 7.4-RC2
	5	CATEGORIES= cad
	6	# Direct access to github is needed because the release added an extra archive which
	7	# we need to build from, rather than the initial release.
	8	MASTER_SITES= https://github.com/CadQuery/OCP/releases/download/${DISTVERSION}/
	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	10	DISTNAME= OCP_src_Linux
	11
	12	MAINTAINER= ports@nicandneal.net
	13	COMMENT= Python wrapper for OCCT generated using pywrap
	14
	15	LICENSE= APACHE20
	16
	17	PATCH_DEPENDS= ${LOCALBASE}/include/OpenCASCADE/OpenGl_HaltonSampler.hxx:cad/opencascade
	18
	19	LIB_DEPENDS= libTKernel.so:cad/opencascade
	20
	21	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pybind11:devel/py-pybind11@${PY_FLAVOR} \
	22	${LOCALBASE}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11
	23
	24	USES= python cmake zip gl
	25	USE_GL= gl glu glut
	26
	27	WRKSRC= ${WRKDIR}/OCP_src_Ubuntu-16.04
	28
	29	OCCT= ${LOCALBASE}/include/OpenCASCADE
	30	OCCT_LOCAL = ${WRKSRC}/OCCT
	31
	32	CMAKE_ARGS= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \
	33	-DOPENCASCADE_INCLUDE_DIR=${OCCT}
	34
	35	pre-patch:
	36	# Copy and patch a header file with a troublesome C++ standard mismatch.
	37	${MKDIR} ${OCCT_LOCAL}
	38	${CP} ${OCCT}/OpenGl_HaltonSampler.hxx ${OCCT_LOCAL}
	39
	40	do-install:
	41	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
	42	${INSTALL_LIB} ${BUILD_WRKSRC}/OCP.so ${STAGEDIR}${PYTHON_SITELIBDIR}
	43
	44	.include <bsd.port.mk>

Line 0 Link Here

(-)cad/py-ocp/files/patch-FindOpenCascade.cmake (+12 lines)
	1	--- FindOpenCascade.cmake.orig 2020-06-12 09:48:04 UTC
	2	+++ FindOpenCascade.cmake
	3	@@ -69,6 +69,6 @@ foreach( MOD ${OCCT_MODULES})
	4
	5	endforeach()
	6
	7	-target_include_directories( OPENCASCADE INTERFACE ${OPENCASCADE_INCLUDE_DIR})
	8	+target_include_directories( OPENCASCADE INTERFACE OCCT ${OPENCASCADE_INCLUDE_DIR})
	9
	10	-find_package_handle_standard_args( OPENCASCADE DEFAULT_MSG OPENCASCADE_LIBRARIES OPENCASCADE_INCLUDE_DIR )
	11	\ No newline at end of file
	12	+find_package_handle_standard_args( OPENCASCADE DEFAULT_MSG OPENCASCADE_LIBRARIES OPENCASCADE_INCLUDE_DIR )

Line 0 Link Here

(-)cad/py-ocp/files/patch-Standard.cpp (+17 lines)
	1	--- Standard.cpp.orig 2020-05-29 13:26:32 UTC
	2	+++ Standard.cpp
	3	@@ -902,10 +902,10 @@ py::module m = static_cast<py::module>(main_module.att
	4	R"#(None)#" , py::arg("theOne"), py::arg("theTwo")
	5	);
	6	// ./opencascade/Standard_Time.hxx
	7	- m.def("IsEqual",
	8	- (Standard_Boolean ()( const Standard_Time , const Standard_Time )) static_cast<Standard_Boolean ()( const Standard_Time , const Standard_Time )>(&IsEqual),
	9	- R"#(None)#" , py::arg("theOne"), py::arg("theTwo")
	10	- );
	11	+// m.def("IsEqual",
	12	+// (Standard_Boolean ()( const Standard_Time , const Standard_Time )) static_cast<Standard_Boolean ()( const Standard_Time , const Standard_Time )>(&IsEqual),
	13	+// R"#(None)#" , py::arg("theOne"), py::arg("theTwo")
	14	+// );
	15	// ./opencascade/Standard_NullValue.hxx
	16	// ./opencascade/Standard_DefineHandle.hxx
	17	// ./opencascade/Standard_Mutex.hxx