[Git][debian-gis-team/sfcgal][upstream] New upstream version 1.3.10
Bas Couwenberg
gitlab at salsa.debian.org
Sun Apr 18 08:57:53 BST 2021
Bas Couwenberg pushed to branch upstream at Debian GIS Project / sfcgal
Commits:
18925bfe by Bas Couwenberg at 2021-04-18T07:00:52+02:00
New upstream version 1.3.10
- - - - -
9 changed files:
- .gitlab-ci.yml
- CMakeLists.txt
- README.md
- ci/centos/before_install.sh
- ci/debian/before_install.sh
- src/algorithm/straightSkeleton.cpp
- src/detail/generator/building.cpp
- test/data/StraightSkeletonTest/issue111.txt
- test/regress/standalone/SFCGAL/StraightSkeletonTest.cpp
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -1,73 +1,221 @@
-debian_testing_gcc:
+debian_testing_gcc_cgal50:
image: debian:testing
script:
- apt-get update -qq
- apt-get install --yes sudo wget build-essential
- - ./ci/debian/before_install.sh 5.0.2
+ - ./ci/debian/before_install.sh 5.0.4
- cd $CI_PROJECT_DIR
- CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
- make
- ctest -VV
-debian_buster_gcc:
+debian_buster_gcc_cgal50:
image: debian:buster
script:
- apt-get update -qq
- apt-get install --yes sudo wget build-essential
- - ./ci/debian/before_install.sh 5.0.2
+ - ./ci/debian/before_install.sh 5.0.4
- cd $CI_PROJECT_DIR
- CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
- make
- ctest -VV
-debian_testing_clang:
+debian_testing_clang_cgal50:
image: debian:testing
script:
- apt-get update -qq
- apt-get install --yes sudo wget clang
- - ./ci/debian/before_install.sh 5.0.2
+ - ./ci/debian/before_install.sh 5.0.4
- cd $CI_PROJECT_DIR
- CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
- make
- ctest -VV
-debian_buster_clang:
+debian_buster_clang_cgal50:
image: debian:buster
script:
- apt-get update -qq
- apt-get install --yes sudo wget clang
- - ./ci/debian/before_install.sh 5.0.2
+ - ./ci/debian/before_install.sh 5.0.4
- cd $CI_PROJECT_DIR
- CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
- make
- ctest -VV
-centos8_clang:
+centos8_clang_cgal50:
image: centos:centos8
-
+
+ script:
+ - yum update -qy
+ - yum install -y sudo wget clang
+ - ./ci/centos/before_install.sh 5.0.4
+ - cd $CI_PROJECT_DIR
+ - ls
+ - find / -name "*CGAL*"
+ - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.0.4
+ - make
+ - ctest -VV
+
+centos8_gcc_cgal50:
+ image: centos:centos8
+
+ script:
+ - yum update -qy
+ - yum install -y sudo wget gcc-c++
+ - ./ci/centos/before_install.sh 5.0.4
+ - cd $CI_PROJECT_DIR
+ - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.0.4
+ - make
+ - ctest -VV
+
+debian_testing_gcc_cgal51:
+ image: debian:testing
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget build-essential
+ - ./ci/debian/before_install.sh 5.1.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
+ - make
+ - ctest -VV
+
+debian_buster_gcc_cgal51:
+ image: debian:buster
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget build-essential
+ - ./ci/debian/before_install.sh 5.1.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
+ - make
+ - ctest -VV
+
+debian_testing_clang_cgal51:
+ image: debian:testing
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget clang
+ - ./ci/debian/before_install.sh 5.1.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
+ - make
+ - ctest -VV
+
+debian_buster_clang_cgal51:
+ image: debian:buster
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget clang
+ - ./ci/debian/before_install.sh 5.1.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
+ - make
+ - ctest -VV
+
+centos8_clang_cgal51:
+ image: centos:centos8
+
script:
- yum update -qy
- yum install -y sudo wget clang
- - ./ci/centos/before_install.sh 5.0.2
+ - ./ci/centos/before_install.sh 5.1.1
- cd $CI_PROJECT_DIR
- ls
- find / -name "*CGAL*"
- - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.0.2
+ - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.1.1
- make
- ctest -VV
-centos8_gcc:
+centos8_gcc_cgal51:
image: centos:centos8
-
+
+ script:
+ - yum update -qy
+ - yum install -y sudo wget gcc-c++
+ - ./ci/centos/before_install.sh 5.1.1
+ - cd $CI_PROJECT_DIR
+ - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.1.1
+ - make
+ - ctest -VV
+
+debian_testing_gcc_cgal52:
+ image: debian:testing
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget build-essential
+ - ./ci/debian/before_install.sh 5.2.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
+ - make
+ - ctest -VV
+
+debian_buster_gcc_cgal52:
+ image: debian:buster
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget build-essential
+ - ./ci/debian/before_install.sh 5.2.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
+ - make
+ - ctest -VV
+
+debian_testing_clang_cgal52:
+ image: debian:testing
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget clang
+ - ./ci/debian/before_install.sh 5.2.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
+ - make
+ - ctest -VV
+
+debian_buster_clang_cgal52:
+ image: debian:buster
+
+ script:
+ - apt-get update -qq
+ - apt-get install --yes sudo wget clang
+ - ./ci/debian/before_install.sh 5.2.1
+ - cd $CI_PROJECT_DIR
+ - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++
+ - make
+ - ctest -VV
+
+centos8_clang_cgal52:
+ image: centos:centos8
+
+ script:
+ - yum update -qy
+ - yum install -y sudo wget clang
+ - ./ci/centos/before_install.sh 5.2.1
+ - cd $CI_PROJECT_DIR
+ - ls
+ - find / -name "*CGAL*"
+ - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.2.1
+ - make
+ - ctest -VV
+
+centos8_gcc_cgal52:
+ image: centos:centos8
+
script:
- yum update -qy
- yum install -y sudo wget gcc-c++
- - ./ci/centos/before_install.sh 5.0.2
+ - ./ci/centos/before_install.sh 5.2.1
- cd $CI_PROJECT_DIR
- - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.0.2
+ - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-5.2.1
- make
- ctest -VV
=====================================
CMakeLists.txt
=====================================
@@ -33,7 +33,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules;${CMAKE_MODULE_PATH}"
set( SFCGAL_VERSION_MAJOR 1 )
set( SFCGAL_VERSION_MINOR 3 )
-set( SFCGAL_VERSION_PATCH 8 )
+set( SFCGAL_VERSION_PATCH 10 )
set( SFCGAL_VERSION "${SFCGAL_VERSION_MAJOR}.${SFCGAL_VERSION_MINOR}.${SFCGAL_VERSION_PATCH}" )
=====================================
README.md
=====================================
@@ -1,6 +1,11 @@
-SFCGAL
-======
+# SFCGAL
SFCGAL is a C++ wrapper library around [CGAL](http://www.cgal.org) with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations.
-Please refer to the <a href="http://oslandia.github.io/SFCGAL">project page</a> for an updated installation procedure.
+Please refer to the <a href="http://oslandia.gitlab.io/SFCGAL">project page</a> for an updated installation procedure.
+
+## Licence
+
+SFCGAL is provided under the following licence LGPL version 2 or later.
+
+:warning: Note that the main dependency for SFCGAL is the CGAL library, and SFCGAL uses CGAL modules which are licenced as GPLv3+. Whenever you compile and distribute SCFGAL with the GPL-licenced CGAL, the full packaged result is automatically considered as GPL version 3 or later, due to GPL "viral" property. **If you link and distribute SFCGAL with another software package, be assured to fully understand the implications and check any legal and technical requirements implied by the licence**.
=====================================
ci/centos/before_install.sh
=====================================
@@ -3,7 +3,7 @@ sudo yum install -y \
cmake boost boost-devel gmp gmp-c++ gmp-devel mpfr mpfr-devel make
#CGAL
-wget https://github.com/CGAL/cgal/releases/download/releases/CGAL-"$1"/CGAL-"$1".tar.xz
+wget https://github.com/CGAL/cgal/releases/download/v"$1"/CGAL-"$1".tar.xz
tar xJf CGAL-"$1".tar.xz
cd CGAL-"$1" && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$CI_PROJECT_DIR/CGAL .. && make && make install && cd ../..
=====================================
ci/debian/before_install.sh
=====================================
@@ -8,7 +8,7 @@ sudo apt-get install --yes \
cmake
#CGAL
-wget https://github.com/CGAL/cgal/releases/download/releases/CGAL-"$1"/CGAL-"$1".tar.xz
+wget https://github.com/CGAL/cgal/releases/download/v"$1"/CGAL-"$1".tar.xz
tar xJf CGAL-"$1".tar.xz
cd CGAL-"$1" && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$CI_PROJECT_DIR/CGAL .. && make && make install && cd ../..
=====================================
src/algorithm/straightSkeleton.cpp
=====================================
@@ -140,7 +140,7 @@ void straightSkeletonToMedialAxis(
// of exactly 45 degrees that are otherwise cut out due
// to rounding precision
//
- const double maxTouchingAngle = CGAL_PI / 8.0 + 1e-15;
+ const double maxTouchingAngle = CGAL_PI / 8.0 + 1e-13;
for ( Halfedge_const_iterator it = ss.halfedges_begin(); it != ss.halfedges_end(); ++it ) {
// skip contour edge
=====================================
src/detail/generator/building.cpp
=====================================
@@ -100,7 +100,12 @@ std::unique_ptr< Geometry > building(
// fix orientation
algorithm::makeValidOrientation( polygon ) ;
- boost::shared_ptr< Straight_skeleton_2 > skeleton = CGAL::create_interior_straight_skeleton_2( polygon ) ;
+ boost::shared_ptr< Straight_skeleton_2 > skeleton =
+ create_interior_straight_skeleton_2(polygon.outer_boundary().vertices_begin()
+ ,polygon.outer_boundary().vertices_end()
+ ,polygon.holes_begin()
+ ,polygon.holes_end()
+ ,Kernel());
std::unique_ptr< PolyhedralSurface > shell( new PolyhedralSurface );
// bottom part
=====================================
test/data/StraightSkeletonTest/issue111.txt
=====================================
The diff for this file was not included because it is too large.
=====================================
test/regress/standalone/SFCGAL/StraightSkeletonTest.cpp
=====================================
@@ -40,6 +40,8 @@
#include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp>
+#include <CGAL/version.h>
+
using namespace boost::unit_test ;
using namespace SFCGAL ;
@@ -98,7 +100,9 @@ namespace {
}
std::string obt = lbl + obtWkt;
std::string exp = lbl + outputWkt;
- BOOST_CHECK_EQUAL( exp, obt );
+ if ( (CGAL_VERSION_MAJOR == 5) && (CGAL_VERSION_MINOR >= 2)) {
+ BOOST_CHECK_EQUAL( exp, obt );
+ }
}
}
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/commit/18925bfe0597231f2ce94845acb8b40b6d842b78
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/commit/18925bfe0597231f2ce94845acb8b40b6d842b78
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210418/4d6b581c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list