moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

occt: update to 7.7.1.

Browse source
This commit is contained in:
Enno Boland 2022-10-06 11:45:57 +02:00 • committed by Enno T. Boland
parent 47badad211
commit f8b9c7d0dd
6 changed files with 101 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
common/shlibs
View file

@ -3397,63 +3397,67 @@ libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
libTKBin.so.7 occt-7.2.0p1_1
libTKDraw.so.7 occt-7.2.0p1_1
libTKSTEP209.so.7 occt-7.2.0p1_1
libTKOpenGl.so.7 occt-7.2.0p1_1
libTKBinTObj.so.7 occt-7.2.0p1_1
libTKSTL.so.7 occt-7.2.0p1_1
libTKViewerTest.so.7 occt-7.2.0p1_1
libTKCAF.so.7 occt-7.2.0p1_1
libTKService.so.7 occt-7.2.0p1_1
libTKV3d.so.7 occt-7.2.0p1_1
libTKXCAF.so.7 occt-7.2.0p1_1
libTKMesh.so.7 occt-7.2.0p1_1
libTKSTEP.so.7 occt-7.2.0p1_1
libTKMath.so.7 occt-7.2.0p1_1
libTKLCAF.so.7 occt-7.2.0p1_1
libTKShHealing.so.7 occt-7.2.0p1_1
libTKGeomAlgo.so.7 occt-7.2.0p1_1
libTKTObjDRAW.so.7 occt-7.2.0p1_1
libTKTObj.so.7 occt-7.2.0p1_1
libTKStd.so.7 occt-7.2.0p1_1
libTKSTEPBase.so.7 occt-7.2.0p1_1
libTKIGES.so.7 occt-7.2.0p1_1
libTKGeomBase.so.7 occt-7.2.0p1_1
libTKFillet.so.7 occt-7.2.0p1_1
libTKFeat.so.7 occt-7.2.0p1_1
libTKG2d.so.7 occt-7.2.0p1_1
libTKXSBase.so.7 occt-7.2.0p1_1
libTKDCAF.so.7 occt-7.2.0p1_1
libTKXml.so.7 occt-7.2.0p1_1
libTKTopTest.so.7 occt-7.2.0p1_1
libTKG3d.so.7 occt-7.2.0p1_1
libTKBRep.so.7 occt-7.2.0p1_1
libTKVRML.so.7 occt-7.2.0p1_1
libTKCDF.so.7 occt-7.2.0p1_1
libTKXSDRAW.so.7 occt-7.2.0p1_1
libTKXMesh.so.7 occt-7.2.0p1_1
libTKernel.so.7 occt-7.2.0p1_1
libTKTopAlgo.so.7 occt-7.2.0p1_1
libTKHLR.so.7 occt-7.2.0p1_1
libTKBinXCAF.so.7 occt-7.2.0p1_1
libTKVCAF.so.7 occt-7.2.0p1_1
libTKBinL.so.7 occt-7.2.0p1_1
libTKXmlXCAF.so.7 occt-7.2.0p1_1
libTKXDEIGES.so.7 occt-7.2.0p1_1
libTKBO.so.7 occt-7.2.0p1_1
libTKStdL.so.7 occt-7.2.0p1_1
libTKXDEDRAW.so.7 occt-7.2.0p1_1
libTKXmlTObj.so.7 occt-7.2.0p1_1
libTKPrim.so.7 occt-7.2.0p1_1
libTKMeshVS.so.7 occt-7.2.0p1_1
libTKSTEPAttr.so.7 occt-7.2.0p1_1
libTKBool.so.7 occt-7.2.0p1_1
libTKOffset.so.7 occt-7.2.0p1_1
libTKXDESTEP.so.7 occt-7.2.0p1_1
libTKQADraw.so.7 occt-7.2.0p1_1
libTKXmlL.so.7 occt-7.2.0p1_1
libTKRWMesh.so.7 occt-7.4.0_1
libTKernel.so.7.7 occt-7.7.1_1
libTKXmlXCAF.so.7.7 occt-7.7.1_1
libTKXmlTObj.so.7.7 occt-7.7.1_1
libTKXmlL.so.7.7 occt-7.7.1_1
libTKXml.so.7.7 occt-7.7.1_1
libTKXSDRAW.so.7.7 occt-7.7.1_1
libTKXSBase.so.7.7 occt-7.7.1_1
libTKXMesh.so.7.7 occt-7.7.1_1
libTKXDESTEP.so.7.7 occt-7.7.1_1
libTKXDEIGES.so.7.7 occt-7.7.1_1
libTKXDEDRAW.so.7.7 occt-7.7.1_1
libTKXDECascade.so.7.7 occt-7.7.1_1
libTKXDE.so.7.7 occt-7.7.1_1
libTKXCAF.so.7.7 occt-7.7.1_1
libTKViewerTest.so.7.7 occt-7.7.1_1
libTKVRML.so.7.7 occt-7.7.1_1
libTKVCAF.so.7.7 occt-7.7.1_1
libTKV3d.so.7.7 occt-7.7.1_1
libTKTopTest.so.7.7 occt-7.7.1_1
libTKTopAlgo.so.7.7 occt-7.7.1_1
libTKTObjDRAW.so.7.7 occt-7.7.1_1
libTKTObj.so.7.7 occt-7.7.1_1
libTKStdL.so.7.7 occt-7.7.1_1
libTKStd.so.7.7 occt-7.7.1_1
libTKShHealing.so.7.7 occt-7.7.1_1
libTKService.so.7.7 occt-7.7.1_1
libTKSTL.so.7.7 occt-7.7.1_1
libTKSTEPBase.so.7.7 occt-7.7.1_1
libTKSTEPAttr.so.7.7 occt-7.7.1_1
libTKSTEP209.so.7.7 occt-7.7.1_1
libTKSTEP.so.7.7 occt-7.7.1_1
libTKRWMesh.so.7.7 occt-7.7.1_1
libTKQADraw.so.7.7 occt-7.7.1_1
libTKPrim.so.7.7 occt-7.7.1_1
libTKOpenGlTest.so.7.7 occt-7.7.1_1
libTKOpenGl.so.7.7 occt-7.7.1_1
libTKOffset.so.7.7 occt-7.7.1_1
libTKMeshVS.so.7.7 occt-7.7.1_1
libTKMesh.so.7.7 occt-7.7.1_1
libTKMath.so.7.7 occt-7.7.1_1
libTKLCAF.so.7.7 occt-7.7.1_1
libTKIGES.so.7.7 occt-7.7.1_1
libTKHLR.so.7.7 occt-7.7.1_1
libTKGeomBase.so.7.7 occt-7.7.1_1
libTKGeomAlgo.so.7.7 occt-7.7.1_1
libTKG3d.so.7.7 occt-7.7.1_1
libTKG2d.so.7.7 occt-7.7.1_1
libTKFillet.so.7.7 occt-7.7.1_1
libTKFeat.so.7.7 occt-7.7.1_1
libTKExpress.so.7.7 occt-7.7.1_1
libTKDraw.so.7.7 occt-7.7.1_1
libTKDCAF.so.7.7 occt-7.7.1_1
libTKCDF.so.7.7 occt-7.7.1_1
libTKCAF.so.7.7 occt-7.7.1_1
libTKBool.so.7.7 occt-7.7.1_1
libTKBinXCAF.so.7.7 occt-7.7.1_1
libTKBinTObj.so.7.7 occt-7.7.1_1
libTKBinL.so.7.7 occt-7.7.1_1
libTKBin.so.7.7 occt-7.7.1_1
libTKBRep.so.7.7 occt-7.7.1_1
libTKBO.so.7.7 occt-7.7.1_1
libargon2.so.1 libargon2-20171227_1
libdazzle-1.0.so.0 libdazzle-3.28.0_1
libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1

