diff options
| -rw-r--r-- | gis/saga-gis/README | 25 | ||||
| -rw-r--r-- | gis/saga-gis/saga-gis.SlackBuild | 20 | ||||
| -rw-r--r-- | gis/saga-gis/saga-gis.info | 6 |
3 files changed, 28 insertions, 23 deletions
diff --git a/gis/saga-gis/README b/gis/saga-gis/README index 25b4b6a1add25..f5bf96ff4ee03 100644 --- a/gis/saga-gis/README +++ b/gis/saga-gis/README @@ -21,22 +21,9 @@ WARNINGS: install the package wxWidgets (also available in Slackbuilds.org). If you have both wxGTK3 and wxWidgets installed in your system, make sure that wxWidgets is installed after wxGTK. -2) SAGA requires an ODBC driver in the system. It works both with - iODBC (installed with the libiodbc package (included in Slackware - 15.0) and unixODBC (installed from the SBo's slackbuild). The build - first searches for unixODBC then for iODBC. It fails if any driver - is found. These drivers are in conflict so, if you have installed - and then removed unixODBC, please make sure to reinstall libiodbc. - You should also consider that a package prebuilt in a Slackware - with unixODBC should not be installed in a system with iODBC (and - vice versa). -3) unixODBC is a required dependency in 32 bit systems: the source - code of SAGA conflicts with the code of a libiodbc header - (/usr/include/iodbcunix.h) and the build fails. This issue can be - overcome by installing unixODBC from the SBo's slackbuild. -4) For current users: the build of Python bindings fails since the - upgrade of swig package to version 4.2 in current (January 2024). - Therefore Saga with support to Python will be disabled in current - if the version of swig installed is earlier than 4.0.2. If you - require the support to Python you must downgrade swig to the version - released in Slackware 15.0. +2) SAGA requires an ODBC driver in the system. It works both with + iODBC (installed with the libiodbc package (included in Slackware + 15.0) and unixODBC (installed from the SBo's slackbuild). The build + first searches for unixODBC then for iODBC. +3) unixODBC is a required dependency in 32 bit systems since the + libiodbc headers cause a build failure during the compilation. diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild index e02d2da42176c..62a6841dd0037 100644 --- a/gis/saga-gis/saga-gis.SlackBuild +++ b/gis/saga-gis/saga-gis.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=saga-gis -VERSION=${VERSION:-9.3.2} +VERSION=${VERSION:-9.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,22 @@ if [[ "$ARCH" = "i586" || "$ARCH" = "i686" ]] ; then fi fi +# if both unixODBCand and libiodbc are installed, SAGA set the +# first as default driver ODBC. This flag should prevent possible +# compilation failures since cmake does not find the correct +# path of unixODBC headers +ODBC="" +if pkg-config --exists odbc; then + ODBC="-DODBC_INCLUDE_DIR=/usr/include/unixodbc " +fi + +# Look if the system has PDAL installed +if pkg-config --exists pdal; then + WITHPDAL="" +else + WITHPDAL="-DWITH_TOOLS_PDAL=OFF " +fi + if [ -d /usr/share/cmake-3.29 ]; then # This prevents some cmake warnings in current CMAKE_POLICY="-DCMAKE_POLICY_DEFAULT_CMP0153=OLD " @@ -109,6 +125,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + $ODBC \ + $WITHPDAL \ $CMAKE_POLICY \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info index 62dd9d644b0bd..7336a0290259e 100644 --- a/gis/saga-gis/saga-gis.info +++ b/gis/saga-gis/saga-gis.info @@ -1,8 +1,8 @@ PRGNAM="saga-gis" -VERSION="9.3.2" +VERSION="9.4.0" HOMEPAGE="http://www.saga-gis.org" -DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.3.2/saga-9.3.2.tar.gz" -MD5SUM="7880d0216e493dd6b9cbf7c9cf398889" +DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.4.0/saga-9.4.0.tar.gz" +MD5SUM="51c55b07450e343ac08cc9a1bd26014d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxWidgets" |