wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

occt: update to 7.9.0.

Browse source
This commit is contained in:
ii8 2025-02-23 17:44:19 +00:00
parent e6917549e8
commit ce394ba76f
7 changed files with 127 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
common/shlibs
View file

@ -3453,67 +3453,73 @@ libvtkkissfft-9.3.so.1 vtk-9.3.0_1
libvolume_key.so.1 volume_key-0.3.9_1 libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2 libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1 libcapnp_c.so.0 c-capnproto-0.3_1
libTKernel.so.7.7 occt-7.7.1_1 libTKDEPLY.so.7.9 occt-7.9.0_1
libTKXmlXCAF.so.7.7 occt-7.7.1_1 libTKBRep.so.7.9 occt-7.9.0_1
libTKXmlTObj.so.7.7 occt-7.7.1_1 libTKDEOBJ.so.7.9 occt-7.9.0_1
libTKXmlL.so.7.7 occt-7.7.1_1 libTKExpress.so.7.9 occt-7.9.0_1
libTKXml.so.7.7 occt-7.7.1_1 libTKXSDRAWGLTF.so.7.9 occt-7.9.0_1
libTKXSDRAW.so.7.7 occt-7.7.1_1 libTKXSDRAWOBJ.so.7.9 occt-7.9.0_1
libTKXSBase.so.7.7 occt-7.7.1_1 libTKXSDRAWSTL.so.7.9 occt-7.9.0_1
libTKXMesh.so.7.7 occt-7.7.1_1 libTKDESTEP.so.7.9 occt-7.9.0_1
libTKXDESTEP.so.7.7 occt-7.7.1_1 libTKTopTest.so.7.9 occt-7.9.0_1
libTKXDEIGES.so.7.7 occt-7.7.1_1 libTKRWMesh.so.7.9 occt-7.9.0_1
libTKXDEDRAW.so.7.7 occt-7.7.1_1 libTKQADraw.so.7.9 occt-7.9.0_1
libTKXDECascade.so.7.7 occt-7.7.1_1 libTKernel.so.7.9 occt-7.9.0_1
libTKXDE.so.7.7 occt-7.7.1_1 libTKMeshVS.so.7.9 occt-7.9.0_1
libTKXCAF.so.7.7 occt-7.7.1_1 libTKTObj.so.7.9 occt-7.9.0_1
libTKViewerTest.so.7.7 occt-7.7.1_1 libTKBool.so.7.9 occt-7.9.0_1
libTKVRML.so.7.7 occt-7.7.1_1 libTKFeat.so.7.9 occt-7.9.0_1
libTKVCAF.so.7.7 occt-7.7.1_1 libTKXmlXCAF.so.7.9 occt-7.9.0_1
libTKV3d.so.7.7 occt-7.7.1_1 libTKDEIGES.so.7.9 occt-7.9.0_1
libTKTopTest.so.7.7 occt-7.7.1_1 libTKHLR.so.7.9 occt-7.9.0_1
libTKTopAlgo.so.7.7 occt-7.7.1_1 libTKBinL.so.7.9 occt-7.9.0_1
libTKTObjDRAW.so.7.7 occt-7.7.1_1 libTKBinXCAF.so.7.9 occt-7.9.0_1
libTKTObj.so.7.7 occt-7.7.1_1 libTKViewerTest.so.7.9 occt-7.9.0_1
libTKStdL.so.7.7 occt-7.7.1_1 libTKCDF.so.7.9 occt-7.9.0_1
libTKStd.so.7.7 occt-7.7.1_1 libTKXSDRAWPLY.so.7.9 occt-7.9.0_1
libTKShHealing.so.7.7 occt-7.7.1_1 libTKService.so.7.9 occt-7.9.0_1
libTKService.so.7.7 occt-7.7.1_1 libTKDEGLTF.so.7.9 occt-7.9.0_1
libTKSTL.so.7.7 occt-7.7.1_1 libTKGeomBase.so.7.9 occt-7.9.0_1
libTKSTEPBase.so.7.7 occt-7.7.1_1 libTKCAF.so.7.9 occt-7.9.0_1
libTKSTEPAttr.so.7.7 occt-7.7.1_1 libTKXDEDRAW.so.7.9 occt-7.9.0_1
libTKSTEP209.so.7.7 occt-7.7.1_1 libTKMesh.so.7.9 occt-7.9.0_1
libTKSTEP.so.7.7 occt-7.7.1_1 libTKDraw.so.7.9 occt-7.9.0_1
libTKRWMesh.so.7.7 occt-7.7.1_1 libTKTopAlgo.so.7.9 occt-7.9.0_1
libTKQADraw.so.7.7 occt-7.7.1_1 libTKTObjDRAW.so.7.9 occt-7.9.0_1
libTKPrim.so.7.7 occt-7.7.1_1 libTKXSDRAW.so.7.9 occt-7.9.0_1
libTKOpenGlTest.so.7.7 occt-7.7.1_1 libTKDCAF.so.7.9 occt-7.9.0_1
libTKOpenGl.so.7.7 occt-7.7.1_1 libTKStd.so.7.9 occt-7.9.0_1
libTKOffset.so.7.7 occt-7.7.1_1 libTKDE.so.7.9 occt-7.9.0_1
libTKMeshVS.so.7.7 occt-7.7.1_1 libTKXml.so.7.9 occt-7.9.0_1
libTKMesh.so.7.7 occt-7.7.1_1 libTKShHealing.so.7.9 occt-7.9.0_1
libTKMath.so.7.7 occt-7.7.1_1 libTKDECascade.so.7.9 occt-7.9.0_1
libTKLCAF.so.7.7 occt-7.7.1_1 libTKStdL.so.7.9 occt-7.9.0_1
libTKIGES.so.7.7 occt-7.7.1_1 libTKBin.so.7.9 occt-7.9.0_1
libTKHLR.so.7.7 occt-7.7.1_1 libTKXSDRAWDE.so.7.9 occt-7.9.0_1
libTKGeomBase.so.7.7 occt-7.7.1_1 libTKOffset.so.7.9 occt-7.9.0_1
libTKGeomAlgo.so.7.7 occt-7.7.1_1 libTKPrim.so.7.9 occt-7.9.0_1
libTKG3d.so.7.7 occt-7.7.1_1 libTKXSBase.so.7.9 occt-7.9.0_1
libTKG2d.so.7.7 occt-7.7.1_1 libTKXmlL.so.7.9 occt-7.9.0_1
libTKFillet.so.7.7 occt-7.7.1_1 libTKBinTObj.so.7.9 occt-7.9.0_1
libTKFeat.so.7.7 occt-7.7.1_1 libTKMath.so.7.9 occt-7.9.0_1
libTKExpress.so.7.7 occt-7.7.1_1 libTKBO.so.7.9 occt-7.9.0_1
libTKDraw.so.7.7 occt-7.7.1_1 libTKVCAF.so.7.9 occt-7.9.0_1
libTKDCAF.so.7.7 occt-7.7.1_1 libTKLCAF.so.7.9 occt-7.9.0_1
libTKCDF.so.7.7 occt-7.7.1_1 libTKV3d.so.7.9 occt-7.9.0_1
libTKCAF.so.7.7 occt-7.7.1_1 libTKDESTL.so.7.9 occt-7.9.0_1
libTKBool.so.7.7 occt-7.7.1_1 libTKXmlTObj.so.7.9 occt-7.9.0_1
libTKBinXCAF.so.7.7 occt-7.7.1_1 libTKOpenGl.so.7.9 occt-7.9.0_1
libTKBinTObj.so.7.7 occt-7.7.1_1 libTKGeomAlgo.so.7.9 occt-7.9.0_1
libTKBinL.so.7.7 occt-7.7.1_1 libTKXSDRAWIGES.so.7.9 occt-7.9.0_1
libTKBin.so.7.7 occt-7.7.1_1 libTKFillet.so.7.9 occt-7.9.0_1
libTKBRep.so.7.7 occt-7.7.1_1 libTKG2d.so.7.9 occt-7.9.0_1
libTKBO.so.7.7 occt-7.7.1_1 libTKOpenGlTest.so.7.9 occt-7.9.0_1
libTKXCAF.so.7.9 occt-7.9.0_1
libTKDEVRML.so.7.9 occt-7.9.0_1
libTKXMesh.so.7.9 occt-7.9.0_1
libTKXSDRAWSTEP.so.7.9 occt-7.9.0_1
libTKXSDRAWVRML.so.7.9 occt-7.9.0_1
libTKG3d.so.7.9 occt-7.9.0_1
libargon2.so.1 libargon2-20171227_1 libargon2.so.1 libargon2-20171227_1
libdazzle-1.0.so.0 libdazzle-3.28.0_1 libdazzle-1.0.so.0 libdazzle-3.28.0_1
libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1

