[Git][debian-gis-team/sfcgal][master] 11 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Aug 15 13:25:49 BST 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal
Commits:
2a82b3a4 by Bas Couwenberg at 2021-04-18T07:00:27+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
18925bfe by Bas Couwenberg at 2021-04-18T07:00:52+02:00
New upstream version 1.3.10
- - - - -
14d19a2a by Bas Couwenberg at 2021-04-18T07:00:55+02:00
Update upstream source from tag 'upstream/1.3.10'
Update to upstream version '1.3.10'
with Debian dir 6c4d9f006184c6a88690739e4bd154d5af3ba03b
- - - - -
6fa0fb45 by Bas Couwenberg at 2021-04-18T07:01:17+02:00
New upstream release.
- - - - -
cba2e789 by Bas Couwenberg at 2021-04-18T07:04:39+02:00
Drop patches applied upstream.
- - - - -
9acae1ca by Bas Couwenberg at 2021-04-18T08:00:13+02:00
Update lintian overrides.
- - - - -
4c33589d by Bas Couwenberg at 2021-04-18T08:00:13+02:00
Update symbols for amd64.
- - - - -
037a4fa1 by Bas Couwenberg at 2021-04-18T08:00:13+02:00
Set distribution to experimental.
- - - - -
79c6d6d2 by Bas Couwenberg at 2021-04-18T14:38:14+02:00
Update symbols for other architectures.
- - - - -
22a93565 by Bas Couwenberg at 2021-08-15T14:00:37+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 2a82b3a433479beff2a3812d52746ec065c98820.
- - - - -
57c135f7 by Bas Couwenberg at 2021-08-15T14:00:44+02:00
Move from experimental to unstable.
- - - - -
16 changed files:
- .gitlab-ci.yml
- CMakeLists.txt
- README.md
- ci/centos/before_install.sh
- ci/debian/before_install.sh
- debian/changelog
- debian/libsfcgal1.lintian-overrides
- debian/libsfcgal1.symbols
- − debian/patches/0001-specify-Kernel.patch
- − debian/patches/StraightSkeletonTest.patch
- debian/patches/series
- − debian/patches/sfcgal_cTest.patch
- 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 ../..
=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+sfcgal (1.3.10-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 15 Aug 2021 14:00:39 +0200
+
+sfcgal (1.3.10-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop patches applied upstream.
+ * Update lintian overrides.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 18 Apr 2021 07:04:44 +0200
+
sfcgal (1.3.9-2) unstable; urgency=medium
* Bump watch file version to 4.
=====================================
debian/libsfcgal1.lintian-overrides
=====================================
@@ -1,6 +1,3 @@
# False positive, string not included in source
spelling-error-in-binary * bounary boundary
-# Cannot easily be fixed
-file-references-package-build-path *
-
=====================================
debian/libsfcgal1.symbols
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/patches/0001-specify-Kernel.patch deleted
=====================================
@@ -1,24 +0,0 @@
-Description: specify Kernel
- The CGAL API was buggy and has been fixed in CGAL 5.2.
- The change is compatible with previous releases of CGAL too.
-Author: Sébastien Loriot <sebastien.loriot at cgal.org>
-Origin: https://gitlab.com/Oslandia/SFCGAL/-/commit/d07ed747e7f06acb22d5891ece789b331cff14c5
-Bug: https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/237
-Bug-Debian: https://bugs.debian.org/978173
-
---- a/src/detail/generator/building.cpp
-+++ b/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
=====================================
debian/patches/StraightSkeletonTest.patch deleted
=====================================
@@ -1,22 +0,0 @@
-Description: Disable test failing with CGAL 5.2.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/237
-
---- a/test/regress/standalone/SFCGAL/StraightSkeletonTest.cpp
-+++ b/test/regress/standalone/SFCGAL/StraightSkeletonTest.cpp
-@@ -89,6 +89,7 @@ namespace {
- BOOST_CHECK_EQUAL("", ss.str());
- continue;
- }
-+/*
- std::unique_ptr< MultiLineString > result;
- try {
- result = algorithm::straightSkeleton( *g ) ;
-@@ -99,6 +100,7 @@ namespace {
- std::string obt = lbl + obtWkt;
- std::string exp = lbl + outputWkt;
- BOOST_CHECK_EQUAL( exp, obt );
-+*/
- }
- }
- }
=====================================
debian/patches/series
=====================================
@@ -1,4 +1 @@
sfcgal-config.patch
-0001-specify-Kernel.patch
-StraightSkeletonTest.patch
-sfcgal_cTest.patch
=====================================
debian/patches/sfcgal_cTest.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix test failure.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/237
-
---- a/test/unit/SFCGAL/capi/sfcgal_cTest.cpp
-+++ b/test/unit/SFCGAL/capi/sfcgal_cTest.cpp
-@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE( testApproximateMed
- // NOTE: length not available in C-API
- // algorithm::length
- //BOOST_CHECK_EQUAL( 71.56, round(algorithm::length(sk)*100)/100; );
-- BOOST_CHECK_EQUAL( 11, sfcgal_geometry_collection_num_geometries( sk ) );
-+ BOOST_CHECK_EQUAL( 10, sfcgal_geometry_collection_num_geometries( sk ) );
-
- sfcgal_geometry_delete(sk);
- }
=====================================
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/-/compare/8097dcd6a04dc5dea9adc66502ba54a0132549b4...57c135f7e42b5ac9619aebff863f91d67a1af2ad
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/8097dcd6a04dc5dea9adc66502ba54a0132549b4...57c135f7e42b5ac9619aebff863f91d67a1af2ad
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/20210815/fde104ef/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list