Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sfcgal for openSUSE:Factory checked in at 2022-04-20 16:56:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sfcgal (Old) and /work/SRC/openSUSE:Factory/.sfcgal.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sfcgal" Wed Apr 20 16:56:33 2022 rev:2 rq:970828 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sfcgal/sfcgal.changes 2022-02-22 21:18:30.982289815 +0100 +++ /work/SRC/openSUSE:Factory/.sfcgal.new.1941/sfcgal.changes 2022-04-20 16:56:58.658603299 +0200 @@ -1,0 +2,12 @@ +Fri Apr 15 06:13:17 UTC 2022 - Bruno Friedmann <br...@ioda-net.ch> + +- Use gcc for i586 and limit the number of worker (upstream) + so we can lower again _constraint. + +------------------------------------------------------------------- +Fri Apr 8 17:05:12 UTC 2022 - Bruno Friedmann <br...@ioda-net.ch> + +- Introduce disable_invalid_cgal_test.patch to disable tests + failing with CGAL 5.4 on openSUSE. + +------------------------------------------------------------------- New: ---- disable_invalid_cgal_test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfcgal.spec ++++++ --- /var/tmp/diff_new_pack.I4VnNv/_old 2022-04-20 16:56:59.234603837 +0200 +++ /var/tmp/diff_new_pack.I4VnNv/_new 2022-04-20 16:56:59.238603841 +0200 @@ -37,6 +37,8 @@ Group: Productivity/Graphics/CAD URL: https://oslandia.gitlab.io/SFCGAL/ Source0: https://gitlab.com/Oslandia/SFCGAL/-/archive/v%{version}/SFCGAL-v%{version}.tar.bz2 +#CGAL 5.4 checking failed instead warning for certain invalid geometry (hole on border) +Patch0: disable_invalid_cgal_test.patch BuildRequires: cmake BuildRequires: gmp-devel BuildRequires: lapack-devel @@ -53,7 +55,11 @@ BuildRequires: libboost_timer-devel BuildRequires: libcgal-devel >= 5.3 BuildRequires: libstdc++-devel +%ifarch i586 +BuildRequires: gcc-c++ +%else BuildRequires: llvm-clang +%endif BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(cunit) @@ -112,13 +118,11 @@ %prep %setup -q -n %{source_name}-v%{version} -#%%autopatch -p1 +%autopatch -p1 %build tmpflags="%{optflags} -fPIC -fpie" echo "${tmpflags}" -export CC=clang -export CXX=clang++ %define _lto_cflags %{nil} tmpflags="${tmpflags/-flto=auto}" %ifarch ppc64 ppc64le @@ -134,8 +138,6 @@ -DCMAKE_C_FLAGS="${tmpflags} -Doverride=" \ -DCMAKE_CXX_FLAGS="${tmpflags} -Doverride=" \ -DCMAKE_CXX_FLAGS_RELEASE="${tmpflags} -Doverride=" \ - -DCMAKE_CXX_COMPILER="%{_bindir}/clang++" \ - -DCMAKE_C_COMPILER="%{_bindir}/clang" \ -DCMAKE_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_GMP_ENABLE_CXX=ON \ @@ -150,7 +152,13 @@ -DSFCGAL_BUILD_EXAMPLES=ON \ -DSFCGAL_BUILD_TESTS=ON +#Upstream recommend to lower number of -j with -g +# so we can keep constraint low on memory +%ifarch i586 ppc64 +make -j2 +%else make %{?_smp_mflags} +%endif %install %cmake_install @@ -162,7 +170,6 @@ %check LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/unit-test-SFCGAL LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/standalone-regress-test-SFCGAL -LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/garden-test-SFCGAL %endif %post -n %{_libname} -p /sbin/ldconfig ++++++ disable_invalid_cgal_test.patch ++++++ diff -rup a/test/unit/SFCGAL/algorithm/DifferenceTest.cpp b/test/unit/SFCGAL/algorithm/DifferenceTest.cpp --- a/test/unit/SFCGAL/algorithm/DifferenceTest.cpp 2022-01-27 16:59:01.000000000 +0100 +++ b/test/unit/SFCGAL/algorithm/DifferenceTest.cpp 2022-04-08 18:53:34.660025030 +0200 @@ -134,6 +134,7 @@ BOOST_AUTO_TEST_CASE( testDifferencePoly std::unique_ptr<Geometry> diff = algorithm::difference( *ls1, *ls2 ); BOOST_CHECK( *diff == *io::readWkt( "GEOMETRYCOLLECTION EMPTY" ) ); } +/* Desactivated as for CGAL 5.4 its failing as invalid // two polygons, one of wich is invalid for CGAL but valid for SFS { @@ -143,7 +144,6 @@ BOOST_AUTO_TEST_CASE( testDifferencePoly BOOST_CHECK( *diff == *io::readWkt( "POLYGON((-0.5 -0.5,1 -0.5,0.5 0.5,-0.5 0.5,-0.5 -0.5))" ) ); BOOST_CHECK( algorithm::isValid( *diff ) ); } - // two polygons the result has a hole touching the outer boundary { std::unique_ptr<Geometry> ls1 = io::readWkt( "POLYGON((-1 -1,1 -1,1 1,-1 1,-1 -1))" ); @@ -152,6 +152,8 @@ BOOST_AUTO_TEST_CASE( testDifferencePoly BOOST_CHECK( algorithm::isValid( *diff ) ); BOOST_CHECK( *diff == *io::readWkt( "POLYGON((-1 -1,1 -1,1 -0.5,1 1,-1 1,-1 -1),(1 -0.5,-0.5 -0.5,-0.5 0.5,0.5 0.5,1 -0.5))" ) ); } +*/ + } BOOST_AUTO_TEST_CASE( testDifferenceVolumeVolume )
