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-08-10 17:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sfcgal (Old) and /work/SRC/openSUSE:Factory/.sfcgal.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sfcgal" Wed Aug 10 17:14:50 2022 rev:3 rq:994295 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sfcgal/sfcgal.changes 2022-04-20 16:56:58.658603299 +0200 +++ /work/SRC/openSUSE:Factory/.sfcgal.new.1521/sfcgal.changes 2022-08-10 17:15:57.546124428 +0200 @@ -1,0 +2,16 @@ +Wed Aug 3 08:28:42 UTC 2022 - Bruno Friedmann <br...@ioda-net.ch> + +- Disable i586 build which failed with both gcc and clang + https://gitlab.com/Oslandia/SFCGAL/-/issues/258 + https://gitlab.com/Oslandia/SFCGAL/-/issues/259 +- Remove unused -D calls +- Lower physical memory constraint to 8GB but keep global memory + to 16GB + +------------------------------------------------------------------- +Tue Jul 26 13:33:58 UTC 2022 - Bruno Friedmann <br...@ioda-net.ch> + +- Apply upstream fix by removing bundled CGAL test + see https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/279 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfcgal.spec ++++++ --- /var/tmp/diff_new_pack.mXxapz/_old 2022-08-10 17:15:58.166126046 +0200 +++ /var/tmp/diff_new_pack.mXxapz/_new 2022-08-10 17:15:58.178126078 +0200 @@ -20,7 +20,11 @@ %define source_name SFCGAL %define _libname libSFCGAL1 %define _soversion 1 -%ifarch i586 x86_64 +# while upstream https://gitlab.com/Oslandia/SFCGAL/-/issues/259 +# and https://gitlab.com/Oslandia/SFCGAL/-/issues/258 are pending. +# this force postgis ix86 to be build without sfcgal. +ExcludeArch: %{ix86} +%ifarch %{ix86} x86_64 %define withosgd 1 BuildRequires: pkgconfig(openscenegraph) %else @@ -37,7 +41,7 @@ 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) +# 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 @@ -55,11 +59,7 @@ 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) @@ -119,10 +119,13 @@ %prep %setup -q -n %{source_name}-v%{version} %autopatch -p1 +# remove CGAL tests see upstream commit 74858e42 +rm -rfv test/unit/CGAL %build -tmpflags="%{optflags} -fPIC -fpie" +tmpflags="%{optflags} -fPIC -fPIE" echo "${tmpflags}" +# Desactivate lto (check with upstream) %define _lto_cflags %{nil} tmpflags="${tmpflags/-flto=auto}" %ifarch ppc64 ppc64le @@ -138,21 +141,19 @@ -DCMAKE_C_FLAGS="${tmpflags} -Doverride=" \ -DCMAKE_CXX_FLAGS="${tmpflags} -Doverride=" \ -DCMAKE_CXX_FLAGS_RELEASE="${tmpflags} -Doverride=" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_GMP_ENABLE_CXX=ON \ -DSFCGAL_CHECK_VALIDITY=TRUE \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ %if %{withosgd} -DSFCGAL_WITH_OSG=ON \ %else -DSFCGAL_WITH_OSG=OFF \ %endif - -DPOSTGRESQL_INCLUDE_DIR=%{_includedir}/pgsql \ - -DPOSTGRESQL_LIBRARIES=`pkg-config --libs libpq` \ -DSFCGAL_BUILD_EXAMPLES=ON \ -DSFCGAL_BUILD_TESTS=ON -#Upstream recommend to lower number of -j with -g +# Upstream recommend to lower number of -j with -g # so we can keep constraint low on memory %ifarch i586 ppc64 make -j2 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.mXxapz/_old 2022-08-10 17:15:58.222126193 +0200 +++ /var/tmp/diff_new_pack.mXxapz/_new 2022-08-10 17:15:58.226126203 +0200 @@ -4,6 +4,9 @@ <physicalmemory> <size unit="M">8192</size> </physicalmemory> + <memory> + <size unit="M">16384</size> + </memory> </hardware> <sandbox>kvm</sandbox> <hostlabel exclude="true">SLOW_CPU</hostlabel>
