gis/SFCGAL: Updated for version 1.4.1.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 34 insertions, 13 deletions

diff --git a/gis/SFCGAL/README b/gis/SFCGAL/README
index 108487cd23ee..15c15457cefe 100644
--- a/gis/SFCGAL/README
+++ b/gis/SFCGAL/README
@@ -2,4 +2,20 @@ SFCGAL is a C++ wrapper library around CGAL, written with the aim of
 supporting ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D
 operations.
 
-OpenSceneGraph is an optional dependency.
+This package contains a version of SFCGAL greater than 1.4.0.
+
+OpenSceneGraph is an optional dependency enabled by default if found
+in your system. If you do not need this, pass the environment variable
+to the script:
+   OSG=no ./SFCGAL.SlackBuild
+
+Warning.
+Since version 1.4.1, SFCGAL depends on CGAL version 5.3 or greater.
+To install or upgrade SFCGAL you must uninstall the package CGAL
+(based on version 4.x) then install CGAL5.
+
+CGAL5 conflicts with CGAL, hence they cannot be installed at the same
+time. Since other packages depends on CGAL versions earlier than 5.0
+you may want to keep a version supported by these. In this case, you
+have to install SFCGAL-legacy, also available in this repository and
+depending on CGAL version 4.x.
diff --git a/gis/SFCGAL/SFCGAL.SlackBuild b/gis/SFCGAL/SFCGAL.SlackBuild
index 0a8fbfd5cb0b..4952cd7f6484 100644
--- a/gis/SFCGAL/SFCGAL.SlackBuild
+++ b/gis/SFCGAL/SFCGAL.SlackBuild
@@ -2,6 +2,7 @@
 
 # SlackBuild script for SFCGAL
 
+# Copyright 2023 Giancarlo Dessi, Cagliari, IT
 # Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
@@ -27,11 +28,16 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=SFCGAL
-VERSION=${VERSION:-1.3.9}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+WITHOSG="";
+if [[ -f /usr/bin/osgviewer ]] ; then
+   WITHOSG="-DSFCGAL_WITH_OSG=ON" ; [ "${OSG:-yes}" = "no" ] && WITHOSG="";
+fi
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -40,9 +46,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -89,10 +92,12 @@ cd build
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+    -DCGAL_USE_AUTOLINK=ON \
     -DSFCGAL_BUILD_EXAMPLES=OFF \
     -DSFCGAL_BUILD_TESTS=OFF \
+    $WITHOSG \
     ..
-
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/gis/SFCGAL/SFCGAL.info b/gis/SFCGAL/SFCGAL.info
index ea04a3e0b837..0f8ed37e34bd 100644
--- a/gis/SFCGAL/SFCGAL.info
+++ b/gis/SFCGAL/SFCGAL.info
@@ -1,10 +1,10 @@
 PRGNAM="SFCGAL"
-VERSION="1.3.9"
+VERSION="1.4.1"
 HOMEPAGE="https://oslandia.gitlab.io/SFCGAL/"
-DOWNLOAD="https://gitlab.com/Oslandia/SFCGAL/-/archive/v1.3.9/SFCGAL-v1.3.9.tar.gz"
-MD5SUM="99c08d524aff93be0d30a48d821783ae"
+DOWNLOAD="https://gitlab.com/Oslandia/SFCGAL/-/archive/v1.4.1/SFCGAL-v1.4.1.tar.gz"
+MD5SUM="a3b6d6029679b1c02543c241fb7ddc65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="CGAL"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+REQUIRES="CGAL5"
+MAINTAINER="Giancarlo Dessi"
+EMAIL="slack@giand.it"
diff --git a/gis/SFCGAL/slack-desc b/gis/SFCGAL/slack-desc
index 6d285edd38ec..2499033d7886 100644
--- a/gis/SFCGAL/slack-desc
+++ b/gis/SFCGAL/slack-desc
@@ -12,7 +12,7 @@ SFCGAL: SFCGAL is a C++ wrapper library around CGAL, written with the aim of
 SFCGAL: supporting ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D
 SFCGAL: operations.
 SFCGAL:
-SFCGAL:
+SFCGAL: This package contains a version of SFCGAL greater than 1.4.0
 SFCGAL:
 SFCGAL: homepage: http://www.sfcgal.org
 SFCGAL: