aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAiden Grossman <agrossman154@yahoo.com>2021-07-12 00:43:05 -0700
committerLeo <thinkabit.ukim@gmail.com>2021-07-13 12:17:56 +0000
commit229375d8f413a9e84b291dbb677beed44aa0975e (patch)
tree8b1e255c96825fdcd9fc7b08f4736357170da8b1
parent99421544f9f93a0fa9d36dcb448c1d3f71544a62 (diff)
downloadaports-229375d8f413a9e84b291dbb677beed44aa0975e.tar.gz
aports-229375d8f413a9e84b291dbb677beed44aa0975e.tar.bz2
aports-229375d8f413a9e84b291dbb677beed44aa0975e.tar.xz
testing/opencascade: upgrade to 7.5.0
-rw-r--r--testing/opencascade/APKBUILD15
-rw-r--r--testing/opencascade/no_mallinfo.patch57
2 files changed, 50 insertions, 22 deletions
diff --git a/testing/opencascade/APKBUILD b/testing/opencascade/APKBUILD
index 8ffb977088..2a4cda9aa4 100644
--- a/testing/opencascade/APKBUILD
+++ b/testing/opencascade/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=opencascade
-pkgver=7.4.0
-pkgrel=1
+pkgver=7.5.0
+pkgrel=0
pkgdesc="An SDK for development of applications dealing with 3D CAD data"
url="https://dev.opencascade.org/"
arch="x86_64" # Dependency vtk is x86_64 only
@@ -43,7 +43,8 @@ build() {
-DUSE_FREEIMAGE=ON \
-DUSE_FFMPEG=ON \
-DUSE_VTK=ON \
- -DUSE_TBB=ON
+ -DUSE_TBB=ON \
+ -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk-9.0/
make
}
@@ -52,8 +53,10 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a opencascade-7.4.0.tar.gz
-01ee778de7ef95a479c87445d1d062e5d858879e211d2c312f801133e35f768cc70d00e3f3fae00f39c60473641c78517d16d63425dd2dd7e19f3079d2cf1a51 no_mallinfo.patch
+sha512sums="
+90cd49acbfb4b2d896676239650da0d2c8cee6bc1d940dde98da0e6f49d2e37936ff8924bdf98f20a2dd281342e441186839be084ef910cc4baab34e7235ec16 opencascade-7.5.0.tar.gz
+e31be16775fbc316112d970e652df361a7b91d6d1c852c06fa283b441839b21115d274be981b9bdd4cf5c7a27181bc7d5c24faa75d4bb6d13593614574f8900e no_mallinfo.patch
b039b8fce696bfd0f53309a72adab4065780bf1755da6208040157e9383deb0061ad8927a6f160730f431cbebe3fdd1eaa7967b38da4a245a8d9306042d97629 no_feenableexcept.patch
10481f153adf1db55111d68da49dae1885a50e745d3a978f6316b5b13a3f2d7de6a2ed6a3c60c20ef967ea65c16b372da03bf2665ffe4493ad6fe329a3abf368 cmake_fix_install_dir.patch
-4bdedc8f0e011530115777cddeeb898750242999725347c3392d8858e5cc9543c791814aa41e1543c575a6a79b0b32fd72970bb83c8948fe42f33993244db1cf cmake_add_buildtype_none.patch"
+4bdedc8f0e011530115777cddeeb898750242999725347c3392d8858e5cc9543c791814aa41e1543c575a6a79b0b32fd72970bb83c8948fe42f33993244db1cf cmake_add_buildtype_none.patch
+"
diff --git a/testing/opencascade/no_mallinfo.patch b/testing/opencascade/no_mallinfo.patch
index 6aef939aed..ac0ebd7e3c 100644
--- a/testing/opencascade/no_mallinfo.patch
+++ b/testing/opencascade/no_mallinfo.patch
@@ -5,24 +5,49 @@ the maximum resident set size as a (poor) approximation of the heap usage.
@@ -35,6 +35,9 @@
#include <sstream>
#include <fstream>
-
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
#include <OSD_MemInfo.hxx>
-
- // =======================================================================
-@@ -147,8 +150,11 @@
+
+ #if defined(__EMSCRIPTEN__)
+@@ -161,18 +164,22 @@
+ || IsActive (MemWorkingSetPeak))
+ {
+ // /proc/%d/status is not emulated - get more info from mallinfo()
+- const struct mallinfo aMI = mallinfo();
++ // mallinfo() not available with musl. We use getrusage to approximate it
++ // with the maximum resident set size
++ struct rusage ru = { .ru_maxrss = 0 };
++ getrusage(RUSAGE_SELF, &ru);
+ if (IsActive (MemHeapUsage))
+ {
+- myCounters[MemHeapUsage] = aMI.uordblks;
++ myCounters[MemHeapUsage] = ru.ru_maxrss;
+ }
+ if (IsActive (MemWorkingSet))
+ {
+- myCounters[MemWorkingSet] = aMI.uordblks;
++ myCounters[MemWorkingSet] = ru.ru_maxrss;
+ }
+ if (IsActive (MemWorkingSetPeak))
+ {
+- myCounters[MemWorkingSetPeak] = aMI.usmblks;
++ //usmblks is always 0
++ myCounters[MemWorkingSetPeak] = 0;
+ }
}
- aFile.close();
-
-- struct mallinfo aMI = mallinfo();
-- myCounters[MemHeapUsage] = aMI.uordblks;
-+ // mallinfo() not available with musl. We use getrusage to approximate it
-+ // with the maximum resident set size
-+ struct rusage ru = { .ru_maxrss = 0 };
-+ getrusage(RUSAGE_SELF, &ru);
-+ myCounters[MemHeapUsage] = ru.ru_maxrss;
-
- #elif (defined(__APPLE__))
- struct task_basic_info aTaskInfo;
+ if (IsActive (MemVirtual))
+@@ -182,8 +189,9 @@
+ #elif (defined(__linux__) || defined(__linux))
+ if (IsActive (MemHeapUsage))
+ {
+- const struct mallinfo aMI = mallinfo();
+- myCounters[MemHeapUsage] = aMI.uordblks;
++ struct rusage ru = { .ru_maxrss = 0 };
++ getrusage(RUSAGE_SELF, &ru);
++ myCounters[MemHeapUsage] = ru.ru_maxrss;
+ }
+
+ if (!IsActive (MemVirtual)