cad/opencascade: upgrade to 7.6.0

Release notes at
<https://dev.opencascade.org/content/open-cascade-technology-760-released>.

PR:		259354
Reported by:	lbartoletti
This commit is contained in:
Thierry Thomas 2021-11-07 18:16:24 +01:00
parent c594388688
commit dd9a3bcd4a
8 changed files with 1309 additions and 1970 deletions

View file

@ -1,8 +1,7 @@
# Created by: Thierry Thomas <thierry@pompo.net> # Created by: Thierry Thomas <thierry@pompo.net>
PORTNAME= opencascade PORTNAME= opencascade
PORTVERSION= 7.5.0 PORTVERSION= 7.6.0
PORTREVISION= 3
CATEGORIES= cad science CATEGORIES= cad science
MASTER_SITES= LOCAL/thierry MASTER_SITES= LOCAL/thierry
@ -19,15 +18,18 @@ BUILD_DEPENDS= rapidjson>0:devel/rapidjson \
${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools ${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libexpat.so:textproc/expat2 \
libpng16.so:graphics/png \
libvtksys-${VTKVER}.so:math/vtk${VTKVER:R} libvtksys-${VTKVER}.so:math/vtk${VTKVER:R}
RUN_DEPENDS= bash:shells/bash RUN_DEPENDS= bash:shells/bash
# Check ${WRKSRC}/dox/overview/overview.md # Check ${WRKSRC}/dox/overview/overview.md
# and ${WRKSRC}/dox/dev_guides/building # and ${WRKSRC}/dox/dev_guides/building
USES= alias:10 cmake compiler:c++14-lang dos2unix \ USES= alias:10 cmake compiler:c++14-lang dos2unix gettext-runtime \
gl python qt:5 shebangfix tk tar:tgz xorg gl gnome localbase python qt:5 shebangfix tk tar:tgz xorg
USE_XORG= ice sm x11 xext xi xmu xt USE_XORG= ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xscrnsaver xt
USE_GL= egl gl glesv2 glu USE_GL= egl gl glesv2 glu
USE_GNOME= libxml2
DOS2UNIX_FILES= adm/templates/* DOS2UNIX_FILES= adm/templates/*
SHEBANG_FILES= adm/templates/*.sh \ SHEBANG_FILES= adm/templates/*.sh \
@ -46,7 +48,7 @@ OPTIONS_DEFAULT=FFMPEG VIS
OPTIONS_SUB= yes OPTIONS_SUB= yes
REINPLACE_ARGS= -i "" REINPLACE_ARGS= -i ""
CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,--allow-shlib-undefined
CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \
-DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE \ -DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE \
-DINSTALL_DIR_LIB=${PREFIX}/lib \ -DINSTALL_DIR_LIB=${PREFIX}/lib \
@ -75,7 +77,29 @@ PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \
FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON
FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libtheoraenc.so:multimedia/libtheora \
libunistring.so:devel/libunistring \
libvdpau.so:multimedia/libvdpau \
libxvidcore.so:multimedia/xvid \
libp11-kit.so:security/p11-kit \
libx264.so:multimedia/libx264 \
libtasn1.so:security/libtasn1 \
libvorbis.so:audio/libvorbis \
libdav1d.so:multimedia/dav1d \
libnettle.so:security/nettle \
libgnutls.so:security/gnutls \
libvpx.so:multimedia/libvpx \
libx265.so:multimedia/x265 \
libdrm.so:graphics/libdrm \
libva.so:multimedia/libva \
libaom.so:multimedia/aom \
libmp3lame.so:audio/lame \
libffi.so:devel/libffi \
libidn2.so:dns/libidn2 \
libogg.so:audio/libogg \
libopus.so:audio/opus \
libgmp.so:math/gmp
VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON \ VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON \
-DUSE_FREETYPE:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1605211398 TIMESTAMP = 1635964606
SHA256 (opencascade-7.5.0.tgz) = d82d253aa6f43ce49111e84e04286dab4445eecba8efb5190973244b0c7fd211 SHA256 (opencascade-7.6.0.tgz) = 8dd81ee7b37f38bf930e0c067aa10f027310f3ab896f2925b32a2a2c5e273401
SIZE (opencascade-7.5.0.tgz) = 377394053 SIZE (opencascade-7.6.0.tgz) = 230101903

View file

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2020-11-03 14:49:47 UTC --- CMakeLists.txt.orig 2021-10-30 11:13:37 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -893,7 +893,7 @@ if (${DRAWEXE_INDEX} GREATER -1) @@ -963,7 +963,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
else() else()
install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
@ -9,7 +9,7 @@
endif() endif()
# copy draw script to CMake binary folder # copy draw script to CMake binary folder
@@ -909,7 +909,7 @@ else() @@ -979,7 +979,7 @@ else()
endif() endif()
# change custom.bat/sh # change custom.bat/sh
@ -18,7 +18,7 @@
file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT) file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}") set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
@@ -1156,7 +1156,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPE @@ -1229,7 +1229,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPE
endforeach() endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration # 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 "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")

View file

@ -1,10 +1,10 @@
--- adm/cmake/occt_csf.cmake.orig 2020-11-03 14:49:43 UTC --- adm/cmake/occt_csf.cmake.orig 2021-10-30 11:13:37 UTC
+++ adm/cmake/occt_csf.cmake +++ adm/cmake/occt_csf.cmake
@@ -124,7 +124,6 @@ else() @@ -142,7 +142,6 @@ else()
set (CSF_OpenGlLibs "GL") set (CSF_OpenGlLibs "GL EGL")
endif() endif()
set (CSF_XwLibs "X11 Xext Xmu Xi") set (CSF_OpenGlesLibs "EGL GLESv2")
- set (CSF_dl "dl") - set (CSF_dl "dl")
if (USE_FREETYPE)
set (CSF_fontconfig "fontconfig") set (CSF_fontconfig "fontconfig")
endif() endif()
endif()

View file

@ -1,14 +1,14 @@
--- src/DrawResources/CheckCommands.tcl.orig 2020-11-03 14:49:56 UTC --- src/DrawResources/CheckCommands.tcl.orig 2021-10-30 11:13:45 UTC
+++ src/DrawResources/CheckCommands.tcl +++ src/DrawResources/CheckCommands.tcl
@@ -1053,6 +1053,7 @@ help checkplatform { @@ -1095,6 +1095,7 @@ help checkplatform {
-windows : return 1 if current platform is 'Windows', overwise return 0 -windows : return 1 if current platform is 'Windows', otherwise return 0
-linux : return 1 if current platform is 'Linux', overwise return 0 -linux : return 1 if current platform is 'Linux', otherwise return 0
-osx : return 1 if current platform is 'MacOS X', overwise return 0 -osx : return 1 if current platform is 'MacOS X', otherwise return 0
+ -freebsd : return 1 if current platform is 'FreeBSD', overwise return 0 + -freebsd : return 1 if current platform is 'FreeBSD', otherwise return 0
Only one option can be used at once. Only one option can be used at once.
If no option is given, procedure will return the name of current platform. If no option is given, procedure will return the name of current platform.
@@ -1061,9 +1062,11 @@ proc checkplatform {args} { @@ -1103,9 +1104,11 @@ proc checkplatform {args} {
set check_for_windows false set check_for_windows false
set check_for_linux false set check_for_linux false
set check_for_macosx false set check_for_macosx false
@ -20,7 +20,7 @@
{"-osx" check_for_macosx 0}} {"-osx" check_for_macosx 0}}
_check_args ${args} ${options} "checkplatform" _check_args ${args} ${options} "checkplatform"
@@ -1072,17 +1075,19 @@ proc checkplatform {args} { @@ -1114,17 +1117,19 @@ proc checkplatform {args} {
set current_platform Windows set current_platform Windows
} elseif { $::tcl_platform(os) == "Linux" } { } elseif { $::tcl_platform(os) == "Linux" } {
set current_platform Linux set current_platform Linux
@ -42,7 +42,7 @@
error "Error: wrong usage of command checkplatform, only single option can be used at once" error "Error: wrong usage of command checkplatform, only single option can be used at once"
} }
@@ -1091,8 +1096,13 @@ proc checkplatform {args} { @@ -1133,8 +1138,13 @@ proc checkplatform {args} {
return 1 return 1
} }

View file

@ -1,16 +0,0 @@
--- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig 2020-11-03 14:50:01 UTC
+++ src/IVtkDraw/IVtkDraw_Interactor.cxx
@@ -20,6 +20,13 @@
#include <vtkWin32OpenGLRenderWindow.h>
#else
#include <GL/glx.h>
+
+// Preventing naming collisions between
+// GLX and VTK versions 9.0 and above
+#ifdef AllValues
+#undef AllValues
+#endif
+
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
#endif

View file

@ -1,11 +0,0 @@
--- src/StepFile/recfile.pc.orig 2017-08-30 13:28:34 UTC
+++ 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(__FreeBSD__))
#include "malloc.h"
#endif
#include "recfile.ph"

File diff suppressed because it is too large Load diff