13
srcpkgs/occt/patches/cmake-build-type-none.patch
View file

@ -1,13 +0,0 @@
Index: CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
set (CMAKE_SUPPRESS_REGENERATION TRUE)
-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
# macro: include patched file if it exists
macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)

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

@ -1,26 +1,12 @@
# fix cmake install dir references
# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
--- a/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100
+++ b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100
@@ -906,7 +906,7 @@
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\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
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/adm/cmake/occt_macros.cmake 2023-05-31 20:07:25.611036417 +0200
@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE})
--- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100
+++ b/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100
@@ -558,7 +558,7 @@
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
install (CODE
"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 \"\$ENV{DESTDIR}${INSTALL_DIR}/${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}\")
<Paste>

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

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

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

@ -1,17 +1,21 @@
In musl libc there is no struct mallinfo and no function mallinf()
--- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
@@ -147,8 +147,12 @@
}
aFile.close();
--- a/src/OSD/OSD_MemInfo.cxx.orig 2022-10-06 09:21:55.466236104 +0200
+++ b/src/OSD/OSD_MemInfo.cxx 2022-10-06 09:25:34.105323581 +0200
@@ -188,12 +188,16 @@ void OSD_MemInfo::Update()
#endif
#endif
+ #if defined(__GLIBC__)
struct mallinfo aMI = mallinfo();
myCounters[MemHeapUsage] = aMI.uordblks;
+ #else /* XXX not yet coded */
+ myCounters[MemHeapUsage] = 0;
#ifdef HAS_MALLINFO2
const struct mallinfo2 aMI = mallinfo2();
#else
const struct mallinfo aMI = mallinfo();
#endif
myCounters[MemHeapUsage] = aMI.uordblks;
+ #else
+ myCounters[MemHeapUsage] = 0;
+ #endif
}
#elif (defined(__APPLE__))
struct task_basic_info aTaskInfo;
if (!IsActive (MemVirtual)

16
srcpkgs/occt/template
View file

@ -1,8 +1,7 @@
# Template file for 'occt'
pkgname=occt
reverts=7.5.0_1
version=7.4.0p1
revision=5
version=7.7.1
revision=1
_gittag="V${version//./_}"
build_style=cmake
# XXX: re-enable -DUSE_TBB=ON if possible when updating
@ -17,8 +16,17 @@ homepage="https://www.opencascade.com"
# distfile: use git instead of official tarball, which requires registration
# 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"
checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
checksum=f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12
conflicts="oce>=0"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
fi
pre_build() {
cp build/OpenCASCADECompileDefinitionsAndFlags-release.cmake \
build/OpenCASCADECompileDefinitionsAndFlags-none.cmake
}
post_install() {
rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt