Index: cad/Makefile =================================================================== --- cad/Makefile +++ cad/Makefile @@ -93,6 +93,7 @@ SUBDIR += py-ezdxf SUBDIR += py-gdspy SUBDIR += py-lcapy + SUBDIR += py-ocp SUBDIR += py-phidl SUBDIR += py-pyfda SUBDIR += python-gdsii Index: cad/py-ocp/Makefile =================================================================== --- /dev/null +++ cad/py-ocp/Makefile @@ -0,0 +1,42 @@ +# $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 + +LIB_DEPENDS= libTKernel.so:cad/opencascade +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ + pybind11>0:devel/pybind11 +PATCH_DEPENDS= ${LOCALBASE}/include/OpenCASCADE/OpenGl_HaltonSampler.hxx:cad/opencascade + +USES= cmake gl python:3.6+ zip +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 Index: cad/py-ocp/distinfo =================================================================== --- /dev/null +++ cad/py-ocp/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1595488164 +SHA256 (OCP_src_Linux.zip) = 126953106d7e52d3ec6c606ff3a34ecde5c6598899ab0c31279e185771304192 +SIZE (OCP_src_Linux.zip) = 50341316 Index: cad/py-ocp/files/patch-FindOpenCascade.cmake =================================================================== --- /dev/null +++ cad/py-ocp/files/patch-FindOpenCascade.cmake @@ -0,0 +1,12 @@ +--- 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 ) Index: cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx =================================================================== --- /dev/null +++ cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx @@ -0,0 +1,11 @@ +--- OCCT/OpenGl_HaltonSampler.hxx.orig 2020-06-15 08:29:45 UTC ++++ OCCT/OpenGl_HaltonSampler.hxx +@@ -180,7 +180,7 @@ void OpenGl_HaltonSampler::initRandom (Random_number_g + { + aPerms[aBase][i] = i; + } +- std::random_shuffle (aPerms[aBase].begin(), aPerms[aBase].end(), theRand); ++ std::shuffle (aPerms[aBase].begin(), aPerms[aBase].end(), theRand); + } + initTables (aPerms); + } Index: cad/py-ocp/files/patch-Standard.cpp =================================================================== --- /dev/null +++ cad/py-ocp/files/patch-Standard.cpp @@ -0,0 +1,30 @@ +--- Standard.cpp.orig 2020-06-18 17:28:24 UTC ++++ Standard.cpp +@@ -1009,10 +1009,10 @@ py::module m = static_cast(main_module.att + // ./opencascade/Standard_OutOfRange.hxx + // ./opencascade/Standard_GUID.hxx + // ./opencascade/Standard_Time.hxx +- m.def("IsEqual", +- (Standard_Boolean (*)( const Standard_Time , const Standard_Time )) static_cast(&IsEqual), +- R"#(None)#" , py::arg("theOne"), py::arg("theTwo") +- ); ++// m.def("IsEqual", ++// (Standard_Boolean (*)( const Standard_Time , const Standard_Time )) static_cast(&IsEqual), ++// R"#(None)#" , py::arg("theOne"), py::arg("theTwo") ++// ); + // ./opencascade/Standard_NullValue.hxx + // ./opencascade/Standard_DefineAlloc.hxx + // ./opencascade/Standard_ExtCharacter.hxx +@@ -1292,10 +1292,12 @@ py::module m = static_cast(main_module.att + (Standard_Boolean (*)( const Standard_Integer , const Standard_Integer )) static_cast(&IsEqual), + R"#(None)#" , py::arg("theOne"), py::arg("theTwo") + ); ++#ifdef __amd64__ + m.def("IsEqual", + (Standard_Boolean (*)( const Standard_Utf32Char , const Standard_Utf32Char )) static_cast(&IsEqual), + R"#(None)#" , py::arg("theOne"), py::arg("theTwo") + ); ++#endif + // ./opencascade/Standard_OutOfMemory.hxx + // ./opencascade/Standard_Version.hxx + // ./opencascade/Standard_MultiplyDefined.hxx Index: cad/py-ocp/pkg-descr =================================================================== --- /dev/null +++ cad/py-ocp/pkg-descr @@ -0,0 +1,4 @@ +OCP is a Python wrapper for OCCT (OpenCascade) generated using pywrap +primarily used by CadQuery. + +WWW: https://github.com/CadQuery/OCP Index: cad/py-ocp/pkg-plist =================================================================== --- /dev/null +++ cad/py-ocp/pkg-plist @@ -0,0 +1 @@ +%%PYTHON_SITELIBDIR%%/OCP.so