1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-15 07:56:36 +00:00

Upgrade to 7.3.0.

This commit is contained in:
Thierry Thomas 2018-10-30 17:23:01 +00:00
parent c924f42f1f
commit e914b6d5e6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=483504
9 changed files with 479 additions and 141 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= opencascade
PORTVERSION= 7.2.0
PORTREVISION= 4
PORTVERSION= 7.3.0
CATEGORIES= cad science
MASTER_SITES= LOCAL/thierry
@ -23,9 +22,10 @@ RUN_DEPENDS= bash:shells/bash
# Check ${WRKSRC}/dox/overview/overview.md
# and ${WRKSRC}/dox/dev_guides/building
USES= alias:10 cmake:outsource compiler:c++14-lang dos2unix \
shebangfix tk tar:tgz
gl shebangfix tk tar:tgz
USE_XORG= ice sm x11 xext xi xmu xt
USE_GL= gl glu
DOS2UNIX_FILES= adm/templates/*
SHEBANG_FILES= adm/templates/*.sh \
adm/templates/*.sh.in \
@ -79,6 +79,7 @@ DOXYGEN_USE= TEX=latex:build
DOXYGEN_BUILD_DEPENDS= bash:shells/bash \
doxygen:devel/doxygen \
dot:graphics/graphviz \
pdftex:print/tex-basic-engines \
inkscape:graphics/inkscape
DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1514301887
SHA256 (opencascade-7.2.0.tgz) = 245e344b2cf8a6e0a7d9f45d5d807f8ef48607bcd7a6d763ba2d7b861fa55249
SIZE (opencascade-7.2.0.tgz) = 202114726
TIMESTAMP = 1540838134
SHA256 (opencascade-7.3.0.tgz) = 1e056fbeaafc8b5a29dd1086de83ae32f65a3c588e8b63fdd126b999e84011cd
SIZE (opencascade-7.3.0.tgz) = 208866901

View File

@ -1,8 +1,8 @@
--- adm/cmake/occt_csf.cmake.orig 2017-08-30 13:27:56 UTC
--- adm/cmake/occt_csf.cmake.orig 2018-05-25 19:13:23 UTC
+++ adm/cmake/occt_csf.cmake
@@ -111,6 +111,5 @@ if (WIN32)
set (CSF_ThreadLibs "pthread rt stdc++")
set (CSF_OpenGlLibs "GL")
@@ -116,6 +116,5 @@ if (WIN32)
set (CSF_OpenGlLibs "GL")
endif()
set (CSF_XwLibs "X11 Xext Xmu Xi")
- set (CSF_dl "dl")
endif()

View File

@ -1,4 +1,4 @@
--- adm/cmake/occt_macros.cmake.orig 2017-08-30 13:27:56 UTC
--- adm/cmake/occt_macros.cmake.orig 2018-05-25 19:13:23 UTC
+++ adm/cmake/occt_macros.cmake
@@ -53,7 +53,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS)
elseif(APPLE)
@ -9,7 +9,7 @@
endif()
endmacro()
@@ -335,7 +335,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_F
@@ -337,7 +337,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_F
configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" @ONLY)
endforeach()

View File

@ -1,6 +1,6 @@
--- src/DrawResources/CheckCommands.tcl.orig 2017-08-30 13:28:11 UTC
--- src/DrawResources/CheckCommands.tcl.orig 2018-05-25 19:13:38 UTC
+++ src/DrawResources/CheckCommands.tcl
@@ -1038,6 +1038,7 @@ help checkplatform {
@@ -1036,6 +1036,7 @@ help checkplatform {
-windows : return 1 if current platform is 'Windows', overwise return 0
-linux : return 1 if current platform is 'Linux', overwise return 0
-osx : return 1 if current platform is 'MacOS X', overwise return 0
@ -8,7 +8,7 @@
Only one option can be used at once.
If no option is given, procedure will return the name of current platform.
@@ -1046,9 +1047,11 @@ proc checkplatform {args} {
@@ -1044,9 +1045,11 @@ proc checkplatform {args} {
set check_for_windows false
set check_for_linux false
set check_for_macosx false
@ -20,7 +20,7 @@
{"-osx" check_for_macosx 0}}
_check_args ${args} ${options} "checkplatform"
@@ -1057,17 +1060,19 @@ proc checkplatform {args} {
@@ -1055,17 +1058,19 @@ proc checkplatform {args} {
set current_platform Windows
} elseif { $::tcl_platform(os) == "Linux" } {
set current_platform Linux
@ -42,7 +42,7 @@
error "Error: wrong usage of command checkplatform, only single option can be used at once"
}
@@ -1076,11 +1081,16 @@ proc checkplatform {args} {
@@ -1074,11 +1079,16 @@ proc checkplatform {args} {
return 1
}

View File

@ -5,9 +5,9 @@ src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'A
if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
^
--- src/Image/Image_VideoRecorder.cxx.orig 2017-08-30 13:28:21 UTC
--- src/Image/Image_VideoRecorder.cxx.orig 2018-05-25 19:13:49 UTC
+++ src/Image/Image_VideoRecorder.cxx
@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
@@ -283,7 +283,7 @@ Standard_Boolean Image_VideoRecorder::ad
// some formats want stream headers to be separate
if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
{
@ -16,7 +16,7 @@ src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'A
}
return Standard_True;
#else
@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame
@@ -456,6 +456,7 @@ Standard_Boolean Image_VideoRecorder::wr
AVPacket aPacket;
memset (&aPacket, 0, sizeof(aPacket));
av_init_packet (&aPacket);
@ -24,7 +24,7 @@ src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'A
if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
&& !theToFlush)
{
@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame
@@ -468,6 +469,7 @@ Standard_Boolean Image_VideoRecorder::wr
aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
}
else

View File

@ -1,11 +0,0 @@
--- src/RWStl/RWStl_Reader.cxx.orig 2017-08-30 13:28:29 UTC
+++ src/RWStl/RWStl_Reader.cxx
@@ -264,7 +264,7 @@ Standard_Boolean RWStl_Reader::ReadAscii
// report progress every 1 MiB of read data
const int aStepB = 1024 * 1024;
- const Standard_Integer aNbSteps = 1 + Standard_Integer((theUntilPos - aStartPos) / aStepB);
+ const Standard_Integer aNbSteps = 1 + Standard_Integer(((int64_t)theUntilPos - aStartPos) / aStepB);
Message_ProgressSentry aPSentry (theProgress, "Reading text STL file", 0, aNbSteps, 1);
int64_t aProgressPos = aStartPos + aStepB;

View File

@ -1,11 +1,11 @@
--- src/Standard/Standard_CLocaleSentry.hxx.orig 2017-08-30 13:28:31 UTC
--- src/Standard/Standard_CLocaleSentry.hxx.orig 2018-05-25 19:14:11 UTC
+++ src/Standard/Standard_CLocaleSentry.hxx
@@ -25,7 +25,7 @@
//! and become part of POSIX since '2008.
//! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
//! since POSIX didn't declared such identifier.
@@ -31,7 +31,7 @@
//! Presence of this extension cannot be checked in straightforward way (like (_POSIX_C_SOURCE >= 200809L))
//! due to missing such declarations in standard.
//! On macOS new functions are declared within "xlocale.h" header (the same is for glibc, but this header has been removed since glibc 2.26).
- #if defined(__APPLE__)
+ #if defined(__APPLE__) || (defined(__FreeBSD__) && (__FreeBSD_version > 910000))
#define HAVE_XLOCALE_H
#define OCCT_CLOCALE_POSIX2008
#endif

File diff suppressed because it is too large Load Diff