diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | cork.patch | 13 |
3 files changed, 5 insertions, 18 deletions
@@ -42,7 +42,7 @@ pkgbase = cloudcompare sha256sums = SKIP sha256sums = SKIP sha256sums = 984e6186f6483534a52cb153b65dee016904eb9efdb89211c2c0042eea2417ff - sha256sums = 3f8692fbff2b92ebf422f2c4de46f2f9164cd37879092c66f171b32fea464227 + sha256sums = 1789d726d65478857633fa4797da7c3ea4c13d90cdcc169d4197c58d2d33f123 sha256sums = 183f05dee316bdf7c6e9935e2a21b79b2172f61df5b0b6954bcd0d74751afc64 sha256sums = 14096df9cf7aca3099d5df1585d1cf669544e9b10754dce3d2507100dd7034fe sha256sums = 821ac2540e1196774e26f8033946ce7b36223dae7a2a7c78f4a901b4177f68cc @@ -28,7 +28,7 @@ source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git${_fragmen sha256sums=('SKIP' 'SKIP' '984e6186f6483534a52cb153b65dee016904eb9efdb89211c2c0042eea2417ff' - '3f8692fbff2b92ebf422f2c4de46f2f9164cd37879092c66f171b32fea464227' + '1789d726d65478857633fa4797da7c3ea4c13d90cdcc169d4197c58d2d33f123' '183f05dee316bdf7c6e9935e2a21b79b2172f61df5b0b6954bcd0d74751afc64' '14096df9cf7aca3099d5df1585d1cf669544e9b10754dce3d2507100dd7034fe' '821ac2540e1196774e26f8033946ce7b36223dae7a2a7c78f4a901b4177f68cc') @@ -44,7 +44,7 @@ build() { CMAKE_FLAGS=( -Wno-dev -DCMAKE_CXX_STANDARD=14 - -DCMAKE_CXX_FLAGS=-fpermissive + -DCMAKE_CXX_FLAGS="$CXXFLAGS -fpermissive -DSUPPORT_TOPO_STREAM_OPERATORS -Wno-deprecated-declarations" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release @@ -94,9 +94,9 @@ build() { -DEIGEN_ROOT_DIR=/usr/include/eigen3 ) msg2 "Build Cork lib" - make -C "${srcdir}/${name}-cork" + make -C "${srcdir}/${name}-cork" CXXFLAGS="$CXXFLAGS -DSUPPORT_TOPO_STREAM_OPERATORS" msg2 "Build CloudCompare" - cmake -B build -S "${srcdir}/${name}" -G Ninja "${CMAKE_FLAGS[@]}" -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-deprecated-declarations" + cmake -B build -S "${srcdir}/${name}" -G Ninja "${CMAKE_FLAGS[@]}" # shellcheck disable=SC2086 # allow slitting for MAKEFLAGS carrying multiple flags. ninja -C build ${MAKEFLAGS:--j1} } diff --git a/cork.patch b/cork.patch index 370b0260eb10..904c37c3abbf 100644 --- a/cork.patch +++ b/cork.patch @@ -51,19 +51,6 @@ index a0acc15..69d33a8 100644 //exit(1); } -diff --git a/src/mesh/mesh.topoCache.tpp b/src/mesh/mesh.topoCache.tpp -index cf225d6..b648d5f 100644 ---- a/src/mesh/mesh.topoCache.tpp -+++ b/src/mesh/mesh.topoCache.tpp -@@ -504,7 +504,7 @@ void Mesh<VertData, TriData>::TopoCache::print() - cout << "TRIS" << endl; - int tri_count = 0; - tris.for_each([&](Tptr t) { -- cout << " " << t << ": " << *t << endl; -+ cout << " " << t << ": " << endl; - tri_count++; - }); - cout << "There were " << tri_count << " TRIS" << endl; diff --git a/src/util/prelude.h b/src/util/prelude.h index 6836ace..6981d20 100644 --- a/src/util/prelude.h |