2
srcpkgs/occt/patches/fix-cmake-regex.patch
View file

@ -3,7 +3,7 @@
--- a/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500 --- a/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500
+++ b/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500 +++ b/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()

2
srcpkgs/occt/patches/fix-install-dir.patch
View file

@ -1,7 +1,7 @@
diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake diff --color -upr occt-7.7.1.orig/adm/cmake/occt_macros.cmake occt-7.7.1/adm/cmake/occt_macros.cmake
--- occt-7.7.1.orig/adm/cmake/occt_macros.cmake 2023-05-31 20:05:47.619869450 +0200 --- occt-7.7.1.orig/adm/cmake/occt_macros.cmake 2023-05-31 20:05:47.619869450 +0200
+++ occt-7.7.1/adm/cmake/occt_macros.cmake 2023-05-31 20:07:25.611036417 +0200 +++ occt-7.7.1/adm/cmake/occt_macros.cmake 2023-05-31 20:07:25.611036417 +0200
@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE) @@ -762,7 +762,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
install (CODE install (CODE
"string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)

14
srcpkgs/occt/patches/fix-osd-host.patch
View file

@ -2,12 +2,12 @@
--- a/src/OSD/OSD_Host.cxx --- a/src/OSD/OSD_Host.cxx
+++ b/src/OSD/OSD_Host.cxx +++ b/src/OSD/OSD_Host.cxx
@@ -124,7 +124,7 @@ TCollection_AsciiString OSD_Host::InternetAddress(){ @@ -140,7 +140,7 @@ TCollection_AsciiString OSD_Host::InternetAddress(){
TCollection_AsciiString result, host;
host = HostName(); host = HostName();
memcpy(&internet_address, - memcpy(&internet_address, gethostbyname(host.ToCString()), sizeof(struct hostent));
- gethostbyname(host.ToCString()), + memcpy(&internet_address, gethostbyname("localhost"), sizeof(struct hostent));
+ gethostbyname("localhost"),
sizeof(struct hostent));
// Gets each bytes into integers // Gets each bytes into integers
a = (unsigned char)internet_address.h_addr_list[0][0];

38
srcpkgs/occt/patches/musl-fenv.patch
View file

@ -5,32 +5,32 @@ is probably wrong, but I don't have a replacement for the
non-posix functions fegetexcept(3) and feenableexcept(3). non-posix functions fegetexcept(3) and feenableexcept(3).
""" """
--- a/src/OSD/OSD_signal.cxx.orig 2022-07-22 10:53:38.000000000 +0200 --- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx 2022-10-06 09:19:02.286414340 +0200 +++ b/src/OSD/OSD_signal.cxx
@@ -761,7 +761,7 @@ typedef void (* SIG_PFV) (int); @@ -769,7 +769,7 @@ typedef void (*SIG_PFV)(int);
#include <signal.h> #include <signal.h>
-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) - #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__) + #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
#include <sys/signal.h> #include <sys/signal.h>
#endif #endif
@@ -977,7 +977,7 @@ static void SegvHandler(const int theSig @@ -994,7 +994,7 @@ static void SegvHandler(const int theSignal,
//=======================================================================
void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal) void OSD::SetFloatingSignal(Standard_Boolean theFloatingSignal)
{ {
-#if defined (__linux__) - #if defined(__linux__)
+#if defined (__linux__) && defined(__GLIBC__) + #if defined(__linux__) && defined(__GLIBC__)
feclearexcept (FE_ALL_EXCEPT); feclearexcept(FE_ALL_EXCEPT);
if (theFloatingSignal) if (theFloatingSignal)
{ {
@@ -1010,7 +1010,7 @@ void OSD::SetFloatingSignal (Standard_Bo @@ -1025,7 +1025,7 @@ void OSD::SetFloatingSignal(Standard_Boolean theFloatingSignal)
//=======================================================================
Standard_Boolean OSD::ToCatchFloatingSignals() Standard_Boolean OSD::ToCatchFloatingSignals()
{ {
-#if defined (__linux__) - #if defined(__linux__)
+#if defined (__linux__) && defined(__GLIBC__) + #if defined(__linux__) && defined(__GLIBC__)
return (fegetexcept() & _OSD_FPX) != 0; return (fegetexcept() & _OSD_FPX) != 0;
#else #else
return Standard_False; return Standard_False;

45
srcpkgs/occt/patches/musl-mallinfo.patch
View file

@ -1,21 +1,32 @@
In musl libc there is no struct mallinfo and no function mallinf() --- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
--- a/src/OSD/OSD_MemInfo.cxx.orig 2022-10-06 09:21:55.466236104 +0200 @@ -165,18 +165,23 @@ void OSD_MemInfo::Update()
+++ b/src/OSD/OSD_MemInfo.cxx 2022-10-06 09:25:34.105323581 +0200 #elif (defined(__linux__) || defined(__linux))
@@ -188,12 +188,16 @@ void OSD_MemInfo::Update() if (IsActive(MemHeapUsage))
{
- #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- #if __GLIBC_PREREQ(2, 33)
+ #if defined(__GLIBC__)
+ #define HAS_MALLINFO
+ #if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 33)
#define HAS_MALLINFO2
#endif
#endif #endif
#endif
+ #if defined(__GLIBC__) - #ifdef HAS_MALLINFO2
#ifdef HAS_MALLINFO2 - const struct mallinfo2 aMI = mallinfo2();
const struct mallinfo2 aMI = mallinfo2(); + #ifdef HAS_MALLINFO
#else + #ifdef HAS_MALLINFO2
const struct mallinfo aMI = mallinfo(); + const struct mallinfo2 aMI = mallinfo2();
#endif + #else
myCounters[MemHeapUsage] = aMI.uordblks; + const struct mallinfo aMI = mallinfo();
+ #else + #endif
+ myCounters[MemHeapUsage] = 0; + myCounters[MemHeapUsage] = aMI.uordblks;
+ #endif #else
- const struct mallinfo aMI = mallinfo();
+ myCounters[MemHeapUsage] = 0;
#endif
- myCounters[MemHeapUsage] = aMI.uordblks;
} }
if (!IsActive (MemVirtual) if (!IsActive(MemVirtual) && !IsActive(MemWorkingSet) && !IsActive(MemWorkingSetPeak)

10
srcpkgs/occt/template
View file

@ -1,13 +1,11 @@
# Template file for 'occt' # Template file for 'occt'
pkgname=occt pkgname=occt
version=7.7.1 version=7.9.0
revision=1 revision=1
_gittag="V${version//./_}" _gittag="V${version//./_}"
build_style=cmake build_style=cmake
# XXX: re-enable -DUSE_TBB=ON if possible when updating configure_args="-DUSE_TBB=ON -DUSE_FREEIMAGE=ON -DUSE_VTK=OFF"
configure_args="-DUSE_FREEIMAGE=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF makedepends="tbb-devel freetype-devel glu-devel freeimage-devel tcl-devel
-DINSTALL_SAMPLES=ON"
makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tcl-devel
tk-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 <mail@piraty.dev>" maintainer="Piraty <mail@piraty.dev>"
@ -16,7 +14,7 @@ homepage="https://www.opencascade.com"
# distfile: use git instead of official tarball, which requires registration # distfile: use git instead of official tarball, which requires registration
# see https://www.opencascade.com/content/packaging-again-debian # see https://www.opencascade.com/content/packaging-again-debian
distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz" distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
checksum=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12 checksum=ff118a524ec451867e8f0ac3b631522c98f2b4353c7dbf2786bf239589909ec6
conflicts="oce>=0" conflicts="oce>=0"
if [ "$XBPS_TARGET_LIBC" = musl ]; then if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel" makedepends+=" libexecinfo-devel"