occt: update to 7.5.0.

This commit is contained in:
Karl Nilsson 2021-03-11 12:56:42 -05:00 committed by Érico Nogueira Rolim
parent e5f74e2e02
commit abe75dc062
5 changed files with 22 additions and 25 deletions

View file

@ -3,7 +3,7 @@
--- adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500 --- adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500
+++ adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500 +++ adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500
@@ -26,7 +26,7 @@ @@ -27,7 +27,7 @@
if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
endif() endif()

View file

@ -11,8 +11,8 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <signal.h> #include <signal.h>
-#if !defined(__ANDROID__) && !defined(__QNX__) -#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__) +#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
#include <sys/signal.h> #include <sys/signal.h>
#endif #endif

View file

@ -2,16 +2,17 @@ In musl libc there is no struct mallinfo and no function mallinf()
--- src/OSD/OSD_MemInfo.cxx.orig --- src/OSD/OSD_MemInfo.cxx.orig
+++ src/OSD/OSD_MemInfo.cxx +++ src/OSD/OSD_MemInfo.cxx
@@ -147,8 +147,12 @@
}
aFile.close();
@@ -182,8 +182,12 @@
#elif (defined(__linux__) || defined(__linux))
if (IsActive (MemHeapUsage))
{
+ #if defined(__GLIBC__) + #if defined(__GLIBC__)
struct mallinfo aMI = mallinfo(); const struct mallinfo aMI = mallinfo();
myCounters[MemHeapUsage] = aMI.uordblks; myCounters[MemHeapUsage] = aMI.uordblks;
+ #else /* XXX not yet coded */ + #else /* XXX not yet coded */
+ myCounters[MemHeapUsage] = 0; + myCounters[MemHeapUsage] = 0;
+ #endif + #endif
}
#elif (defined(__APPLE__)) if (!IsActive (MemVirtual)
struct task_basic_info aTaskInfo;

View file

@ -1,9 +1,9 @@
# Template file for 'occt' # Template file for 'occt'
pkgname=occt pkgname=occt
version=7.4.0p1 version=7.5.0
revision=2 revision=1
_gittag="V${version//./_}" _ver="${version//./_}"
wrksrc=occt-${_gittag} wrksrc=OCCT-${_ver}
build_style=cmake build_style=cmake
configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
-DINSTALL_SAMPLES=ON" -DINSTALL_SAMPLES=ON"
@ -11,12 +11,10 @@ makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
tcl-devel tk-devel" tcl-devel tk-devel"
short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications" short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
maintainer="Piraty <piraty1@inbox.ru>" maintainer="Piraty <piraty1@inbox.ru>"
license="LGPL-2.1-only" license="custom:LGPL-2.1-only-with-exceptions"
homepage="https://www.opencascade.com" homepage="https://www.opencascade.com"
# distfile: use git instead of official tarball, which requires registration distfiles="https://github.com/Open-Cascade-SAS/OCCT/archive/V${_ver}.tar.gz"
# see https://www.opencascade.com/content/packaging-again-debian checksum=dbe1d62a9317ad1516bd4575293d9aab2dc20206ca7a60a7705c9a3b77dc59c9
distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
conflicts="oce>=0" conflicts="oce>=0"
post_install() { post_install() {

View file

@ -1,2 +0,0 @@
site="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=tags"
pattern=">V\K[\d_p]+(?=</a>)"