Attachment 216699 Details for Bug 248202 – The new port

[patch] The new port

py-ocp.diff (text/plain), 7.42 KB, created by Neal Nelson on 2020-07-23 13:14:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Nelson

Created: 2020-07-23 13:14:15 UTC

Size: 7.42 KB

patch

obsolete

>Index: cad/py-ocp/Makefile
>===================================================================
>--- cad/py-ocp/Makefile	(nonexistent)
>+++ cad/py-ocp/Makefile	(working copy)
>@@ -0,0 +1,44 @@
>+# $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>
>
>Property changes on: cad/py-ocp/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cad/py-ocp/distinfo
>===================================================================
>--- cad/py-ocp/distinfo	(nonexistent)
>+++ cad/py-ocp/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1595488164
>+SHA256 (OCP_src_Linux.zip) = 126953106d7e52d3ec6c606ff3a34ecde5c6598899ab0c31279e185771304192
>+SIZE (OCP_src_Linux.zip) = 50341316
>
>Property changes on: cad/py-ocp/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cad/py-ocp/files/patch-FindOpenCascade.cmake
>===================================================================
>--- cad/py-ocp/files/patch-FindOpenCascade.cmake	(nonexistent)
>+++ cad/py-ocp/files/patch-FindOpenCascade.cmake	(working copy)
>@@ -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 )
>
>Property changes on: cad/py-ocp/files/patch-FindOpenCascade.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx
>===================================================================
>--- cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx	(nonexistent)
>+++ cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx	(working copy)
>@@ -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);
>+ }
>
>Property changes on: cad/py-ocp/files/patch-OCCT_OpenGl__HaltonSampler.hxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cad/py-ocp/files/patch-Standard.cpp
>===================================================================
>--- cad/py-ocp/files/patch-Standard.cpp	(nonexistent)
>+++ cad/py-ocp/files/patch-Standard.cpp	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>
>Property changes on: cad/py-ocp/files/patch-Standard.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cad/py-ocp/pkg-descr
>===================================================================
>--- cad/py-ocp/pkg-descr	(nonexistent)
>+++ cad/py-ocp/pkg-descr	(working copy)
>@@ -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
>
>Property changes on: cad/py-ocp/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cad/py-ocp/pkg-plist
>===================================================================
>--- cad/py-ocp/pkg-plist	(nonexistent)
>+++ cad/py-ocp/pkg-plist	(working copy)
>@@ -0,0 +1 @@
>+%%PYTHON_SITELIBDIR%%/OCP.so
>
>Property changes on: cad/py-ocp/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 248202: 216699 | 216876