cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update oce to 7.6.0. ok sthen@ rsadowski@

Browse Source
This commit is contained in:
tracey 2022-02-22 15:20:11 +00:00
parent e2e66b49a8
commit df61b5a5c7
15 changed files with 8678 additions and 13104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cad/oce/Makefile
View File

@ -1,24 +1,23 @@
# $OpenBSD: Makefile,v 1.3 2020/04/30 21:05:03 cwen Exp $
# $OpenBSD: Makefile,v 1.4 2022/02/22 15:20:11 tracey Exp $
BROKEN-powerpc = kicad is broken, this is the only consumer (save bulk time)
BROKEN-powerpc = kicad is broken, this is the only consumer (save bulk time)
COMMENT = C++ 3d modeling library
DPB_PROPERTIES = parallel
GH_ACCOUNT = tpaviot
GH_PROJECT = oce
GH_TAGNAME = OCE-0.18.3
PKGNAME = ${GH_TAGNAME:L}
GH_COMMIT = 98a788062f0f30593880b0df1bcf967408212ba4
DISTNAME = oce-7.6.0
.for LIB in FWOSPlugin PTKernel TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF \
TKBool TKCAF TKCDF TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase \
TKHLR TKIGES TKLCAF TKMath TKMesh TKMeshVS TKNIS TKOffset TKOpenGl \
TKPCAF TKPLCAF TKPShape TKPrim TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase \
TKSTL TKService TKShHealing TKShapeSchema TKStdLSchema TKStdSchema \
TKTObj TKTopAlgo TKV3d TKVRML TKVoxel TKXCAF TKXCAFSchema TKXDEIGES \
TKXDESTEP TKXMesh TKXSBase TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel \
TKDCAF TKDraw TKTObjDRAW TKTopTest TKViewerTest TKXDEDRAW TKXSDRAW
SHARED_LIBS += ${LIB} 0.0
.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
TKIGES TKLCAF TKMath TKMesh TKMeshVS TKOffset TKOpenGl TKPrim TKQADraw \
TKRWMesh TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKSTL TKService \
TKShHealing TKStd TKStdL TKTObj TKTObjDRAW TKTopAlgo TKTopTest TKV3d \
TKVCAF TKVRML TKViewerTest TKXCAF TKXDEDRAW TKXDEIGES TKXDESTEP \
TKXMesh TKXSBase TKXSDRAW TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
SHARED_LIBS += ${LIB} 1.0
.endfor
CATEGORIES = cad
@ -26,8 +25,8 @@ CATEGORIES = cad
# LGPLv2.1
PERMIT_PACKAGE = Yes
WANTLIB += ${MODTK_WANTLIB} ${COMPILER_LIBCXX}
WANTLIB += GL GLU ICE SM X11 Xext c freetype m pthread
WANTLIB += ${MODTK_WANTLIB} ${COMPILER_LIBCXX} GL X11 Xext Xi c fontconfig
WANTLIB += freetype m
NO_TEST = Yes
@ -38,13 +37,10 @@ MODULES = devel/cmake \
MODTK_VERSION = 8.6
LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
RUN_DEPENDS = ${MODTK_RUN_DEPENDS} \
shells/bash
CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="-I${X11BASE}/include ${CXXFLAGS}" \
-DOCE_BUILD_SHARED_LIB=ON \
-DOCE_WITH_FREEIMAGE=ON \
-DOCE_WITH_GL2PS=ON \
-DOCE_DRAW=ON \
-DOCE_MODEL=ON \
-DOCE_OCAF=ON
-DINSTALL_DIR_RESOURCE:STRING="share/opencascade/src"
.include <bsd.port.mk>

4
cad/oce/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (oce-OCE-0.18.3.tar.gz) = xVPWp79S95Crw7a7eh6RpllH6SpCa7GoihGWDDHwlmw=
SIZE (oce-OCE-0.18.3.tar.gz) = 24633768
SHA256 (oce-7.6.0-98a78806.tar.gz) = if3l5Vgxw8UQROIcbAjTM9kRQTXojbLrVvFoMKBi/Uw=
SIZE (oce-7.6.0-98a78806.tar.gz) = 47847120

30
cad/oce/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -909,12 +909,12 @@ else()
endif()
# change custom.bat/sh
-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
- file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+if (EXISTS "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+ file (READ "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+ file (WRITE "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
else()
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
endif()
@@ -1156,7 +1156,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPE
endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE})

24
cad/oce/patches/patch-adm_cmake_occt_csf_cmake Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-adm_cmake_occt_csf_cmake,v 1.1 2022/02/22 15:20:11 tracey Exp $
remove libraries we don't have
Index: adm/cmake/occt_csf.cmake
--- adm/cmake/occt_csf.cmake.orig
+++ adm/cmake/occt_csf.cmake
@@ -117,14 +117,14 @@ else()
set (CSF_OpenGlLibs "EGL GLESv2")
set (CSF_androidlog "log")
elseif (UNIX)
- set (CSF_ThreadLibs "pthread rt stdc++")
+ set (CSF_ThreadLibs "pthread stdc++")
if (USE_GLES2)
set (CSF_OpenGlLibs "EGL GLESv2")
else()
set (CSF_OpenGlLibs "GL")
endif()
set (CSF_XwLibs "X11 Xext Xi")
- set (CSF_dl "dl")
+ set (CSF_dl "")
set (CSF_fontconfig "fontconfig")
endif()
endif()

17
cad/oce/patches/patch-adm_cmake_occt_macros_cmake Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-adm_cmake_occt_macros_cmake,v 1.1 2022/02/22 15:20:11 tracey Exp $
Ugly hack on ALL_OCCT_TARGET_FILES: change later
Index: adm/cmake/occt_macros.cmake
--- adm/cmake/occt_macros.cmake.orig
+++ adm/cmake/occt_macros.cmake
@@ -592,7 +592,8 @@ macro (OCCT_UPDATE_TARGET_FILE)
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ file (GLOB ALL_OCCT_TARGET_FILES
+ \"${PROJECT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
file (REMOVE \"\${TARGET_FILENAME}\")

16
cad/oce/patches/patch-src_BRepMesh_delabella_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_BRepMesh_delabella_cpp,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/BRepMesh/delabella.cpp
--- src/BRepMesh/delabella.cpp.orig
+++ src/BRepMesh/delabella.cpp
@@ -36,7 +36,9 @@ SOFTWARE.
#if (defined(__APPLE__))
#include <malloc/malloc.h>
#else
-#include <malloc.h>
+ #ifndef __OpenBSD__
+ #include <malloc.h>
+ #endif
#endif
#include <algorithm>

14
cad/oce/patches/patch-src_OSD_OSD_Chronometer_cxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_OSD_OSD_Chronometer_cxx,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/OSD/OSD_Chronometer.cxx
--- src/OSD/OSD_Chronometer.cxx.orig
+++ src/OSD/OSD_Chronometer.cxx
@@ -51,7 +51,7 @@
void OSD_Chronometer::GetProcessCPU (Standard_Real& theUserSeconds,
Standard_Real& theSystemSeconds)
{
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__) || defined(__EMSCRIPTEN__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__OpenBSD__)
static const long aCLK_TCK = sysconf(_SC_CLK_TCK);
#else
static const long aCLK_TCK = CLK_TCK;

21
cad/oce/patches/patch-src_OSD_OSD_Host_cxx Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_OSD_OSD_Host_cxx,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/OSD/OSD_Host.cxx
--- src/OSD/OSD_Host.cxx.orig
+++ src/OSD/OSD_Host.cxx
@@ -71,6 +71,7 @@ struct utsname info;
if (!strcmp(info.sysname,"SunOS")) return (OSD_UnixBSD);
if (!strcmp(info.sysname,"ULTRIX")) return (OSD_UnixBSD);
if (!strcmp(info.sysname,"FreeBSD")) return (OSD_UnixBSD);
+ if (!strcmp(info.sysname,"OpenBSD")) return (OSD_UnixBSD);
if (!strncmp(info.sysname,"Linux",5)) return (OSD_LinuxREDHAT);
if (!strncmp(info.sysname,"IRIX", 4)) return (OSD_UnixSystemV);
if (!strncmp(info.sysname,"OSF", 3)) return (OSD_OSF);
@@ -152,6 +153,7 @@ struct utsname info;
if (!strncmp(info.sysname,"OSF",3)) return (OSD_DEC);
if (!strncmp(info.sysname,"Linux",5)) return (OSD_LIN);
if (!strcmp(info.sysname,"FreeBSD")) return (OSD_LIN);
+ if (!strcmp(info.sysname,"OpenBSD")) return (OSD_LIN);
if (!strncmp(info.sysname,"AIX",3)) return (OSD_AIX);
if (!strcmp(info.sysname,"Darwin")) return (OSD_MAC);
return (OSD_Unavailable);

4
cad/oce/patches/patch-src_OSD_OSD_MemInfo_cxx
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_OSD_OSD_MemInfo_cxx,v 1.1.1.1 2019/11/06 17:23:22 sthen Exp $
$OpenBSD: patch-src_OSD_OSD_MemInfo_cxx,v 1.2 2022/02/22 15:20:11 tracey Exp $
Index: src/OSD/OSD_MemInfo.cxx
--- src/OSD/OSD_MemInfo.cxx.orig
+++ src/OSD/OSD_MemInfo.cxx
@@ -31,7 +31,9 @@
@@ -28,7 +28,9 @@
#include <malloc/malloc.h>
#else
#include <unistd.h>

18
cad/oce/patches/patch-src_OSD_OSD_Path_cxx Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_OSD_OSD_Path_cxx,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/OSD/OSD_Path.cxx
--- src/OSD/OSD_Path.cxx.orig
+++ src/OSD/OSD_Path.cxx
@@ -21,9 +21,11 @@
#include <Standard_ProgramError.hxx>
#include <TCollection_AsciiString.hxx>
+#include <sys/utsname.h> // For 'uname'
+
static OSD_SysType whereAmI()
{
-#if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) || defined(__FreeBSD_kernel__)
+#if defined(__digital__) || defined(__FreeBSD__) || defined(SUNOS) || defined(__APPLE__) || defined(__QNX__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
return OSD_UnixBSD;
#elif defined(sgi) || defined(IRIX) || defined(__sun) || defined(SOLARIS) || defined(__sco__) || defined(__hpux) || defined(HPUX)
return OSD_UnixSystemV;

14
cad/oce/patches/patch-src_Standard_Standard_CString_cxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_Standard_Standard_CString_cxx,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/Standard/Standard_CString.cxx
--- src/Standard/Standard_CString.cxx.orig
+++ src/Standard/Standard_CString.cxx
@@ -83,7 +83,7 @@ Standard_Integer HashCodes (const Standard_CString the
// strtod, strtol, strtoll functions. For other system with locale-depended
// implementations problems may appear if "C" locale is not set explicitly.
#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__)
- #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
+ #warning System does not support xlocale. Import/export could be broken if C locale did not specified by application.
#endif
#define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr)
#endif

14
cad/oce/patches/patch-src_Standard_Standard_MMgrOpt_cxx Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_Standard_Standard_MMgrOpt_cxx,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/Standard/Standard_MMgrOpt.cxx
--- src/Standard/Standard_MMgrOpt.cxx.orig
+++ src/Standard/Standard_MMgrOpt.cxx
@@ -249,7 +249,7 @@ void Standard_MMgrOpt::Initialize()
perror("ERR_MEMRY_FAIL");
#endif
-#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__)
+#if defined(IRIX) || defined(__sgi) || defined(SOLARIS) || defined(__sun) || defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__OpenBSD__)
if ((myMMap = open ("/dev/zero", O_RDWR)) < 0) {
if ((myMMap = open ("/dev/null", O_RDWR)) < 0){
myMMap = 0;

17
cad/oce/patches/patch-src_Standard_Standard_StackTrace_cxx Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_Standard_Standard_StackTrace_cxx,v 1.1 2022/02/22 15:20:11 tracey Exp $
Index: src/Standard/Standard_StackTrace.cxx
--- src/Standard/Standard_StackTrace.cxx.orig
+++ src/Standard/Standard_StackTrace.cxx
@@ -193,7 +193,10 @@ Standard_Boolean Standard::StackTrace (char* theBuffer
{
return false;
}
-
+#if defined(__OpenBSD__)
+ Message::SendTrace ("Standard::StackTrace() is not implemented for this platform");
+ return false;
+#endif
#if defined(__EMSCRIPTEN__)
// theNbTraces is ignored
// EM_LOG_JS_STACK?

14
cad/oce/patches/patch-src_StepFile_recfile_pc
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_StepFile_recfile_pc,v 1.1.1.1 2019/11/06 17:23:22 sthen Exp $
Index: src/StepFile/recfile.pc
--- src/StepFile/recfile.pc.orig
+++ src/StepFile/recfile.pc
@@ -16,7 +16,7 @@
#include "stdio.h"
#include "string.h"
#include "stdlib.h"
-#if (!defined(_WIN32) && !defined(__APPLE__))
+#if (!defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__))
#include "malloc.h"
#endif
#include "recfile.ph"

21537
cad/oce/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff