diff options
Diffstat (limited to 'gis')
335 files changed, 5217 insertions, 5091 deletions
diff --git a/gis/CreateCloudMap/CreateCloudMap.info b/gis/CreateCloudMap/CreateCloudMap.info deleted file mode 100644 index 9ecbd102a4..0000000000 --- a/gis/CreateCloudMap/CreateCloudMap.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="CreateCloudMap" -VERSION="0.9.13" -HOMEPAGE="https://github.com/jmozmoz/cloudmap" -DOWNLOAD="https://files.pythonhosted.org/packages/1f/5c/75ce03f468e0765120a307da2ccefafe10f7d1cce122de21ae653cbb49af/CreateCloudMap-0.9.13.tar.gz" -MD5SUM="c7108d2b0fe3413da9c953b9dd99502a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pyresample scipy python-requests ConfigParser pillowfight" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/gis/CreateCloudMap/README b/gis/CreateCloudMap/README deleted file mode 100644 index f38ad22afa..0000000000 --- a/gis/CreateCloudMap/README +++ /dev/null @@ -1,5 +0,0 @@ -Python script to create a cloud map for xplanet using satellite images from the -Dundee Satellite Receiving Station, Dundee University, UK. - -Optional : -xplanet can use a cloud map to make the earth look more pretty. diff --git a/gis/CreateCloudMap/doinst.sh b/gis/CreateCloudMap/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/gis/CreateCloudMap/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/gis/Fiona/Fiona.SlackBuild b/gis/Fiona/Fiona.SlackBuild index a94a675f96..b1cfbb9b20 100644 --- a/gis/Fiona/Fiona.SlackBuild +++ b/gis/Fiona/Fiona.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for Fiona @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=Fiona -VERSION=${VERSION:-1.8.13} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.8.20} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,7 +79,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -85,4 +94,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/Fiona/Fiona.info b/gis/Fiona/Fiona.info index 2310e42519..e0f3d74acb 100644 --- a/gis/Fiona/Fiona.info +++ b/gis/Fiona/Fiona.info @@ -1,10 +1,10 @@ PRGNAM="Fiona" -VERSION="1.8.13" +VERSION="1.8.20" HOMEPAGE="https://github.com/Toblerity/Fiona" -DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.8.13/Fiona-1.8.13.tar.gz" -MD5SUM="19b13fb5321d9e0111eba7c031c52ede" +DOWNLOAD="https://github.com/Toblerity/Fiona/archive/1.8.20/Fiona-1.8.20.tar.gz" +MD5SUM="186f39b90b8191c37745ceafacceda94" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="attrs gdal munch six python3-six python3-Cython python3-attrs enum34 click-plugins cligj" +REQUIRES="gdal munch python3-attrs click-plugins cligj" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/Fiona/README b/gis/Fiona/README index d079aa2700..ad7dc450bd 100644 --- a/gis/Fiona/README +++ b/gis/Fiona/README @@ -1,9 +1,11 @@ -Fiona provides uncomplicated Python interfaces to functions in OGR, the best -open source C/C++ library for reading and writing geographic vector data. +Fiona provides uncomplicated Python interfaces to functions in OGR, +the best open source C/C++ library for reading and writing geographic +vector data. -Fiona is designed to be simple and dependable. It focuses on reading and -writing data in standard Python IO style, and relies upon familiar Python types -and protocols such as files, dictionaries, mappings, and iterators instead of -classes specific to OGR. Fiona can read and write real-world data using -multi-layered GIS formats and zipped virtual file systems and integrates -readily with other Python GIS packages such as pyproj, Rtree and Shapely. +Fiona is designed to be simple and dependable. It focuses on reading +and writing data in standard Python IO style, and relies upon familiar +Python types and protocols such as files, dictionaries, mappings, and +iterators instead of classes specific to OGR. Fiona can read and write +real-world data using multi-layered GIS formats and zipped virtual +file systems and integrates readily with other Python GIS packages +such as pyproj, Rtree and Shapely. diff --git a/gis/GMT/GMT.SlackBuild b/gis/GMT/GMT.SlackBuild index 042f30be80..b6b7a68a77 100644 --- a/gis/GMT/GMT.SlackBuild +++ b/gis/GMT/GMT.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for GMT (Generic Mapping Tools) @@ -22,17 +22,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=GMT SRCNAM=gmt -VERSION=${VERSION:-6.0.0} +VERSION=${VERSION:-6.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} GSHHG=gshhg GSHHG_VERSION=${GSHHG_VERSION:-2.3.7} DCW=dcw -DCW_VERSION=${DCW_VERSION:-1.1.4} +DCW_VERSION=${DCW_VERSION:-2.1.2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -42,7 +45,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -101,14 +111,19 @@ cd build -DDCW_ROOT=$PKG/usr/share/$SRCNAM/dcw \ -DCOPY_GSHHG=true \ -DCOPY_DCW=true \ + -DGMT_INSTALL_MODULE_LINKS=true \ -DLICENSE_RESTRICTED=$LICFLAG \ -DCMAKE_BUILD_TYPE=Release .. make all - make docs_man - make docs_html make install DESTDIR=$PKG cd .. +# Remove unwanted empty dirs +#rmdir $PKG/usr/doc/GMT-$VERSION/html/_video_thumbnail +#rmdir $PKG/usr/man/man1/_video_thumbnail +find $PKG/usr/doc/GMT-$VERSION/html -type d -empty -print0 | xargs -0 -I {} /usr/bin/rmdir "{}" +find $PKG/usr/man/man1/ -type d -empty -print0 | xargs -0 -I {} /usr/bin/rmdir "{}" + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -116,11 +131,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a BUILDING.md INSTALL.md LICENSE.TXT README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a BUILDING.md LICENSE.TXT README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/GMT/GMT.info b/gis/GMT/GMT.info index 045746ae49..e79c42595d 100644 --- a/gis/GMT/GMT.info +++ b/gis/GMT/GMT.info @@ -1,14 +1,14 @@ PRGNAM="GMT" -VERSION="6.0.0" +VERSION="6.5.0" HOMEPAGE="https://www.generic-mapping-tools.org/" -DOWNLOAD="https://github.com/GenericMappingTools/gmt/releases/download/6.0.0/gmt-6.0.0-src.tar.gz \ - ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-2.3.7.tar.gz \ - ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-1.1.4.tar.gz" -MD5SUM="608742883d1f6babc3928bcb32952e9d \ +DOWNLOAD="https://github.com/GenericMappingTools/gmt/releases/download/6.5.0/gmt-6.5.0-src.tar.gz \ + https://github.com/GenericMappingTools/gshhg-gmt/releases/download/2.3.7/gshhg-gmt-2.3.7.tar.gz \ + https://github.com/GenericMappingTools/dcw-gmt/releases/download/2.1.2/dcw-gmt-2.1.2.tar.gz" +MD5SUM="a03e8d73f73c3804d78a42a3d5fc3dc7 \ 8ee2653f9daf84d49fefbf990bbfa1e7 \ - 4f30857a8b12af0f910222fceb591538" + b9375db7042963c7649e4f62a81df796" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal netcdf Sphinx" +REQUIRES="gdal" MAINTAINER="Cristiano Urban" EMAIL="cristiano.urban.slack@gmail.com" diff --git a/gis/GMT/README b/gis/GMT/README index 84875498da..9146b35d9d 100644 --- a/gis/GMT/README +++ b/gis/GMT/README @@ -1,10 +1,11 @@ GMT is an open-source collection of command-line tools for manipulating geographic and Cartesian data sets (including filtering, trend fitting, gridding, projecting, etc.) and producing PostScript illustrations -ranging from simple x-y plots via contour maps to artificially illuminated -surfaces and 3D perspective views. It supports many map projections and -transformations and includes supporting data such as coastlines, rivers, -and political boundaries and optionally country polygons. +ranging from simple x-y plots via contour maps to artificially +illuminated surfaces and 3D perspective views. It supports many map +projections and transformations and includes supporting data such as +coastlines, rivers, and political boundaries and optionally country +polygons. By default, GMT will use Dave Watson's Delaunay triangulation routine. However, a much faster alternative is available from Jonathan Shewchuk, @@ -24,5 +25,8 @@ Other optional dependencies are: blas lapack +Modules documentation can be accessed via the "gmt docs <module_name>" +command (e.g. gmt docs psxy). + For more details refer to the README.md and LICENSE.TXT files contained into the GMT sources. diff --git a/gis/Geohash/Geohash.SlackBuild b/gis/Geohash/Geohash.SlackBuild index 6100ab1625..fb4765cc12 100644 --- a/gis/Geohash/Geohash.SlackBuild +++ b/gis/Geohash/Geohash.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for Geohash @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=Geohash VERSION=${VERSION:-1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,7 +79,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -85,4 +94,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/Geohash/Geohash.info b/gis/Geohash/Geohash.info index 660744a032..89ba46621f 100644 --- a/gis/Geohash/Geohash.info +++ b/gis/Geohash/Geohash.info @@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/G/Geohash/Geohash-1.0.tar.gz" MD5SUM="a7c4e57874061fae1e30dd8aa8b9b390" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3" +REQUIRES="" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/Geohash/README b/gis/Geohash/README index f0438606d7..090e9200e8 100644 --- a/gis/Geohash/README +++ b/gis/Geohash/README @@ -1,2 +1,2 @@ -Geohash is a Python module that provides functions for decoding and encoding -geohashes to and from latitude and longitude coordinates. +Geohash is a Python module that provides functions for decoding and +encoding geohashes to and from latitude and longitude coordinates. diff --git a/gis/OTB-legacy/OTB-legacy.SlackBuild b/gis/OTB-legacy/OTB-legacy.SlackBuild new file mode 100644 index 0000000000..c502a33de8 --- /dev/null +++ b/gis/OTB-legacy/OTB-legacy.SlackBuild @@ -0,0 +1,201 @@ +#!/bin/bash + +# SlackBuild script for OTB-legacy + +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT +# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=OTB-legacy +SRCNAM=OTB +VERSION=${VERSION:-8.1.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +#Look for other installed versions of Orfeo ToolBox version 8 +#Versions earlier than OTB 8 are not detected +if [ -d /usr/doc/OTB-8* ]; then + echo "*****************************************************************" + echo "WARNING: another installation of OTB is found in your system!" + echo "If you are trying to update or rebuild your OTB with this script" + echo "you must remove previous OTB package installed because OTB-legacy" + echo "will conflict with the current installed:" + echo "# removepkg OTB" + echo "This script will be stopped" + echo "*****************************************************************" + exit 1 +fi +#Look for other installed versions of Orfeo ToolBox later than 8.1.2 +if [ -d /usr/doc/OTB-9* ]; then + echo "*****************************************************************" + echo "WARNING: a later version of OTB is found in your system!" + echo "If you are trying to downgrade your OTB with this script" + echo "you must remove previous OTB package installed because OTB-legacy" + echo "will conflict with the current installed:" + echo "# removepkg OTB" + echo "This script will be stopped" + echo "*****************************************************************" + exit 1 +fi + +if [ -d /usr/share/cmake-3.28 ]; then + # This prevents some cmake warnings in current + CMAKE_POLICY="-DCMAKE_POLICY_DEFAULT_CMP0106=OLD " +else + CMAKE_POLICY="" +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +# Search for optional dependencies +if pkg-config --exists ompi; then + BUILD_MPI="" ; [ "${MPI:-ON}" = "ON" ] && BUILD_MPI="-DOTB_USE_MPI=ON " +else + BUILD_MPI="" +fi + +if pkg-config --exists glfw3; then + WITH_GLFW="" ; [ "${GLFW:-ON}" = "ON" ] && WITH_GLFW="-DOTB_USE_GLFW=ON " +else + WITH_GLFW="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -p1 < $CWD/otbSpatialReference.cxx.patch + +sed -i CMakeLists.txt -e "s/message(WARNING/message(STATUS/g" + +sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" \ + CMakeLists.txt \ + CMake/OTBModuleExternal.cmake \ + CMake/OTBStandaloneModuleMacros.cmake \ + CMake/OTBApplicationMacros.cmake + +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTING=OFF \ + -DOTB_USE_CURL=ON \ + -DOTB_USE_QWT=ON \ + -DOTB_USE_GLEW=ON \ + -DOTB_USE_OPENGL=ON \ + -DOTB_USE_QT=ON \ + -DOTB_USE_GLUT=ON \ + -DOTB_USE_GSL=ON \ + -DOTB_USE_LIBKML=ON \ + -DOTB_USE_MUPARSER=ON \ + -DOTB_USE_OPENCV=ON \ + -DOTB_USE_OPENMP=ON \ + -DOTB_USE_SHARK=ON \ + -DOTB_INSTALL_PYTHON_DIR=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \ + -DOTB_WRAP_PYTHON=ON \ + -DOTB_INSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \ + -DGDAL_CONFIG_CHECKING=ON \ + $BUILD_MPI \ + $WITH_GLFW \ + $CMAKE_POLICY \ + .. + make -j 10 + make install DESTDIR=$PKG +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/etc/profile.d +cat > $PKG/etc/profile.d/otb.csh << EOF +#!/bin/csh +# Orfeo ToolBox applications path +setenv OTB_APPLICATION_PATH /usr/lib${LIBDIRSUFFIX}/otb/applications +EOF +cat > $PKG/etc/profile.d/otb.sh << EOF +#!/bin/sh +# Orfeo ToolBox applications path +export OTB_APPLICATION_PATH=/usr/lib${LIBDIRSUFFIX}/otb/applications +EOF + +chmod 0755 $PKG/etc/profile.d/otb.csh +chmod 0755 $PKG/etc/profile.d/otb.sh + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README.md RELEASE_NOTES.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/OTB-legacy/OTB-legacy.info b/gis/OTB-legacy/OTB-legacy.info new file mode 100644 index 0000000000..4cf9d37c32 --- /dev/null +++ b/gis/OTB-legacy/OTB-legacy.info @@ -0,0 +1,10 @@ +PRGNAM="OTB-legacy" +VERSION="8.1.2" +HOMEPAGE="http://orfeo-toolbox.org/otb/" +DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/8.1.2/OTB-8.1.2.tar.gz" +MD5SUM="b9657e08b5a985e46a8442bcdcfd8038" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="gdal ITK libkml OpenSceneGraph muParser ossim Shark tinyxml qwt" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/OTB-legacy/README b/gis/OTB-legacy/README new file mode 100644 index 0000000000..c9423e6105 --- /dev/null +++ b/gis/OTB-legacy/README @@ -0,0 +1,18 @@ +ORFEO Toolbox (OTB) is an open source library of image processing +algorithms. +OTB is based on the medical image processing library ITK and offers +particular functionalities for remote sensing image processing in +general and for high spatial resolution images in particular. Targeted +algorithms for high resolution optical images (Pleiades, SPOT, +QuickBird, WorldView, Landsat, Ikonos), hyperspectral sensors +(Hyperion) or SAR (TerraSarX, ERS, Palsar) are available. + +This slackbuild is based on a legacy version of OTB and includes by +default the satellite image viewer Monteverdi, with access to OTB +processing, in a single build. + +OTB-legacy will be built with support for the following packages if +they are available at compile time: numpy3, openmpi, glfw3. + +Warning: the build fails if Shark is not built against the optional +dependency cblas that gives the support to ATLAS. diff --git a/gis/OTB/doinst.sh b/gis/OTB-legacy/doinst.sh index 19ad22754d..19ad22754d 100644 --- a/gis/OTB/doinst.sh +++ b/gis/OTB-legacy/doinst.sh diff --git a/gis/OTB-legacy/otbSpatialReference.cxx.patch b/gis/OTB-legacy/otbSpatialReference.cxx.patch new file mode 100644 index 0000000000..dbfe4514cb --- /dev/null +++ b/gis/OTB-legacy/otbSpatialReference.cxx.patch @@ -0,0 +1,8 @@ +--- ./Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx ++++ ./Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx +@@ -31,4 +31,5 @@ + #include <sstream> + #include <stdexcept> ++#include <cassert> + + namespace otb diff --git a/gis/OTB-legacy/slack-desc b/gis/OTB-legacy/slack-desc new file mode 100644 index 0000000000..17fac3a0ea --- /dev/null +++ b/gis/OTB-legacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +OTB-legacy: OTB-legacy (image processing library) +OTB-legacy: +OTB-legacy: OTB, the ORFEO Toolbox, is a library of image processing algorithms +OTB-legacy: that offers particular functionalities for remote sensing +OTB-legacy: in general and for high spatial resolution images in particular. +OTB-legacy: This package is based on the legacy version that includes the +OTB-legacy: Graphic User Interface Monteverdi +OTB-legacy: +OTB-legacy: Home page: http://orfeo-toolbox.org/otb/ +OTB-legacy: +OTB-legacy: diff --git a/gis/OTB/OTB.SlackBuild b/gis/OTB/OTB.SlackBuild index 7497beb90d..c71a583df5 100644 --- a/gis/OTB/OTB.SlackBuild +++ b/gis/OTB/OTB.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for OTB -# Copyright 2014-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT +# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,10 +25,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=OTB -VERSION=${VERSION:-7.0.0} +VERSION=${VERSION:-9.0.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +41,24 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +#Look for installed package OTB-legacy +if [ -d /usr/doc/OTB-legacy* ]; then + echo "*****************************************************************" + echo "WARNING: package OTB-legacy is found installed in your system!" + echo "OTB and OTB-legacy cannot exist in the same system, please remove" + echo "OTB-legacy before running this script if you want to upgrade to a" + echo "later version of OTB:" + echo "# removepkg OTB-legacy" + echo "This script will be stopped" + echo "*****************************************************************" + exit 1 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -71,86 +92,71 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "s/VERSION 3.10.2/VERSION 2.5.2/" \ - CMakeLists.txt +patch -p1 < $CWD/otbSpatialReference.cxx.patch + +sed -i CMakeLists.txt -e "s/message(WARNING/message(STATUS/g" + sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" \ CMakeLists.txt \ CMake/OTBModuleExternal.cmake \ CMake/OTBStandaloneModuleMacros.cmake \ CMake/OTBApplicationMacros.cmake -sed -i '1i\using namespace std;' \ - Modules/ThirdParty/OssimPlugins/src/gdal/*.cpp \ - Modules/ThirdParty/OssimPlugins/src/ossim/*.{h,cpp} \ - Modules/ThirdParty/OssimPlugins/src/ossim/otb/*.cpp \ - Modules/Adapters/OSSIMAdapters/src/*.cxx -MONTEVERDI=${MONTEVERDI:-OFF} -BUILD_MONTEVERDI="-DOTB_USE_QWT=$MONTEVERDI -DOTB_USE_GLEW=$MONTEVERDI -DOTB_USE_OPENGL=$MONTEVERDI" -BUILD_QT="-DOTB_USE_QT=${QTGUI:-ON}" - -# TODO: set WRAP_PYTHON=ON when cmake is upgraded mkdir -p build cd build cmake \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_POLICY_DEFAULT_CMP0106=OLD \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF \ -DOTB_USE_CURL=ON \ - -DOTB_USE_LIBKML=OFF \ - -DOTB_USE_MUPARSER=ON \ - -DOTB_USE_OPENCV=${OPENCV:-OFF} \ + -DOTB_USE_GSL=ON \ + -DOTB_USE_LIBKML=ON \ + -DOTBGroup_Learning=ON \ + -DOTBGroup_FeaturesExtraction=ON \ + -DOTB_USE_MUPARSERX=ON \ -DOTB_USE_OPENMP=ON \ -DOTB_USE_SHARK=ON \ - -DOTB_WRAP_PYTHON=OFF \ - -DOTB_INSTALL_PYTHON_DIR=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \ - -DOTB_WRAP_PYTHON3=ON \ - -DOTB_INSTALL_PYTHON3_DIR=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \ - -DOTB_INSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \ - -DGDAL_CONFIG_CHECKING:BOOL=OFF \ - $BUILD_MONTEVERDI \ - $BUILD_QT \ + -DOTB_INSTALL_PYTHON_DIR=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \ + -DOTB_WRAP_PYTHON=ON \ + -DGDAL_CONFIG_CHECKING=OFF \ + -DBUILD_DOCUMENTATION=OFF \ .. - + make make install DESTDIR=$PKG cd .. -if [ "$QTGUI" = "OFF" ] ; then - # otbgui scripts are added but are unusable - rm $PKG/usr/bin/otbgui_* -fi - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/etc/profile.d -cat > $PKG/etc/profile.d/otb.csh << EOF -#!/bin/csh -# Orfeo ToolBox applications path -setenv OTB_APPLICATION_PATH /usr/lib${LIBDIRSUFFIX}/otb/applications -EOF -cat > $PKG/etc/profile.d/otb.sh << EOF -#!/bin/sh -# Orfeo ToolBox applications path -export OTB_APPLICATION_PATH=/usr/lib${LIBDIRSUFFIX}/otb/applications -EOF - -chmod 0755 $PKG/etc/profile.d/otb.csh -chmod 0755 $PKG/etc/profile.d/otb.sh + +# Experimental: remove post-install scripts from a no-standard path +# These scripts should be used to reconfigure the environment if various versions of OTB +# are installed and/or set the correct Python path in some Linux distributions +# They do not seem essential and their launch might cause unexpected issues with +# pkgtool. I think we do not need this +cp -a $PKG/usr/LICENSE . +rm -f $PKG/usr/README \ + $PKG/usr/otbenv.profile \ + $PKG/usr/recompile_bindings.sh \ + $PKG/usr/LICENSE + +# This no standard directory includes three post-install scripts. We do need them? +# At the moment we move this directory in /usr/share/otb: users would require these +# tools for singular contexts +mv $PKG/usr/tools $PKG/usr/share/otb + +# Remove no standard directory /usr/share/doc with superfluous content +rm -rf $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - README.md RELEASE_NOTES.txt \ + README.md RELEASE_NOTES.txt LICENSE \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -if [ "$MONTEVERDI" = "ON" ] ; then - cat $CWD/doinst.sh > $PKG/install/doinst.sh -fi cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/OTB/OTB.info b/gis/OTB/OTB.info index 892526332f..7322b947bd 100644 --- a/gis/OTB/OTB.info +++ b/gis/OTB/OTB.info @@ -1,10 +1,10 @@ PRGNAM="OTB" -VERSION="7.0.0" +VERSION="9.0.0" HOMEPAGE="http://orfeo-toolbox.org/otb/" -DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/7.0.0/OTB-7.0.0.tar.gz" -MD5SUM="3b0706f06ba1ebc145d5ced4c2a89e7a" +DOWNLOAD="https://github.com/orfeotoolbox/OTB/archive/9.0.0/OTB-9.0.0.tar.gz" +MD5SUM="b710e6eee6f49d6bae75541fc242cbbb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="blas gdal ITK OpenSceneGraph muParser python3 ossim Shark tinyxml" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="gdal ITK libkml libsvm muParser muparserx Shark tinyxml" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/OTB/README b/gis/OTB/README index 456ea30da3..1f72146696 100644 --- a/gis/OTB/README +++ b/gis/OTB/README @@ -1,20 +1,33 @@ -ORFEO Toolbox (OTB) is an open source library of image processing algorithms. -OTB is based on the medical image processing library ITK and offers particular -functionalities for remote sensing image processing in general and for high -spatial resolution images in particular. Targeted algorithms for high -resolution optical images (Pleiades, SPOT, QuickBird, WorldView, Landsat, -Ikonos), hyperspectral sensors (Hyperion) or SAR (TerraSarX, ERS, Palsar) are -available. +ORFEO Toolbox (OTB) is an open source library of image processing +algorithms. +OTB is based on the medical image processing library ITK and offers +particular functionalities for remote sensing image processing in +general and for high spatial resolution images in particular. Targeted +algorithms for high resolution optical images (Pleiades, SPOT, +QuickBird, WorldView, Landsat, Ikonos), hyperspectral sensors +(Hyperion) or SAR (TerraSarX, ERS, Palsar) are available. -Monteverdi, a satellite image viewer with access to OTB processing, will also -be built if MONTEVERDI=ON is passed to the script. This will require the qwt -package to be installed. - -A QT application launcher will be built by default. Set QTGUI=OFF to disable -it (note that disabling Qt support will also disable Monteverdi even if -MONTEVERDI is set to ON). - -OTB may use the following optional dependencies: opencv (use OPENCV=ON). +All of OTB's algorithms are accessible from other platforms like +QGIS, Python, command line, C++, and Monteverdi. Monteverdi is a +satellite image viewer with access to OTB processing. Until version +8.1.2, Monteverdi could be included in a single build, but since 9.0.0 +version the image viewer is available only a standalone application. +If you are interested to the integrated graphic interface, you must +refer to OTB-legacy package (available in this repository) otherwise +you have to build and install separately the package Monteverdi. OTB will be built with support for the following packages if they are -available at compile time: numpy and numpy3. +available at compile time: numpy3. + +Warnings +1. The build fails if Shark is not built against the optional + dependency cblas that gives the support to ATLAS. +2. OTB sources in lastest version has changed in several areas and the + build could require - at least in some Linux distributions - the + launch of post-install scripts to patch the default settings and + adapt them to the system environment. This could not be needed in + Slackware, but the upgrade is not sufficiently tested in runtime, so + please report any issues to the maintainer. + You might also consider the installation of the legacy version that + is provided by the slackbuild OTB-legacy (v. 8.1.2) that replaces + the old OTB package. diff --git a/gis/OTB/otbSpatialReference.cxx.patch b/gis/OTB/otbSpatialReference.cxx.patch new file mode 100644 index 0000000000..ee18d7ec78 --- /dev/null +++ b/gis/OTB/otbSpatialReference.cxx.patch @@ -0,0 +1,8 @@ +--- ./Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx ++++ ./Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx +@@ -31,4 +31,5 @@ + #include <sstream> + #include <stdexcept> ++#include <cassert> + + namespace otb diff --git a/gis/OWSLib/OWSLib.SlackBuild b/gis/OWSLib/OWSLib.SlackBuild index d7c5aa4b02..afdb8084e9 100644 --- a/gis/OWSLib/OWSLib.SlackBuild +++ b/gis/OWSLib/OWSLib.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for OWSLib -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=OWSLib -VERSION=${VERSION:-0.19.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.30.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -68,21 +76,22 @@ find -L . \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG + +if [ -x /usr/bin/python3.11 ]; then + patch -p1 < $CWD/pytz-not-required.patch fi +python3 setup.py install --root=$PKG + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS.rst LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/OWSLib/OWSLib.info b/gis/OWSLib/OWSLib.info index c89d115a6f..09f5fb5be7 100644 --- a/gis/OWSLib/OWSLib.info +++ b/gis/OWSLib/OWSLib.info @@ -1,10 +1,10 @@ PRGNAM="OWSLib" -VERSION="0.19.0" +VERSION="0.30.0" HOMEPAGE="https://pypi.python.org/pypi/OWSLib/" -DOWNLOAD="https://github.com/geopython/OWSLib/archive/0.19.0/OWSLib-0.19.0.tar.gz" -MD5SUM="cc95d474dce9afef4a9182e91c92d5f2" +DOWNLOAD="https://github.com/geopython/OWSLib/archive/0.30.0/OWSLib-0.30.0.tar.gz" +MD5SUM="c2ba9d5fd13b4c8795153e89c0c65322" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python-dateutil pytz lxml six" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="python3-dateutil pytz python3-lxml" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/OWSLib/pytz-not-required.patch b/gis/OWSLib/pytz-not-required.patch new file mode 100644 index 0000000000..03471b2d4d --- /dev/null +++ b/gis/OWSLib/pytz-not-required.patch @@ -0,0 +1,13 @@ +python-pytz has been removed from Slackware -current because +not needed with Python 3.11 +This patch prevents pip check from indicating the lack of +pytz as dependency required by OWSLib in -current +--- ./requirements.txt 2024-04-05 23:42:52.864498274 +0200 ++++ ./requirements.txt 2024-04-05 23:43:13.322499915 +0200 +@@ -1,6 +1,5 @@ + dataclasses; python_version < '3.7' + lxml + python-dateutil>=1.5 +-pytz + pyyaml + requests>=1.0 diff --git a/gis/SFCGAL-legacy/README b/gis/SFCGAL-legacy/README new file mode 100644 index 0000000000..b2f3738c10 --- /dev/null +++ b/gis/SFCGAL-legacy/README @@ -0,0 +1,16 @@ +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 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 + +SFCGAL-legacy builds version 1.3.9, the lastest compatible with the +package CGAL available in this repository. If you keep this version +of the dependency, you have to install this package. + +If you have CGAL5 installed in your system, this package is not +compatible and you must refer to the slackbuild SFCGAL based on +greater versions and also available in this repository. diff --git a/gis/SFCGAL-legacy/SFCGAL-legacy.SlackBuild b/gis/SFCGAL-legacy/SFCGAL-legacy.SlackBuild new file mode 100644 index 0000000000..565484f417 --- /dev/null +++ b/gis/SFCGAL-legacy/SFCGAL-legacy.SlackBuild @@ -0,0 +1,134 @@ +#!/bin/bash + +# SlackBuild script for SFCGAL-legacy + +# Copyright 2023 Giancarlo Dessi, Cagliari, IT +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=SFCGAL-legacy +VERSION=${VERSION:-1.3.9} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} +SRCNAM=SFCGAL + +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 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +# This package depends on versions of GCAL earlier than 5.2 +# The build with greater versions starts fine but it will fail during the +# compilation so we need to detect if there are any incompatible +# installations in the system +if [[ -d /usr/lib${LIBDIRSUFFIX}/cmake/CGAL ]] ; then + echo "************************* WARNING **************************"; + echo " CGAL5 found in your system!"; + echo " SFCGAL-legacy depends on earlier versions of CGAL."; + echo ""; + echo " Please build this package by using the slackbuild SFCGAL"; + echo " instead of SFCGAL-legacy ad also available in SBo."; + echo " This script will be stopped."; + echo "************************************************************"; + exit 1; +fi + + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +rm -rf $TMP/$SRCNAM-v$VERSION +cd $TMP +tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz +cd $SRCNAM-v$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + $WITHOSG \ + .. + make + make install DESTDIR=$PKG +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS LICENSE NEWS README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/SFCGAL-legacy/SFCGAL-legacy.info b/gis/SFCGAL-legacy/SFCGAL-legacy.info new file mode 100644 index 0000000000..e94d01e0b6 --- /dev/null +++ b/gis/SFCGAL-legacy/SFCGAL-legacy.info @@ -0,0 +1,10 @@ +PRGNAM="SFCGAL-legacy" +VERSION="1.3.9" +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_x86_64="" +MD5SUM_x86_64="" +REQUIRES="CGAL" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/geoserver-css/slack-desc b/gis/SFCGAL-legacy/slack-desc index e29177d15a..30ee9d1baa 100644 --- a/gis/geoserver-css/slack-desc +++ b/gis/SFCGAL-legacy/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -geoserver-css: geoserver-css (CSS styling support for GeoServer) -geoserver-css: -geoserver-css: The CSS plugin adds support for CSS styling to GeoServer. -geoserver-css: -geoserver-css: -geoserver-css: -geoserver-css: -geoserver-css: -geoserver-css: -geoserver-css: -geoserver-css: +SFCGAL-legacy: SFCGAL-legacy (C++ wrapper around CGAL) +SFCGAL-legacy: +SFCGAL-legacy: SFCGAL is a C++ wrapper library around CGAL, written with the aim of +SFCGAL-legacy: supporting ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D +SFCGAL-legacy: operations. +SFCGAL-legacy: +SFCGAL-legacy: This package contains the version 1.3.9, the lastest depending on +SFCGAL-legacy: old versions of CGAL (earlier than 5) +SFCGAL-legacy: +SFCGAL-legacy: homepage: http://www.sfcgal.org +SFCGAL-legacy: diff --git a/gis/SFCGAL/README b/gis/SFCGAL/README index 8826780db4..15c15457ce 100644 --- a/gis/SFCGAL/README +++ b/gis/SFCGAL/README @@ -1,4 +1,21 @@ -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. +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 fb8e0f06bf..034f6838bc 100644 --- a/gis/SFCGAL/SFCGAL.SlackBuild +++ b/gis/SFCGAL/SFCGAL.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for SFCGAL -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2023 Giancarlo Dessi, Cagliari, IT +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,10 +25,18 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=SFCGAL -VERSION=${VERSION:-1.3.7} +VERSION=${VERSION:-1.5.0} 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 @@ -37,7 +46,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -60,10 +73,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION +rm -rf $TMP/$PRGNAM-v$VERSION cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz +cd $PRGNAM-v$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,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 .. @@ -99,4 +114,4 @@ mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/SFCGAL/SFCGAL.info b/gis/SFCGAL/SFCGAL.info index bf539dd8d3..fe4b2399a9 100644 --- a/gis/SFCGAL/SFCGAL.info +++ b/gis/SFCGAL/SFCGAL.info @@ -1,10 +1,10 @@ PRGNAM="SFCGAL" -VERSION="1.3.7" -HOMEPAGE="http://www.sfcgal.org" -DOWNLOAD="https://github.com/Oslandia/SFCGAL/archive/v1.3.7/SFCGAL-1.3.7.tar.gz" -MD5SUM="5b0c2645ce4282a1b73012e9a89e84b6" +VERSION="1.5.0" +HOMEPAGE="https://sfcgal.gitlab.io/SFCGAL/" +DOWNLOAD="https://gitlab.com/sfcgal/SFCGAL/-/archive/v1.5.0/SFCGAL-v1.5.0.tar.gz" +MD5SUM="65ce9df8c6168b8498c39b35487b5f66" 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 6d285edd38..2499033d78 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: diff --git a/gis/Shapely/Shapely.info b/gis/Shapely/Shapely.info deleted file mode 100644 index d663c65c09..0000000000 --- a/gis/Shapely/Shapely.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Shapely" -VERSION="1.6.4" -HOMEPAGE="https://github.com/Toblerity/Shapely" -DOWNLOAD="https://github.com/Toblerity/Shapely/archive/1.6.4/Shapely-1.6.4.tar.gz" -MD5SUM="cf6f7abde575bb75ce0b39aaf061930f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geos python3" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/Shapely/slack-desc b/gis/Shapely/slack-desc deleted file mode 100644 index 04c91b0fa0..0000000000 --- a/gis/Shapely/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -Shapely: Shapely (geometric objects, predicates, and operations in Python) -Shapely: -Shapely: Shapely is a BSD-licensed Python package for manipulation and analysis -Shapely: of planar geometric objects. It is based on the widely deployed GEOS -Shapely: (the engine of PostGIS) and JTS (from which GEOS is ported) libraries. -Shapely: Shapely is not concerned with data formats or coordinate systems, but -Shapely: can be readily integrated with packages that are. -Shapely: -Shapely: Homepage: https://pypi.python.org/pypi/Shapely/ -Shapely: -Shapely: diff --git a/gis/TauDEM/README b/gis/TauDEM/README index a8a4ed9998..b17a7d25bf 100644 --- a/gis/TauDEM/README +++ b/gis/TauDEM/README @@ -1,20 +1,22 @@ -TauDEM (Terrain Analysis Using Digital Elevation Models) is a suite of Digital -Elevation Model (DEM) tools for the extraction and analysis of hydrologic -information from topography as represented by a DEM. TauDEM provides the -following capability: +TauDEM (Terrain Analysis Using Digital Elevation Models) is a suite of +Digital Elevation Model (DEM) tools for the extraction and analysis of +hydrologic information from topography as represented by a DEM. TauDEM +provides the following capability: -* Development of hydrologically correct (pit removed) DEMs using the flooding - approach +* Development of hydrologically correct (pit removed) DEMs using the + flooding approach * Calculates flow paths (directions) and slopes -* Calculates contributing area using single and multiple flow direction methods -* Multiple methods for the delineation of stream networks including topographic - form-based methods sensitive to spatially variable drainage density -* Objective methods for determination of the channel network delineation - threshold based on stream drops -* Delineation of watersheds and subwatersheds draining to each stream segment - and association between watershed and segment attributes for setting up - hydrologic models +* Calculates contributing area using single and multiple flow direction + methods +* Multiple methods for the delineation of stream networks including + topographic form-based methods sensitive to spatially variable + drainage density +* Objective methods for determination of the channel network + delineation threshold based on stream drops +* Delineation of watersheds and subwatersheds draining to each stream + segment and association between watershed and segment attributes for + setting up hydrologic models * Specialized functions for terrain analysis -Note TauDEM also works fine with MPICH, so if you have it installed it is not -necessary to install OpenMPI. +Note TauDEM also works fine with MPICH, so if you have it installed it +is not necessary to install OpenMPI. diff --git a/gis/TauDEM/TauDEM.SlackBuild b/gis/TauDEM/TauDEM.SlackBuild index fd7637f8a9..f685b8e3fb 100644 --- a/gis/TauDEM/TauDEM.SlackBuild +++ b/gis/TauDEM/TauDEM.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for TauDEM @@ -22,27 +22,37 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=TauDEM PACKAGENAME=TauDEM-5MF.0.0 VERSION=${VERSION:-5.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -92,4 +102,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/TauDEM/TauDEM.info b/gis/TauDEM/TauDEM.info index 13517010cb..104b0a275c 100644 --- a/gis/TauDEM/TauDEM.info +++ b/gis/TauDEM/TauDEM.info @@ -1,7 +1,7 @@ PRGNAM="TauDEM" VERSION="5.2.0" HOMEPAGE="http://hydrology.usu.edu/taudem/taudem5/index.html" -DOWNLOAD="https://github.com/dtarb/TauDEM/archive/5MF.0.0.tar.gz" +DOWNLOAD="https://github.com/dtarb/TauDEM/archive/5MF.0.0/TauDEM-5MF.0.0.tar.gz" MD5SUM="a2147f6bf880251892aa4ae54886c30d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/gis/basemap/README b/gis/basemap/README deleted file mode 100644 index 1f96d1c8ac..0000000000 --- a/gis/basemap/README +++ /dev/null @@ -1,2 +0,0 @@ -Plot on map projections (with coastlines and political boundaries) -using matplotlib. diff --git a/gis/basemap/basemap.info b/gis/basemap/basemap.info deleted file mode 100644 index f0db4505a0..0000000000 --- a/gis/basemap/basemap.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="basemap" -VERSION="1.2.1" -HOMEPAGE="https://github.com/matplotlib/basemap/" -DOWNLOAD="https://github.com/matplotlib/basemap/archive/v1.2.1rel/basemap-1.2.1rel.tar.gz" -MD5SUM="b3c4c1292b36abac27050eb67ada914e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geos matplotlib pyproj pyshp" -MAINTAINER="Cristiano Urban" -EMAIL="cristiano.urban.slack@gmail.com" diff --git a/gis/basemap/slack-desc b/gis/basemap/slack-desc deleted file mode 100644 index ef632ef9de..0000000000 --- a/gis/basemap/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -basemap: basemap (matplotlib library) -basemap: -basemap: Plot on map projections (with coastlines and political boundaries) -basemap: using matplotlib. -basemap: -basemap: Homepage: https://github.com/matplotlib/basemap/ -basemap: -basemap: -basemap: -basemap: -basemap: diff --git a/gis/cartopy/cartopy.info b/gis/cartopy/cartopy.info deleted file mode 100644 index b349b33d46..0000000000 --- a/gis/cartopy/cartopy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="cartopy" -VERSION="0.17.0" -HOMEPAGE="https://scitools.org.uk/cartopy/" -DOWNLOAD="https://github.com/SciTools/cartopy/archive/v0.17.0/cartopy-0.17.0.tar.gz" -MD5SUM="9fe063295a9fd854803d3c01a60720d0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geos matplotlib python3-matplotlib proj pyshp scipy scipy3 Shapely" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/cligj/cligj.SlackBuild b/gis/cligj/cligj.SlackBuild index a839decb66..95113af96f 100644 --- a/gis/cligj/cligj.SlackBuild +++ b/gis/cligj/cligj.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for cligj -# Copyright 2015-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2015-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,10 +24,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=cligj -VERSION=${VERSION:-0.5.0} +VERSION=${VERSION:-0.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -71,10 +81,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG -if $(python3 -c 'import sys' 2>/dev/null); then - python3 setup.py install --root=$PKG -fi +python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ @@ -86,4 +93,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/cligj/cligj.info b/gis/cligj/cligj.info index e0b926dbb9..4287ba4f05 100644 --- a/gis/cligj/cligj.info +++ b/gis/cligj/cligj.info @@ -1,8 +1,8 @@ PRGNAM="cligj" -VERSION="0.5.0" +VERSION="0.7.1" HOMEPAGE="https://github.com/mapbox/cligj" -DOWNLOAD="https://github.com/mapbox/cligj/archive/0.5.0/cligj-0.5.0.tar.gz" -MD5SUM="975f62cec147f68c74be8bc4b70faa14" +DOWNLOAD="https://github.com/mapbox/cligj/archive/0.7.1/cligj-0.7.1.tar.gz" +MD5SUM="fe4b6452e96e42254c0e3d4416e19851" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="click" diff --git a/gis/eccodes/README b/gis/eccodes/README new file mode 100644 index 0000000000..b592d858eb --- /dev/null +++ b/gis/eccodes/README @@ -0,0 +1,21 @@ +ecCodes is a package developed by ECMWF which provides an application +programming interface and a set of tools for decoding and encoding +messages in the following formats: + + WMO FM-92 GRIB edition 1 and edition 2 + WMO FM-94 BUFR edition 3 and edition 4 + WMO GTS abbreviated header (only decoding). + +A useful set of command line tools provide quick access to the messages. +C, Fortran 90 and Python interfaces provide access to the main ecCodes +functionality. + +ecCodes is an evolution of GRIB-API. It is designed to provide the +user with a simple set of functions to access data from several +formats with a key/value approach. + +netcdf is an optional dependency and support will be compiled in if it +is installed. + +NOTE: for 32bit platforms, the version is locked to 2.29.0 as 32 bit +support was dropped in version 2.30.0 and above. diff --git a/gis/eccodes/eccodes.SlackBuild b/gis/eccodes/eccodes.SlackBuild new file mode 100644 index 0000000000..aac4868d11 --- /dev/null +++ b/gis/eccodes/eccodes.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/bash + +# Slackware build script for eccodes + +# Copyright 2023-2024 Gregory J. L. Tourte <artourter@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=eccodes +VERSION=${VERSION:-2.34.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +if [[ ${TESTBUILD:='NO'} == 'NO' ]]; then + TESTBUILDFLAGS='-DENABLE_TESTS=OFF' +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION-Source +tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.gz +cd $PRGNAM-$VERSION-Source +chown -R root:root . +find -L . \ + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Deccodes_FULL_INSTALL_LIB_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DENABLE_AEC=ON \ + -DENABLE_PNG=ON \ + -DENABLE_ECCODES_OMP_THREADS=ON \ + $TESTBUILDFLAGS \ + -DCMAKE_BUILD_TYPE=Release \ + .. + + make + [[ $TESTBUILD == "YES" ]] && make test + make install/strip DESTDIR=$PKG +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +install -m 644 \ + AUTHORS ChangeLog LICENSE NEWS NOTICE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/eccodes/eccodes.info b/gis/eccodes/eccodes.info new file mode 100644 index 0000000000..2beec3783e --- /dev/null +++ b/gis/eccodes/eccodes.info @@ -0,0 +1,10 @@ +PRGNAM="eccodes" +VERSION="2.34.1" +HOMEPAGE="https://confluence.ecmwf.int/display/ECC" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.34.1-Source.tar.gz" +MD5SUM_x86_64="e87736db962053828e09d81610c2de93" +REQUIRES="libaec" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/eccodes/slack-desc b/gis/eccodes/slack-desc new file mode 100644 index 0000000000..b176003cbe --- /dev/null +++ b/gis/eccodes/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +eccodes: eccodes (ECMWF encoding/decoding library for GRIB, BUFR and GTS) +eccodes: +eccodes: ecCodes is a package developed by ECMWF which provides an application +eccodes: programming interface and a set of tools for decoding and encoding +eccodes: messages WMO FM-92 GRIB edition 1 and edition 2, WMO FM-94 BUFR +eccodes: edition 3 and edition 4, and WMO GTS abbreviated header (only +eccodes: decoding). +eccodes: +eccodes: ecCodes is an evolution of GRIB-API. It is designed to provide the +eccodes: user with a simple set of functions to access data from several +eccodes: formats with a key/value approach. diff --git a/gis/foxtrotgps/foxtrotgps-1.2.2-fix-some-receivers.patch.gz b/gis/foxtrotgps/foxtrotgps-1.2.2-fix-some-receivers.patch.gz Binary files differnew file mode 100644 index 0000000000..e67180d1ed --- /dev/null +++ b/gis/foxtrotgps/foxtrotgps-1.2.2-fix-some-receivers.patch.gz diff --git a/gis/foxtrotgps/foxtrotgps-1.2.2-gcc10.patch.gz b/gis/foxtrotgps/foxtrotgps-1.2.2-gcc10.patch.gz Binary files differnew file mode 100644 index 0000000000..da38c23f78 --- /dev/null +++ b/gis/foxtrotgps/foxtrotgps-1.2.2-gcc10.patch.gz diff --git a/gis/foxtrotgps/foxtrotgps-1.2.2-gpsd-api9.patch.gz b/gis/foxtrotgps/foxtrotgps-1.2.2-gpsd-api9.patch.gz Binary files differnew file mode 100644 index 0000000000..6e8471a93d --- /dev/null +++ b/gis/foxtrotgps/foxtrotgps-1.2.2-gpsd-api9.patch.gz diff --git a/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch b/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch deleted file mode 100644 index db19d19a28..0000000000 --- a/gis/foxtrotgps/foxtrotgps-gpsd-3.18.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- foxtrotgps-1.2.1/src/gps_functions.c.orig 2018-10-09 17:00:10.297646701 +0000 -+++ foxtrotgps-1.2.1/src/gps_functions.c 2018-10-09 17:00:43.751114273 +0000 -@@ -738,7 +738,7 @@ - if (!libgps_initialized) - return FALSE; - -- ret = gps_read(&libgps_gpsdata); -+ ret = gps_read(&libgps_gpsdata, NULL, 0); - /* Note that gps_read() will never actually return 0 - (zero-length reads are converted internally to a -1 return, - since they mean that the connection to the daemon has closed), diff --git a/gis/foxtrotgps/foxtrotgps.SlackBuild b/gis/foxtrotgps/foxtrotgps.SlackBuild index f40d7d5127..02d2a1c653 100644 --- a/gis/foxtrotgps/foxtrotgps.SlackBuild +++ b/gis/foxtrotgps/foxtrotgps.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for foxtrotgps @@ -24,10 +24,13 @@ # Modified by Mario Preksavec <mario at slackware dot hr> +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=foxtrotgps -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.2.2} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -64,6 +74,10 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION +# thanks gentoo maintainers +zcat $CWD/$PRGNAM-$VERSION-gpsd-api9.patch.gz | patch -p1 +zcat $CWD/$PRGNAM-$VERSION-gcc10.patch.gz | patch -p1 +zcat $CWD/$PRGNAM-$VERSION-fix-some-receivers.patch.gz | patch -p1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -71,9 +85,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch ripped off from Arch (thanks!) -patch -p1 < $CWD/foxtrotgps-gpsd-3.18.patch - # "--with-gconf-source" requires this, it will put all files in the package mkdir -p $PKG/etc/gconf/gconf.xml.defaults @@ -113,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/foxtrotgps/foxtrotgps.info b/gis/foxtrotgps/foxtrotgps.info index e3b03d6e4b..cd673a3b38 100644 --- a/gis/foxtrotgps/foxtrotgps.info +++ b/gis/foxtrotgps/foxtrotgps.info @@ -1,8 +1,8 @@ PRGNAM="foxtrotgps" -VERSION="1.2.1" +VERSION="1.2.2" HOMEPAGE="https://www.foxtrotgps.org/" -DOWNLOAD="https://www.foxtrotgps.org/releases/foxtrotgps-1.2.1.tar.xz" -MD5SUM="b4042572edbbad13db6bc90eb9a7f11b" +DOWNLOAD="https://www.foxtrotgps.org/releases/foxtrotgps-1.2.2.tar.xz" +MD5SUM="3a7e7b94202134b51b11dcb80734eb7f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gpsd" diff --git a/gis/gdal/README b/gis/gdal/README index c959862f44..ba3dc22097 100644 --- a/gis/gdal/README +++ b/gis/gdal/README @@ -10,9 +10,16 @@ provides a similar capability for simple features vector data. The following optional requirements are detected automatically: - cfitsio, freexl, hdf, hdf5, libkml, libwebp, netcdf, - postgresql, python3, xerces-c + hdf, postgresql, SFCGAL, libheif To enable OpenCL GPU-accelerated performance, specify the option -OPENCL=yes (requires opencl-headers to build, and either nvidia-driver -or amd-app-sdk with suitable GPU hardware to run). +OPENCL=yes (requires either nvidia-driver or amd-app-sdk with +suitable GPU hardware to run). + +To build JAVA bindings, specify JAVA=yes (it requires a java JDK and +ant). + +By default, the script does not build nor run the tests. You can use the +option TESTBUILD=YES to build and run the tests before the make install +part. Tests are only present for the java bindings to this options does +nothing is the java bindings are not build. diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild index 420ad8de91..b772003aad 100644 --- a/gis/gdal/gdal.SlackBuild +++ b/gis/gdal/gdal.SlackBuild @@ -1,8 +1,11 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for GDAL # Copyright 2009 Marco Cecchetti <mrc.ild@gmail.com> +# Copyright 2010-2018 David Spencer <baildon.research@googlemail.com> +# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2024 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +25,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Maintained by David Spencer <baildon.research@googlemail.com> + +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdal -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.8.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +42,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -58,6 +67,10 @@ fi set -e +if [[ ${TESTBUILD:='NO'} == 'NO' ]]; then + TESTBUILDFLAGS='-DBUILD_TESTING=OFF' +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -66,102 +79,104 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -# OpenCL, webp, Spatialite and Grass support need special arrangements. -# Everything else is handled automatically by configure. WITHLIST="" # Request OpenCL support: if [ ${OPENCL:-no} = "yes" ]; then - WITHLIST+=" --with-opencl" -fi - -# Request webp support if it's installed: -if pkg-config --exists libwebp; then - WITHLIST+=" --with-webp" -fi - -# Spatialite support in gdal optionally has a circular dependency -# via the postgis 'liblwgeom' library (postgis depends on gdal). -# Here is an undocumented option to request Spatialite support, -# if you promise to be careful :-) -if pkg-config --exists spatialite; then - if [ ${SPATIALITE:-no} = "yes" ]; then - WITHLIST+=" --with-spatialite" - fi -fi - -# Also, enabling Grass support in gdal introduces a circular dependency, -# so here is another undocumented option. -if pkg-config --exists grass; then - if [ ${GRASS:-no} = "yes" ]; then - WITHLIST+=" --with-grass=$(pkg-config --variable=prefix grass)" - fi + WITHLIST+=" -DGDAL_USE_OPENCL=ON" +else + WITHLIST+=" -DGDAL_USE_OPENCL=OFF" fi -# 12 bit JPEG support is handled by internal modified versions of libjpeg -# and libtiff, but this can cause segfaults in other software linked against -# the real libjpeg (eg. qgis calling qt). Enable JPEG12 only if you need it: -if [ ${JPEG12:-no} = "yes" ]; then - WITHLIST+=" --with-jpeg=internal" -else - WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}" +# Build JAVA bindings: +if [ ${JAVA:-no} = "no" ]; then + WITHLIST+=" -DBUILD_JAVA_BINDINGS:BOOL=OFF" fi -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --with-threads \ - --with-geos=yes \ - --with-libz=/usr/lib${LIBDIRSUFFIX} \ - --with-liblzma \ - --with-curl=/usr/bin/curl-config \ - --without-grib \ - --with-static-proj4 \ - --with-mysql \ - --with-python \ - --with-poppler \ - --with-libtiff=internal \ - --with-rename-internal-libtiff-symbols=yes \ - --with-geotiff=internal \ - --with-rename-internal-libgeotiff-symbols=yes \ - --with-jasper=no \ - $WITHLIST \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -cd swig/python - rm -rf build - python3 setup.py build - python3 setup.py install --root=$PKG --prefix=/usr -cd - >/dev/null +mkdir build + +( cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_DATAROOTDIR=share \ + -DCMAKE_INSTALL_MANDIR=man \ + -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \ + -DBUILD_CSHARP_BINDINGS:BOOL=OFF \ + -DBUILD_PYTHON_BINDINGS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DGDAL_USE_ARCHIVE:BOOL=ON \ + -DGDAL_USE_CFITSIO:BOOL=ON \ + -DGDAL_USE_CRYPTOPP:BOOL=ON \ + -DGDAL_USE_CURL:BOOL=ON \ + -DGDAL_USE_EXPAT:BOOL=ON \ + -DGDAL_USE_EXTERNAL_LIBS:BOOL=ON \ + -DGDAL_USE_FREEXL:BOOL=ON \ + -DGDAL_USE_GEOS:BOOL=ON \ + -DGDAL_USE_GEOTIFF:BOOL=ON \ + -DGDAL_USE_GEOTIFF_INTERNAL:BOOL=OFF \ + -DGDAL_USE_GIF:BOOL=ON \ + -DGDAL_USE_GIF_INTERNAL:BOOL=OFF \ + -DGDAL_USE_HDF5:BOOL=ON \ + -DGDAL_USE_ICONV:BOOL=ON \ + -DGDAL_USE_JPEG:BOOL=ON \ + -DGDAL_USE_JPEG12_INTERNAL:BOOL=ON \ + -DGDAL_USE_JPEG_INTERNAL:BOOL=OFF \ + -DGDAL_USE_JSONC:BOOL=ON \ + -DGDAL_USE_JSONC_INTERNAL:BOOL=OFF \ + -DGDAL_USE_LERC_INTERNAL:BOOL=ON \ + -DGDAL_USE_LIBAEC:BOOL=ON \ + -DGDAL_USE_LIBLZMA:BOOL=ON \ + -DGDAL_USE_LIBXML2:BOOL=ON \ + -DGDAL_USE_LZ4:BOOL=ON \ + -DGDAL_USE_MYSQL:BOOL=ON \ + -DGDAL_USE_NETCDF:BOOL=ON \ + -DGDAL_USE_OPENCAD_INTERNAL:BOOL=ON \ + -DGDAL_USE_OPENEXR:BOOL=ON \ + -DGDAL_USE_OPENJPEG:BOOL=ON \ + -DGDAL_USE_OPENSSL:BOOL=ON \ + -DGDAL_USE_PCRE2:BOOL=ON \ + -DGDAL_USE_PNG:BOOL=ON \ + -DGDAL_USE_PNG_INTERNAL:BOOL=OFF \ + -DGDAL_USE_PODOFO:BOOL=ON \ + -DGDAL_USE_POPPLER:BOOL=ON \ + -DGDAL_USE_PUBLICDECOMPWT:BOOL=OFF \ + -DGDAL_USE_QHULL_INTERNAL:BOOL=ON \ + -DGDAL_USE_SHAPELIB_INTERNAL:BOOL=ON \ + -DGDAL_USE_SPATIALITE:BOOL=ON \ + -DGDAL_USE_SQLITE3:BOOL=ON \ + -DGDAL_USE_TIFF:BOOL=ON \ + -DGDAL_USE_TIFF_INTERNAL:BOOL=OFF \ + -DGDAL_USE_WEBP:BOOL=ON \ + -DGDAL_USE_XERCESC:BOOL=ON \ + -DGDAL_USE_ZLIB:BOOL=ON \ + -DGDAL_USE_ZLIB_INTERNAL:BOOL=OFF \ + -DGDAL_USE_ZSTD:BOOL=ON \ + $WITHLIST \ + $TESTBUILDFLAGS \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make + [[ $TESTBUILD == "YES" ]] && make test + make install/strip DESTDIR=$PKG +) find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -make -f GNUmakefile -B man -make install-man DESTDIR=$PKG find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -make -f GNUmakefile -B docs -# --docdir is ignored :-( -make install-docs DESTDIR=$PKG INST_DOCS=/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COMMITTERS HOWTO-RELEASE LICENSE.TXT NEWS PROVENANCE.TXT VERSION \ + CITATION COMMITTERS HOWTO-RELEASE LICENSE.TXT MIGRATION_GUIDE.TXT NEWS.md PROVENANCE.TXT SECURITY.md VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -169,4 +184,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info index 36c3615f9c..70e6cd04c3 100644 --- a/gis/gdal/gdal.info +++ b/gis/gdal/gdal.info @@ -1,10 +1,10 @@ PRGNAM="gdal" -VERSION="3.0.2" +VERSION="3.8.5" HOMEPAGE="https://www.gdal.org/" -DOWNLOAD="https://download.osgeo.org/gdal/3.0.2/gdal-3.0.2.tar.xz" -MD5SUM="0353d7e56efc79fcaaeb21d808cb9cac" +DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz" +MD5SUM="1e192b50698c11c8a3c5c223343cb86d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="geos proj python3" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" +REQUIRES="xerces-c libkml netcdf libspatialite podofo libgeotiff" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/geogig-py/README b/gis/geogig-py/README deleted file mode 100644 index c434f2de9d..0000000000 --- a/gis/geogig-py/README +++ /dev/null @@ -1,3 +0,0 @@ -geogig-py is a Python library to use GeoGig designed to provide access to all -GeoGig functionality, so it can be used to script tasks or as the base library -for a GeoGig client. diff --git a/gis/geogig-py/geogig-py.SlackBuild b/gis/geogig-py/geogig-py.SlackBuild deleted file mode 100644 index 9929fc7605..0000000000 --- a/gis/geogig-py/geogig-py.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# Slackware build script for geogig-py - -# Copyright 2015 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geogig-py -VERSION=${VERSION:-1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ - grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geogig-py/geogig-py.info b/gis/geogig-py/geogig-py.info deleted file mode 100644 index 403c0d79e3..0000000000 --- a/gis/geogig-py/geogig-py.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geogig-py" -VERSION="1.0" -HOMEPAGE="https://github.com/boundlessgeo/geogig-py" -DOWNLOAD="https://pypi.python.org/packages/source/g/geogig-py/geogig-py-1.0.zip" -MD5SUM="e7fb0dae9cb98f8d57ef3812afedbe53" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geogig geojson py4j Shapely" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geogig/README b/gis/geogig/README deleted file mode 100644 index ac16a3fe0c..0000000000 --- a/gis/geogig/README +++ /dev/null @@ -1,7 +0,0 @@ -GeoGig is a distributed version control system specially designed to handle -geospatial data. GeoGig draws inspiration from Git, but adapts its -core concepts to handle versioning of spatial data. Users are able to import -raw geospatial data (such as Shapefiles, PostGIS or SpatiaLite) into a -repository where every change to the data is tracked. These changes can be -viewed in a history, reverted to older versions, branched into sandboxed -areas, merged back in or pushed to remote repositories. diff --git a/gis/geogig/geogig.SlackBuild b/gis/geogig/geogig.SlackBuild deleted file mode 100644 index 2abc31cb81..0000000000 --- a/gis/geogig/geogig.SlackBuild +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -# Slackware build script for geogig -# Benjamin Trigona-Harany -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geogig -VERSION=${VERSION:-1.0_beta1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -API_DOCS=${API_DOCS:-no} -GEOGIG_HOME=usr/share/$PRGNAM - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG/$GEOGIG_HOME $PKG/usr/bin $OUTPUT -cd $TMP -rm -rf $PRGNAM -unzip $CWD/$PRGNAM-cli-app-$(echo $VERSION | tr '_' '-').zip -cd $PRGNAM -chown -R root:root . - -rm bin/*.bat -cp -a bin repo $PKG/$GEOGIG_HOME/ - -# set the path to the jar wrapper in the startup script -ln -s /$GEOGIG_HOME/bin/geogig $PKG/usr/bin/geogig -ln -s /$GEOGIG_HOME/bin/geogig-console $PKG/usr/bin/geogig-console -ln -s /$GEOGIG_HOME/bin/geogig-gateway $PKG/usr/bin/geogig-gateway - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geogig/geogig.info b/gis/geogig/geogig.info deleted file mode 100644 index a45b71d2c6..0000000000 --- a/gis/geogig/geogig.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geogig" -VERSION="1.0_beta1" -HOMEPAGE="http://geogig.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/geogig/geogig-1.0-beta1/geogig-cli-app-1.0-beta1.zip" -MD5SUM="ffa3b7d22ee4e4d75c7203fbb73c19c1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="jdk" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geogig/slack-desc b/gis/geogig/slack-desc deleted file mode 100644 index 3883f9c16f..0000000000 --- a/gis/geogig/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -geogig: geogig (Distributed version control for geospatial data) -geogig: -geogig: geogig is a distributed version control system specially designed to -geogig: handle geospatial data. geogig draws inspiration from Git, but adapts -geogig: its core concepts to handle versioning of spatial data. Users are able -geogig: to import raw geospatial data (such as Shapefiles, PostGIS or -geogig: SpatiaLite) into a repository where every change to the data is -geogig: tracked. These changes can be viewed in a history, reverted, branched -geogig: into sandboxed areas, merged back in or pushed to remote repositories. -geogig: -geogig: Homepage: http://geogig.org diff --git a/gis/geographiclib-python/README b/gis/geographiclib-python/README index 92ec5525af..d52bc0737d 100644 --- a/gis/geographiclib-python/README +++ b/gis/geographiclib-python/README @@ -1,5 +1,5 @@ -This is a Python implementation of the geodesic routines in GeographicLib -(http://geographiclib.sourceforge.net/). +This is a Python implementation of the geodesic routines in +GeographicLib (http://geographiclib.sourceforge.net/). -Although it is maintained in conjunction with the larger C++ library, this -Python package can be used independently. +Although it is maintained in conjunction with the larger C++ library, +this Python package can be used independently. diff --git a/gis/geographiclib-python/geographiclib-python.SlackBuild b/gis/geographiclib-python/geographiclib-python.SlackBuild index 929ececd45..1f725b3a76 100644 --- a/gis/geographiclib-python/geographiclib-python.SlackBuild +++ b/gis/geographiclib-python/geographiclib-python.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # # SlackBuild for geographiclib-python # -# Copyright 2016-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2016-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -21,10 +21,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=geographiclib-python VERSION=${VERSION:-1.50} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} SRCNAM=geographiclib @@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -72,7 +82,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -85,4 +94,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/geographiclib-python/geographiclib-python.info b/gis/geographiclib-python/geographiclib-python.info index 3ea0bec6a6..0ad4f5aa5f 100644 --- a/gis/geographiclib-python/geographiclib-python.info +++ b/gis/geographiclib-python/geographiclib-python.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/g/geographiclib/geograp MD5SUM="06cb02d3e8d84383f7d040c2df13e8ea" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3" +REQUIRES="" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/geojson/geojson.SlackBuild b/gis/geojson/geojson.SlackBuild index 90444a0002..49408b8cbc 100644 --- a/gis/geojson/geojson.SlackBuild +++ b/gis/geojson/geojson.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for geojson -# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=geojson VERSION=${VERSION:-2.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,7 +79,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ @@ -85,4 +94,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/geojson/geojson.info b/gis/geojson/geojson.info index 0108fd1c95..e15d3db961 100644 --- a/gis/geojson/geojson.info +++ b/gis/geojson/geojson.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/jazzband/geojson/archive/2.5.0/geojson-2.5.0.tar.gz MD5SUM="e1b3f4ee17f86e361123c3ef4c6fab41" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3" +REQUIRES="" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/geopandas/README b/gis/geopandas/README new file mode 100644 index 0000000000..89fa9b47f9 --- /dev/null +++ b/gis/geopandas/README @@ -0,0 +1,5 @@ +GeoPandas is a project to add support for geographic data to +pandas objects. It currently implements GeoSeries and GeoDataFrame +types which are subclasses of pandas.Series and pandas.DataFrame +respectively. GeoPandas objects can act on shapely geometry objects +and perform geometric operations. diff --git a/gis/pyshp/pyshp.SlackBuild b/gis/geopandas/geopandas.SlackBuild index fb292ebe3d..3a5365c81d 100644 --- a/gis/pyshp/pyshp.SlackBuild +++ b/gis/geopandas/geopandas.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for pyshp +# SlackBuild script for geopandas -# Copyright 2014-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2020-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pyshp -VERSION=${VERSION:-2.1.0} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=geopandas +VERSION=${VERSION:-0.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,15 +79,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - changelog.txt README.md LICENSE.TXT \ + LICENSE.txt README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -85,4 +91,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/geopandas/geopandas.info b/gis/geopandas/geopandas.info new file mode 100644 index 0000000000..37aa54c930 --- /dev/null +++ b/gis/geopandas/geopandas.info @@ -0,0 +1,10 @@ +PRGNAM="geopandas" +VERSION="0.9.0" +HOMEPAGE="https://github.com/geopandas/geopandas" +DOWNLOAD="https://github.com/geopandas/geopandas/archive/v0.9.0/geopandas-0.9.0.tar.gz" +MD5SUM="d4f8ca22c882d80f40a48f4ac0983c7c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="geopy Fiona python3-psycopg2 python3-pyproj python3-pandas python3-shapely" +MAINTAINER="Benjamin Trigona-Harany" +EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/geoserver/slack-desc b/gis/geopandas/slack-desc index 7780bc7bd7..50ab2d22ee 100644 --- a/gis/geoserver/slack-desc +++ b/gis/geopandas/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -geoserver: geoserver (geospatial server) -geoserver: -geoserver: GeoServer is a Java server for publishing geospatial data using the -geoserver: Open Geospatial Consortium's Web Feature Service, Web Map Service and -geoserver: Web Coverage Service standards. -geoserver: -geoserver: Homepage: http://geoserver.org -geoserver: -geoserver: -geoserver: -geoserver: +geopandas: geopandas (Python tools for geographic data) +geopandas: +geopandas: GeoPandas is a project to add support for geographic data to pandas +geopandas: objects. It currently implements GeoSeries and GeoDataFrame types +geopandas: which are subclasses of pandas.Series and pandas.DataFrame +geopandas: respectively. GeoPandas objects can act on shapely geometry objects +geopandas: and perform geometric operations. +geopandas: +geopandas: +geopandas: +geopandas: diff --git a/gis/geopy/README b/gis/geopy/README index a235b18e15..3464f8c4a4 100644 --- a/gis/geopy/README +++ b/gis/geopy/README @@ -1,8 +1,9 @@ -geopy makes it easy for developers to locate the coordinates of addresses, -cities, countries, and landmarks across the globe using third-party -geocoders and other data sources. +geopy makes it easy for developers to locate the coordinates of +addresses, cities, countries, and landmarks across the globe using +third-party geocoders and other data sources. -geopy currently includes support for several geocoders, including OpenStreetMap -Nominatim, ESRI ArcGIS, Google Geocoding API and more. +geopy currently includes support for several geocoders, including +OpenStreetMap Nominatim, ESRI ArcGIS, Google Geocoding API and more. -python/pytz is an optional dependency that will be used if available. +python/pytz and python/python3-aiohttp are optional dependencies that +will be used if available. diff --git a/gis/geopy/geopy.SlackBuild b/gis/geopy/geopy.SlackBuild index 2a901b6a28..84a41be348 100644 --- a/gis/geopy/geopy.SlackBuild +++ b/gis/geopy/geopy.SlackBuild @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for geopy # Written by Dominik Drobek <dominik.drobek (at) o2.pl> # Formerly maintained by Francisco Sokol <chico.sokol@gmail.com> -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=geopy -VERSION=${VERSION:-1.20.0} +VERSION=${VERSION:-2.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -71,7 +81,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -84,4 +93,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/geopy/geopy.info b/gis/geopy/geopy.info index ead4b20dc1..65f35687c3 100644 --- a/gis/geopy/geopy.info +++ b/gis/geopy/geopy.info @@ -1,10 +1,10 @@ PRGNAM="geopy" -VERSION="1.20.0" +VERSION="2.1.0" HOMEPAGE="https://github.com/geopy/geopy" -DOWNLOAD="https://github.com/geopy/geopy/archive/1.20.0/geopy-1.20.0.tar.gz" -MD5SUM="3c9bdd7f811c8b502f0c595e28ce7043" +DOWNLOAD="https://github.com/geopy/geopy/archive/2.1.0/geopy-2.1.0.tar.gz" +MD5SUM="0573cc833b3566fd4c06f10f1646a252" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3" +REQUIRES="" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/geos/README b/gis/geos/README index b6cf0b40fa..857f61a8f5 100644 --- a/gis/geos/README +++ b/gis/geos/README @@ -3,3 +3,7 @@ Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial predicate functions and spatial operators, as well as specific JTS enhanced topology functions. + +By default, the script does not build nor run the tests. You can use the +option TESTBUILD=YES to build and run the tests before the make install +part. diff --git a/gis/geos/geos.SlackBuild b/gis/geos/geos.SlackBuild index b5354ce3c1..1e679546fa 100644 --- a/gis/geos/geos.SlackBuild +++ b/gis/geos/geos.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for geos # Written by Kyle Guinn <elyk03@gmail.com> -# Maintained 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Maintained 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2023 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=geos -VERSION=${VERSION:-3.8.0} +VERSION=${VERSION:-3.12.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -56,6 +67,10 @@ fi set -e +if [[ ${TESTBUILD:='NO'} == 'NO' ]]; then + TESTBUILDFLAGS='-DBUILD_TESTING=OFF' +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -64,33 +79,32 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++11" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --disable-static \ - --enable-python \ - --disable-ruby \ - --build=$ARCH-slackware-linux +mkdir -p build +( + cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + $TESTBUILDFLAGS \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make + [[ $TESTBUILD == "YES" ]] && make test + make install DESTDIR=$PKG +) -make -make install-strip DESTDIR=$PKG +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING NEWS README.md \ + AUTHORS CODE_OF_CONDUCT.md COPYING DEVELOPER-NOTES.md NEWS.md README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -98,4 +112,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/geos/geos.info b/gis/geos/geos.info index cea2feb0f0..40eaaee3ed 100644 --- a/gis/geos/geos.info +++ b/gis/geos/geos.info @@ -1,10 +1,10 @@ PRGNAM="geos" -VERSION="3.8.0" -HOMEPAGE="http://trac.osgeo.org/geos/" -DOWNLOAD="http://download.osgeo.org/geos/geos-3.8.0.tar.bz2" -MD5SUM="6fe3ad412a1162b2ed7c7ed52ed974c0" +VERSION="3.12.1" +HOMEPAGE="https://libgeos.org/" +DOWNLOAD="https://download.osgeo.org/geos/geos-3.12.1.tar.bz2" +MD5SUM="36d16fbea7e923c50b33ddb83516c36e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/geoserver-control-flow/README b/gis/geoserver-control-flow/README deleted file mode 100644 index 2725121b6b..0000000000 --- a/gis/geoserver-control-flow/README +++ /dev/null @@ -1,4 +0,0 @@ -The Control Flow plugin allows the administrator to control the number of -concurrent requests executing on the server at any one time. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-control-flow/geoserver-control-flow.SlackBuild b/gis/geoserver-control-flow/geoserver-control-flow.SlackBuild deleted file mode 100644 index 495e2b5a7a..0000000000 --- a/gis/geoserver-control-flow/geoserver-control-flow.SlackBuild +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver-control-flow - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver-control-flow -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-control-flow-plugin.zip - -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -a *.jar $PKG/usr/share/geoserver/WEB-INF/lib - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver-control-flow/geoserver-control-flow.info b/gis/geoserver-control-flow/geoserver-control-flow.info deleted file mode 100644 index 2c1308e0c3..0000000000 --- a/gis/geoserver-control-flow/geoserver-control-flow.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-control-flow" -VERSION="2.7.0" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="http://downloads.sourceforge.net/project/geoserver/GeoServer/2.7.0/extensions/geoserver-2.7.0-control-flow-plugin.zip" -MD5SUM="06c242102c739f10439de2f4fd672313" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-control-flow/slack-desc b/gis/geoserver-control-flow/slack-desc deleted file mode 100644 index 1c7847cbf4..0000000000 --- a/gis/geoserver-control-flow/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -geoserver-control-flow: geoserver-control-flow (GeoServer request rate limitation) -geoserver-control-flow: -geoserver-control-flow: The Control Flow plugin allows the administrator to control the number -geoserver-control-flow: of concurrent requests executing on the server at any one time. -geoserver-control-flow: -geoserver-control-flow: -geoserver-control-flow: -geoserver-control-flow: -geoserver-control-flow: -geoserver-control-flow: -geoserver-control-flow: diff --git a/gis/geoserver-css/README b/gis/geoserver-css/README deleted file mode 100644 index f3e4dd94c8..0000000000 --- a/gis/geoserver-css/README +++ /dev/null @@ -1,3 +0,0 @@ -The CSS plugin adds support for CSS styling to GeoServer. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-css/geoserver-css.SlackBuild b/gis/geoserver-css/geoserver-css.SlackBuild deleted file mode 100644 index 2d3498288d..0000000000 --- a/gis/geoserver-css/geoserver-css.SlackBuild +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver-css - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver-css -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-css-plugin.zip - -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -a *.jar $PKG/usr/share/geoserver/WEB-INF/lib - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a SCALA-LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver-css/geoserver-css.info b/gis/geoserver-css/geoserver-css.info deleted file mode 100644 index 5e1ac9fd6e..0000000000 --- a/gis/geoserver-css/geoserver-css.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-css" -VERSION="2.7.0" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="http://downloads.sourceforge.net/project/geoserver/GeoServer/2.7.0/extensions/geoserver-2.7.0-css-plugin.zip" -MD5SUM="8f39d3267302ea33d963ce9a01ffb294" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-javascript/README b/gis/geoserver-javascript/README deleted file mode 100644 index 3240de9e17..0000000000 --- a/gis/geoserver-javascript/README +++ /dev/null @@ -1,3 +0,0 @@ -The JavaScript plugin adds support for JavaScript GeoScript to GeoServer. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-javascript/geoserver-javascript.info b/gis/geoserver-javascript/geoserver-javascript.info deleted file mode 100644 index e688303980..0000000000 --- a/gis/geoserver-javascript/geoserver-javascript.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-javascript" -VERSION="2.7" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/geoserver-javascript/geoserver-2.7-SNAPSHOT-javascript-plugin.zip" -MD5SUM="55b82b1511aa99084568bd3e8ee8df6c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver-wps" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-javascript/slack-desc b/gis/geoserver-javascript/slack-desc deleted file mode 100644 index 3a2133ec9c..0000000000 --- a/gis/geoserver-javascript/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -geoserver-javascript: geoserver-javascript (JavaScript scripting support for GeoServer) -geoserver-javascript: -geoserver-javascript: The JavaScript plugin adds support for JavaScript GeoScript to -geoserver-javascript: GeoServer. -geoserver-javascript: -geoserver-javascript: -geoserver-javascript: -geoserver-javascript: -geoserver-javascript: -geoserver-javascript: -geoserver-javascript: diff --git a/gis/geoserver-oracle/README b/gis/geoserver-oracle/README deleted file mode 100644 index 170277f85c..0000000000 --- a/gis/geoserver-oracle/README +++ /dev/null @@ -1,3 +0,0 @@ -The Oracle plugin adds support for Oracle data stores to GeoServer. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-oracle/geoserver-oracle.SlackBuild b/gis/geoserver-oracle/geoserver-oracle.SlackBuild deleted file mode 100644 index a6234c4b3d..0000000000 --- a/gis/geoserver-oracle/geoserver-oracle.SlackBuild +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver-oracle - -# Copyright 2013-2014 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver-oracle -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-oracle-plugin.zip - -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -a *.jar $PKG/usr/share/geoserver/WEB-INF/lib - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Oracle-LICENSE.txt oracle-readme.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver-oracle/geoserver-oracle.info b/gis/geoserver-oracle/geoserver-oracle.info deleted file mode 100644 index 2ce3b5d9ba..0000000000 --- a/gis/geoserver-oracle/geoserver-oracle.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-oracle" -VERSION="2.7.0" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="http://downloads.sourceforge.net/project/geoserver/GeoServer/2.7.0/extensions/geoserver-2.7.0-oracle-plugin.zip" -MD5SUM="4953eeb411d6b087bb7792932412ca13" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-pyramid/README b/gis/geoserver-pyramid/README deleted file mode 100644 index 867d99c368..0000000000 --- a/gis/geoserver-pyramid/README +++ /dev/null @@ -1,3 +0,0 @@ -The pyramid plugin adds support for image pyramid data stores to GeoServer. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-pyramid/geoserver-pyramid.SlackBuild b/gis/geoserver-pyramid/geoserver-pyramid.SlackBuild deleted file mode 100644 index 0b2dffbacf..0000000000 --- a/gis/geoserver-pyramid/geoserver-pyramid.SlackBuild +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver-pyramid - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver-pyramid -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-pyramid-plugin.zip - -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -a *.jar $PKG/usr/share/geoserver/WEB-INF/lib - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver-pyramid/geoserver-pyramid.info b/gis/geoserver-pyramid/geoserver-pyramid.info deleted file mode 100644 index 8afc4099a6..0000000000 --- a/gis/geoserver-pyramid/geoserver-pyramid.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-pyramid" -VERSION="2.7.0" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="http://downloads.sourceforge.net/project/geoserver/GeoServer/2.7.0/extensions/geoserver-2.7.0-pyramid-plugin.zip" -MD5SUM="99c2d1f0e9add46e1361a2513a59ceac" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-pyramid/slack-desc b/gis/geoserver-pyramid/slack-desc deleted file mode 100644 index 071d83ce55..0000000000 --- a/gis/geoserver-pyramid/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -geoserver-pyramid: geoserver-pyramid (pyramid data store support for GeoServer) -geoserver-pyramid: -geoserver-pyramid: The pyramid plugin adds support for image pyramid data stores to -geoserver-pyramid: GeoServer. -geoserver-pyramid: -geoserver-pyramid: -geoserver-pyramid: -geoserver-pyramid: -geoserver-pyramid: -geoserver-pyramid: -geoserver-pyramid: diff --git a/gis/geoserver-python/README b/gis/geoserver-python/README deleted file mode 100644 index b45ddc75ae..0000000000 --- a/gis/geoserver-python/README +++ /dev/null @@ -1,3 +0,0 @@ -The Python plugin adds support for Python GeoScript to GeoServer. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-python/geoserver-python.SlackBuild b/gis/geoserver-python/geoserver-python.SlackBuild deleted file mode 100644 index b0894a6297..0000000000 --- a/gis/geoserver-python/geoserver-python.SlackBuild +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver-python - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver-python -VERSION=${VERSION:-2.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-SNAPSHOT-python-plugin.zip - -# remove SNAPSHOT versions of .jar files duplicated in dependencies -rm gt-geojson-13-SNAPSHOT.jar -rm gt-process-13-SNAPSHOT.jar -rm gt-process-feature-13-SNAPSHOT.jar -rm gt-process-geometry-13-SNAPSHOT.jar -rm gt-process-raster-13-SNAPSHOT.jar - -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -a *.jar $PKG/usr/share/geoserver/WEB-INF/lib - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver-python/geoserver-python.info b/gis/geoserver-python/geoserver-python.info deleted file mode 100644 index 1029bccb1b..0000000000 --- a/gis/geoserver-python/geoserver-python.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-python" -VERSION="2.7" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/geoserver-python/geoserver-2.7-SNAPSHOT-python-plugin.zip" -MD5SUM="14f289d82867ce1f801e037b45a74cef" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver-wps" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-python/slack-desc b/gis/geoserver-python/slack-desc deleted file mode 100644 index 0a49448434..0000000000 --- a/gis/geoserver-python/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -geoserver-python: geoserver-python (Python scripting support for GeoServer) -geoserver-python: -geoserver-python: The Python plugin adds support for Python GeoScript to GeoServer. -geoserver-python: -geoserver-python: -geoserver-python: -geoserver-python: -geoserver-python: -geoserver-python: -geoserver-python: -geoserver-python: diff --git a/gis/geoserver-wps/README b/gis/geoserver-wps/README deleted file mode 100644 index 5f1c2abed1..0000000000 --- a/gis/geoserver-wps/README +++ /dev/null @@ -1,3 +0,0 @@ -The WPS plugin adds Web Processing Service (WPS) support to GeoServer. - -Tomcat must be restarted for the plugin to take effect. diff --git a/gis/geoserver-wps/geoserver-wps.SlackBuild b/gis/geoserver-wps/geoserver-wps.SlackBuild deleted file mode 100644 index c1dcc58ba0..0000000000 --- a/gis/geoserver-wps/geoserver-wps.SlackBuild +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver-wps - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver-wps -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-wps-plugin.zip - -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -r *.jar $PKG/usr/share/geoserver/WEB-INF/lib - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver-wps/geoserver-wps.info b/gis/geoserver-wps/geoserver-wps.info deleted file mode 100644 index c420d95b55..0000000000 --- a/gis/geoserver-wps/geoserver-wps.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver-wps" -VERSION="2.7.0" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="http://downloads.sourceforge.net/project/geoserver/GeoServer/2.7.0/extensions/geoserver-2.7.0-wps-plugin.zip" -MD5SUM="0b8021bd17c1785e2d5253b3b05d483e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="geoserver" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver-wps/slack-desc b/gis/geoserver-wps/slack-desc deleted file mode 100644 index f9125cc6cb..0000000000 --- a/gis/geoserver-wps/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -geoserver-wps: geoserver-wps (WPS support for GeoServer) -geoserver-wps: -geoserver-wps: The WPS plugin adds Web Processing Service support to GeoServer. -geoserver-wps: -geoserver-wps: -geoserver-wps: -geoserver-wps: -geoserver-wps: -geoserver-wps: -geoserver-wps: -geoserver-wps: diff --git a/gis/geoserver/README b/gis/geoserver/README deleted file mode 100644 index 5fda3a0445..0000000000 --- a/gis/geoserver/README +++ /dev/null @@ -1,23 +0,0 @@ -GeoServer is a Java-base server that allows users to publish and edit -geospatial data using open standards. - -GeoServer is the reference implementation of the Open Geospatial Consortium's -Web Feature Service (WFS) and Web Coverage Service (WCS) standards, as well as -a high-performance Web Map Service (WMS). Additional functionality is available -through the use of plugins. - -This SlackBuild will install GeoServer as a web application for a Tomcat -servlet container. The SlackBuild will not overwrite any geoserver.war file -that has been deployed using /var/lib/tomcat/webapps, but by default they will -both be using the same /geoserver web path. This path can be changed from its -default by editing /etc/tomcat/Catalina/localhost/geoserver.xml. - -The SlackBuild will create a data directory for GeoServer at /var/lib/geoserver -but will not add any content, meaning that uninstalls, reinstalls, and upgrades -will not affect existing data directories. Nevertheless, the data directory -should still always be backed up prior to an upgrade. An empty data directory -will be populated by a minimal set of configuration files when GeoServer is -started for the first time. - -The jai and jai-imageio packages are recommended for improved image rendering -performance. diff --git a/gis/geoserver/data_dir.patch b/gis/geoserver/data_dir.patch deleted file mode 100644 index b1a74707e3..0000000000 --- a/gis/geoserver/data_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur WEB-INF.orig/web.xml WEB-INF/web.xml ---- WEB-INF.orig/web.xml 2013-11-06 23:08:11.384791737 -0800 -+++ WEB-INF/web.xml 2013-11-06 23:05:56.599793825 -0800 -@@ -47,12 +47,10 @@ - </context-param> - --> - -- <!-- - <context-param> - <param-name>GEOSERVER_DATA_DIR</param-name> -- <param-value>C:\eclipse\workspace\geoserver_trunk\cite\confCiteWFSPostGIS</param-value> -+ <param-value>/var/lib/geoserver</param-value> - </context-param> -- --> - - <!-- pick up all spring application contexts --> - <context-param> diff --git a/gis/geoserver/doinst.sh b/gis/geoserver/doinst.sh deleted file mode 100644 index 8c44f6584b..0000000000 --- a/gis/geoserver/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/tomcat/Catalina/localhost/geoserver.xml.new diff --git a/gis/geoserver/geoserver.SlackBuild b/gis/geoserver/geoserver.SlackBuild deleted file mode 100644 index bee0df4165..0000000000 --- a/gis/geoserver/geoserver.SlackBuild +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -# SlackBuild script for geoserver - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=geoserver -VERSION=${VERSION:-2.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION-war.zip -jar xvf $TMP/$PRGNAM-$VERSION/geoserver.war - -# patch web.xml so that it points to our custom data directory in /var/lib/geoserver -patch -p0 --verbose < $CWD/data_dir.patch - -# install the war components -mkdir -p $PKG/usr/share/geoserver -cp -r index.html META-INF WEB-INF $PKG/usr/share/geoserver - -# set up the deploy for tomcat -mkdir -p $PKG/etc/tomcat/Catalina/localhost -cp $CWD/geoserver.xml $PKG/etc/tomcat/Catalina/localhost/geoserver.xml.new - -# create an empty data directory owned by the tomcat user -mkdir -p $PKG/var/lib/geoserver -chown -R tomcat.tomcat $PKG/var/lib/geoserver -chmod 700 $PKG/var/lib/geoserver - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a GPL.txt LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/geoserver/geoserver.info b/gis/geoserver/geoserver.info deleted file mode 100644 index f36d30c569..0000000000 --- a/gis/geoserver/geoserver.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="geoserver" -VERSION="2.7.0" -HOMEPAGE="http://geoserver.org" -DOWNLOAD="http://downloads.sourceforge.net/project/geoserver/GeoServer/2.7.0/geoserver-2.7.0-war.zip" -MD5SUM="6dc863c282135acea6711071f7093351" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="apache-tomcat" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/geoserver/geoserver.xml b/gis/geoserver/geoserver.xml deleted file mode 100644 index 74fa2ce495..0000000000 --- a/gis/geoserver/geoserver.xml +++ /dev/null @@ -1 +0,0 @@ -<Context displayName="geoserver" docBase="/usr/share/geoserver" path="/geoserver"/> diff --git a/gis/gj2ascii/gj2ascii.SlackBuild b/gis/gj2ascii/gj2ascii.SlackBuild index aa5b014afa..f6fbd421b3 100644 --- a/gis/gj2ascii/gj2ascii.SlackBuild +++ b/gis/gj2ascii/gj2ascii.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for gj2ascii -# Copyright 2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=gj2ascii VERSION=${VERSION:-0.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -84,4 +94,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/gj2ascii/gj2ascii.info b/gis/gj2ascii/gj2ascii.info index 40f0e4161a..5c68cd0d5f 100644 --- a/gis/gj2ascii/gj2ascii.info +++ b/gis/gj2ascii/gj2ascii.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/geowurster/gj2ascii/archive/0.4.1/gj2ascii-0.4.1.ta MD5SUM="d2eb99fc027e83675fe4c2515fb781eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Shapely Fiona click numpy rasterio" +REQUIRES="python3-shapely Fiona rasterio" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/gmapcatcher/gmapcatcher.SlackBuild b/gis/gmapcatcher/gmapcatcher.SlackBuild index 6f2c36ac36..d507a976b5 100644 --- a/gis/gmapcatcher/gmapcatcher.SlackBuild +++ b/gis/gmapcatcher/gmapcatcher.SlackBuild @@ -1,29 +1,39 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for gmapcatcher # Written by Pablo Santamaria (pablosantamaria) +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=gmapcatcher VERSION=${VERSION:-0.8.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -72,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/google-earth-legacy/README b/gis/google-earth-legacy/README new file mode 100644 index 0000000000..d35d7ce524 --- /dev/null +++ b/gis/google-earth-legacy/README @@ -0,0 +1,47 @@ +google-earth-legacy (Google's famous virtual globe - legacy version) + +Google Earth is a virtual globe program. It maps a version of the +Earth by the superimposition of images obtained from satellite +imagery, aerial photography and GIS over a 3D globe. You point +and zoom to any place on the planet that you want to explore. +Satellite images and local facts zoom into view. Tap into Google +search to show local points of interest and facts. Zoom to a +specific address to check out an apartment or hotel. View driving +directions and even fly along your route. + +The degree of resolution available is based somewhat on the points +of interest, but most land (except for some islands) is covered in at +least 15 meters of resolution. + +When running GoogleEarth for the first time, you will see an error +message stating that it is unable to find the Bitstream Vera fonts. +This should be safe to ignore - it will use other fonts (and the +DejaVu fonts included with Slackware are based on the Bitstream fonts). + +NOTES: +1) Google Earth 7 (legacy) is "LSB compliant" meaning it was built on + an LSB system. Slackware however does not have that symlink which + is part of the LSB 3.0 specification. Before, you had to add that + symlink manually; that is now handled in doinst.sh. For nostalgia + sake, the symlinks are: + in /lib: (32-bit) + ln -sv ld-linux.so.2 ld-lsb.so.3 + in /lib64: + ln -sv ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 + +2) Google Earth sometimes crashes when the 65-fonts-persian.conf is + available on the system. If you experience crashes, try removing + /etc/fonts/conf.d/65-fonts-persian.conf prior to launching this + application. The easiest way to do this is: + + mv /etc/fonts/conf.d/65-fonts-persian.conf \ + /etc/fonts/conf.d/65-fonts-persian.conf.old + +3) GoogleEarth requires that you have OpenGL drivers installed on your + system (and Xorg configured to use them). Not doing so will cause X + to crash. + +4) This is the legacy version 7.3.0, which is the last version to be + released for 32-bit systems. On startup, a nag screen will pop up + advising you that a new version is availble, which you can safely + ignore. diff --git a/gis/google-earth-legacy/doinst.sh b/gis/google-earth-legacy/doinst.sh new file mode 100644 index 0000000000..76c4a738ca --- /dev/null +++ b/gis/google-earth-legacy/doinst.sh @@ -0,0 +1,14 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime > /dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/gis/google-earth-legacy/google-earth-legacy.SlackBuild b/gis/google-earth-legacy/google-earth-legacy.SlackBuild new file mode 100644 index 0000000000..f062abd99d --- /dev/null +++ b/gis/google-earth-legacy/google-earth-legacy.SlackBuild @@ -0,0 +1,140 @@ +#!/bin/bash + +# Slackware build script for google-earth-legacy + +# Copyright 2007-2013 Michiel van Wessem, Manchester, United Kingdom +# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2021 Lenard Spencer, Orlando, Florida, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# 2013 - A lot of thanks to Willy Sudiarto Raharjo for his input and help +# with converting the script to work with google's .deb packages. + +# Thanks to rworkman for the additional code and script cleanups +# and to Daniel de Kok and Alan_Hicks for their comments. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=google-earth-legacy +VERSION=${VERSION:-7.3.0.3832} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + *) ARCH=$( uname -m ) ;; + 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 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SRCARCH="i386" +elif [ "$ARCH" = "x86_64" ]; then + SRCARCH="amd64" +else + echo "This system is unsupported. Aborting." + exit 1 +fi + +# No flags/configure needed as it is just a binary repackaging. +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/google-earth-pro-stable_${VERSION}-r0_${SRCARCH}.deb data.tar.xz | tar xJv +cd $PKG +chown -R root:root . + +# Fix Google braindeadness (and mine) +find . -type d -exec chmod 0755 {} \; +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Sadly (by lack of a more polite word), Google has some inconsistent +# permissions for normal files; this should deal with them rather nicely. +find -L . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) -exec chmod 0644 {} \; + +# Install a .desktop launcher: +mv $PKG/opt/google/earth/pro/google-earth-pro.desktop $PKG/usr/share/applications/google-earth.desktop + +# Copy icons to /usr/share/icons +for icon in 16 22 24 32 48 64 128 256; do + install -D $PKG/opt/google/earth/pro/product_logo_${icon}.png \ + $PKG/usr/share/icons/hicolor/${icon}x${icon}/apps/${PRGNAM}-pro.png +done + +# Install mimetypes +mkdir -p $PKG/usr/share/mime/packages/ +cat $CWD/google-earth-mimetypes.xml > $PKG/usr/share/mime/packages/$PRGNAM-mimetypes.xml + +# Let's take care of documentation +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Clean up cruft/unneeded directories.The cron job in /etc is for Debian/Ubuntu only: +rm -rf $PKG/etc +rm -rf $PKG/usr/share/{man,menu,gnome-control-center} + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +# Add ld-lsb.so symlink creation to doinst.sh +if [ "$ARCH" = "x86_64" ]; then +cat >> $PKG/install/doinst.sh << "EOF" +# Create ld-lsb symlink +( cd lib64 + if [ ! -e ld-lsb-x86-64.so.3 ]; then + ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 + fi +) + +EOF +else +cat >> $PKG/install/doinst.sh << "EOF" +# Create ld-lsb symlink +( cd lib + if [ ! -e ld-lsb.so.3 ]; then + ln -sf ld-linux.so.2 ld-lsb.so.3 + fi +) + +EOF +fi + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/google-earth-legacy/google-earth-legacy.info b/gis/google-earth-legacy/google-earth-legacy.info new file mode 100644 index 0000000000..8ac0fe3e9a --- /dev/null +++ b/gis/google-earth-legacy/google-earth-legacy.info @@ -0,0 +1,10 @@ +PRGNAM="google-earth-legacy" +VERSION="7.3.0.3832" +HOMEPAGE="https://www.google.com/earth/index.html" +DOWNLOAD="https://dl.google.com/dl/earth/client/GE7/release_7_3_0/google-earth-pro-stable_7.3.0.3832-r0_i386.deb" +MD5SUM="5c298610ae4bd604fcfd54fdc32e53dd" +DOWNLOAD_x86_64="https://dl.google.com/dl/earth/client/GE7/release_7_3_0/google-earth-pro-stable_7.3.0.3832-r0_amd64.deb" +MD5SUM_x86_64="b9d8281257b7ebf0dfac1ab1d3578681" +REQUIRES="" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/gis/google-earth-legacy/google-earth-mimetypes.xml b/gis/google-earth-legacy/google-earth-mimetypes.xml new file mode 100644 index 0000000000..8850ee973e --- /dev/null +++ b/gis/google-earth-legacy/google-earth-mimetypes.xml @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="application/vnd.google-earth.kml+xml"> + <comment>Keyhole Markup Language data</comment> + <glob pattern="*.kml"/> + </mime-type> + + <mime-type type="application/vnd.google-earth.kmz"> + <comment>Keyhole Markup Language archive</comment> + <glob pattern="*.kmz"/> + </mime-type> + + <mime-type type="application/keyhole"> + <comment>Keyhole Markup Language data</comment> + </mime-type> + + <mime-type type="application/earthviewer"> + <comment>Keyhole Markup Language data</comment> + </mime-type> +</mime-info> diff --git a/gis/google-earth-legacy/slack-desc b/gis/google-earth-legacy/slack-desc new file mode 100644 index 0000000000..e9c8c09862 --- /dev/null +++ b/gis/google-earth-legacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +google-earth-legacy: google-earth-legacy (Google's famous virtual globe - legacy version) +google-earth-legacy: +google-earth-legacy: Google Earth is a virtual globe program. It maps a version of the +google-earth-legacy: Earth by the superimposition of images obtained from satellite +google-earth-legacy: imagery, aerial photography and GIS over a 3D globe. You point +google-earth-legacy: and zoom to any place on the planet that you want to explore. +google-earth-legacy: Satellite images and local facts zoom into view. +google-earth-legacy: +google-earth-legacy: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +google-earth-legacy: If google-earth fails to run, first consult the NOTES in the README. +google-earth-legacy: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/gis/google-earth/README b/gis/google-earth/README index 941e5bece5..f0d3ae93a4 100644 --- a/gis/google-earth/README +++ b/gis/google-earth/README @@ -1,6 +1,6 @@ google-earth (Google's famous virtual globe) -Google Earth is a virtual globe program. It maps a version of the +Google Earth Pro is a virtual globe program. It maps a version of the Earth by the superimposition of images obtained from satellite imagery, aerial photography and GIS over a 3D globe. You point and zoom to any place on the planet that you want to explore. @@ -10,41 +10,20 @@ specific address to check out an apartment or hotel. View driving directions and even fly along your route. The degree of resolution available is based somewhat on the points -of interest, but most land (except for some islands) is covered in at +of interest, but most land (except for some islands) is covered in at least 15 meters of resolution. -When running GoogleEarth for the first time, you will see an error -message stating that it is unable to find the Bitstream Vera fonts. -This should be safe to ignore - it will use other fonts (and the -DejaVu fonts included with Slackware are based on the Bitstream fonts). - NOTES: -1) Google updates the GoogleEarth bin-file without changing the download - link location and they don't use version numbering in the filename - (the version is more an internal numbering). - - Therefore, this script is subject to failing (and a different MD5SUM) - at any time due to the fact that you might get a newer version - of GoogleEarth than what the script is designed to use. Please notify - the maintainer if this is the case. - -2) Google Earth 7 is "LSB compliant" meaning it was built on a LSB system. - Slackware however does not have that symlink which is part of the LSB 3.0 - specification. You'll need to create the symlink manually after installing - the package: - - 32-bit: ln -sf /lib/ld-linux.so.2 /lib/ld-lsb.so.3 - 64-bit: ln -sf /lib64/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3 - -3) Google Earth tends to crash when the 65-fonts-persian.conf is available on - the system. Please remove /etc/fonts/conf.d/65-fonts-persian.conf prior to - launching this application. The easiest way to do this is: - - mv /etc/fonts/conf.d/65-fonts-persian.conf \ - /etc/fonts/conf.d/65-fonts-persian.conf.old - -4) GoogleEarth now requires that you have OpenGL drivers installed on your - system (and Xorg configured to use them). Not doing so will cause X - to crash. - -5) On 32 bit, the VERSION is still at 7.3.0.3832. +1) Google Earth Pro requires that you have OpenGL drivers installed on + your system (and Xorg configured to use them). Not doing so will + cause X to crash. + +2) This version of Google Earth Pro is only available for 64-bit + systems. If you are still running 32-bit, you will need the + google-earth-legacy SBo script. + +3) This version of Google Earth Pro is updated without bumping the + version number (only the embedded revision is bumped). For this + reason the md5sum may not match and the build will fail in sbopkg. + If this happens you will need to download the file and build the + package directly. diff --git a/gis/google-earth/doinst.sh b/gis/google-earth/doinst.sh index cd40c461ab..76c4a738ca 100644 --- a/gis/google-earth/doinst.sh +++ b/gis/google-earth/doinst.sh @@ -11,3 +11,4 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi + diff --git a/gis/google-earth/google-earth.SlackBuild b/gis/google-earth/google-earth.SlackBuild index f5304c9ec3..65011400a6 100644 --- a/gis/google-earth/google-earth.SlackBuild +++ b/gis/google-earth/google-earth.SlackBuild @@ -1,9 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for google-earth # Copyright 2007-2013 Michiel van Wessem, Manchester, United Kingdom -# Copyright 2016-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2021-2022 Lenard Spencer, Orlando, Florida, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,10 +30,14 @@ # Thanks to rworkman for the additional code and script cleanups # and to Daniel de Kok and Alan_Hicks for their comments. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=google-earth -VERSION=${VERSION:-7.3.2.5776} +VERSION=${VERSION:-7.3.6.9796} +SHORTVER=${SHORTVER:-7.3.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -41,17 +46,22 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SRCARCH="i386" -elif [ "$ARCH" = "x86_64" ]; then +if [ "$ARCH" = "x86_64" ]; then SRCARCH="amd64" else - echo "This system is unsupported. Aborting." + echo "This architecture is unsupported. Aborting." exit 1 fi @@ -60,8 +70,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT + cd $PKG -ar p $CWD/google-earth-stable_current_${SRCARCH}.deb data.tar.xz | tar xJv +ar p $CWD/google-earth-pro-stable_${SHORTVER}_${SRCARCH}.deb data.tar.xz | tar xJv cd $PKG chown -R root:root . # Fix Google braindeadness (and mine) @@ -72,16 +83,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Sadly (by lack of politer word), Google has some inconsistent permissions -# for normal files; this should deal with them rather nicely. +# Sadly (by lack of a more polite word), Google has some inconsistent +# permissions for normal files; this should deal with them rather nicely. find -L . \( -name "*.png" -o -name "*.kml" -o -name "*.xml" \) -exec chmod 0644 {} \; # Install a .desktop launcher: mv $PKG/opt/google/earth/pro/google-earth-pro.desktop $PKG/usr/share/applications/google-earth.desktop +# Clean up .desktop to satisfy sbopkglint: +sed -i '/MultipleArgs/d' $PKG/usr/share/applications/google-earth.desktop +sed -i "s|Application;||" $PKG/usr/share/applications/google-earth.desktop # Copy icons to /usr/share/icons for icon in 16 22 24 32 48 64 128 256; do - install -D $PKG/opt/google/earth/pro/product_logo_${icon}.png \ + install -m 644 -D $PKG/opt/google/earth/pro/product_logo_${icon}.png \ $PKG/usr/share/icons/hicolor/${icon}x${icon}/apps/${PRGNAM}-pro.png done @@ -102,4 +116,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/google-earth/google-earth.info b/gis/google-earth/google-earth.info index aa18283951..7223999e97 100644 --- a/gis/google-earth/google-earth.info +++ b/gis/google-earth/google-earth.info @@ -1,10 +1,10 @@ PRGNAM="google-earth" -VERSION="7.3.2.5776" +VERSION="7.3.6.9796" HOMEPAGE="https://www.google.com/earth/index.html" -DOWNLOAD="https://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb" -MD5SUM="5c298610ae4bd604fcfd54fdc32e53dd" -DOWNLOAD_x86_64="https://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb" -MD5SUM_x86_64="d11eb3e20e5df44cb92d43077537078d" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://dl.google.com/dl/linux/direct/google-earth-pro-stable_7.3.6_amd64.deb" +MD5SUM_x86_64="3e8fb2549222e87d4cbfe92bec068900" REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/gis/gpsbabel/README b/gis/gpsbabel/README index fe1adcae48..690a7e6bf1 100644 --- a/gis/gpsbabel/README +++ b/gis/gpsbabel/README @@ -1,13 +1,16 @@ -GPSBabel converts waypoints, tracks, and routes from one format to another, -whether that format is a common mapping format like Delorme, Streets and -Trips, or even a serial or USB upload or download to a GPS receiver such as -those from Garmin and Magellan. By flattening the Tower of Babel that the -authors of various programs for manipulating GPS data have imposed upon us, it -returns to us the ability to freely move our own waypoint data between the -programs and hardware we choose to use. +GPSBabel converts waypoints, tracks, and routes from one format to +another, whether that format is a common mapping format like Delorme, +Streets and Trips, or even a serial or USB upload or download to a GPS +receiver such as those from Garmin and Magellan. By flattening the +Tower of Babel that the authors of various programs for manipulating +GPS data have imposed upon us, it returns to us the ability to freely +move our own waypoint data between the programs and hardware we choose +to use. -It contains extensive data manipulation abilities making it a convenient for -server-side processing or as the backend for other tools. +It contains extensive data manipulation abilities making it a +convenient for server-side processing or as the backend for other +tools. -It does not convert, transfer, send, or manipulate maps. We process data that -may (or may not be) placed on a map, such as waypoints, tracks, and routes. +It does not convert, transfer, send, or manipulate maps. We process +data that may (or may not be) placed on a map, such as waypoints, +tracks, and routes. diff --git a/gis/gpsbabel/gpsbabel.SlackBuild b/gis/gpsbabel/gpsbabel.SlackBuild index 3caa41f120..1a31df9ad0 100644 --- a/gis/gpsbabel/gpsbabel.SlackBuild +++ b/gis/gpsbabel/gpsbabel.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for gpsbabel -# Copyright 2017-2019 Kyle Guinn <elyk03@gmail.com> +# Copyright 2017-2024 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=gpsbabel -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.9.0} SRCVER=${PRGNAM}_$(echo ${VERSION} | tr . _) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$(uname -m)" in @@ -36,17 +39,18 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING README*" +DOCS="AUTHORS COPYING README* SECURITY.md" -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -80,38 +84,22 @@ sed -i \ -e '/ignoreVersionMismatch_/s/false/true/' \ gui/babeldata.h -# Make it more FHS-compliant by moving gmapbase.html and the translations -# to /usr/share. Tell the GUI where to find them. Thanks to Arch. -sed -i 's|langPath_ = QApplication::applicationDirPath();|langPath_ = "/usr/share/gpsbabel";|' gui/mainwindow.cc -sed -i 's|baseFile = QApplication::applicationDirPath() + "/gmapbase.html";|baseFile = "/usr/share/gpsbabel/gmapbase.html";|' gui/map.cc - -# Fix the .desktop file and icon. Thanks to Arch. -sed -i 's|gpsbabelfe-bin|gpsbabelfe|' gui/gpsbabel.desktop +# Resize the icon from 500x476 to 512x512. Thanks to Arch. convert gui/images/appicon.png +set date:create +set date:modify -background none -gravity center -extent 512x512 gui/images/appicon.png -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-zlib=system \ - --build=$ARCH-slackware-linux \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - +cmake \ + -DGPSBABEL_WITH_LIBUSB=pkgconfig \ + -DGPSBABEL_WITH_ZLIB=pkgconfig \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + . make -make gui install -D -m0755 -s gpsbabel $PKG/usr/bin/gpsbabel -install -D -m0755 -s gui/objects/gpsbabelfe $PKG/usr/bin/gpsbabelfe +install -D -m0755 -s gui/GPSBabelFE/gpsbabelfe $PKG/usr/bin/gpsbabelfe install -D -m0644 gui/gpsbabel.desktop $PKG/usr/share/applications/gpsbabel.desktop install -D -m0644 gui/images/appicon.png $PKG/usr/share/icons/hicolor/512x512/apps/gpsbabel.png -install -D -m0644 gui/gmapbase.html $PKG/usr/share/gpsbabel/gmapbase.html -install -d -m0755 $PKG/usr/share/gpsbabel/translations/ -install -D -m0644 gui/*.qm $PKG/usr/share/gpsbabel/translations/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION @@ -122,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/gpsbabel/gpsbabel.info b/gis/gpsbabel/gpsbabel.info index d8cec64019..dc5540f636 100644 --- a/gis/gpsbabel/gpsbabel.info +++ b/gis/gpsbabel/gpsbabel.info @@ -1,10 +1,10 @@ PRGNAM="gpsbabel" -VERSION="1.6.0" +VERSION="1.9.0" HOMEPAGE="https://www.gpsbabel.org/" -DOWNLOAD="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_6_0/gpsbabel-gpsbabel_1_6_0.tar.gz" -MD5SUM="accb9f923ebe1b2d2a00c67d0e1dc430" +DOWNLOAD="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_9_0/gpsbabel-gpsbabel_1_9_0.tar.gz" +MD5SUM="8555b7b4c89fbae832451ed0679e04f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libminizip qt5" +REQUIRES="" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/gis/gpsd/gpsd.SlackBuild b/gis/gpsd/gpsd.SlackBuild index c4db4271b5..f2befd6211 100644 --- a/gis/gpsd/gpsd.SlackBuild +++ b/gis/gpsd/gpsd.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for gpsd @@ -22,26 +22,37 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20230629 bkw: Modified by SlackBuilds.org, BUILD=2: +# - /usr/sbin/gpsinit was missing +x permission. +# - rm generic INSTALL from doc dir. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=gpsd VERSION=${VERSION:-3.18.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -87,9 +98,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + || true # g++ may throw an 'internal compiler error' in the QT bindings. # *Nothing* actually uses this, but you can enable it by deleting @@ -114,7 +125,7 @@ scons \ # Fix daft permission from upstream chmod 755 $PKG/usr/bin/gpsprof # Add a missed file -install -m 0644 gpsinit \ +install -m 0755 gpsinit \ $PKG/usr/sbin/gpsinit find $PKG/usr/man -type f -exec gzip -9 {} \; @@ -147,7 +158,7 @@ install -D -m 0644 $CWD/rc.gpsd.conf.new \ $PKG/etc/rc.d/rc.gpsd.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL README TODO build.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING README TODO build.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -155,4 +166,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/gpxsee/fix_font_narrow_space.diff b/gis/gpxsee/fix_font_narrow_space.diff index bd4f8544fe..0b04d37b4d 100644 --- a/gis/gpxsee/fix_font_narrow_space.diff +++ b/gis/gpxsee/fix_font_narrow_space.diff @@ -1,5 +1,5 @@ ---- GPXSee-7.18/src/GUI/units.h.orig 2019-03-12 23:00:39.365129810 +0300 -+++ GPXSee-7.18/src/GUI/units.h 2019-03-12 23:00:47.151863062 +0300 +--- src/GUI/units.h.orig 2019-03-12 23:00:39.365129810 +0300 ++++ src/GUI/units.h 2019-03-12 23:00:47.151863062 +0300 @@ -30,6 +30,6 @@ #define C2FS 1.8 // Celsius to Farenheit - scale #define C2FO 32.0 // Celsius to Farenheit - offset diff --git a/gis/gpxsee/gpxsee.SlackBuild b/gis/gpxsee/gpxsee.SlackBuild index f90ef52367..be7b61c536 100644 --- a/gis/gpxsee/gpxsee.SlackBuild +++ b/gis/gpxsee/gpxsee.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for GPXSee -# Copyright 2018-2019, Nikolay Korotkiy <sikmir@gmail.com> +# Copyright 2018-2024, Nikolay Korotkiy <sikmir@gmail.com> +# Copyright 2024 since version 13.18 titopoquito <titopoquito@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=gpxsee -VERSION=${VERSION:-7.18} +VERSION=${VERSION:-13.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -71,7 +82,7 @@ find -L . \ # Fix display issue: square character instead of a white space # See https://github.com/tumic0/GPXSee/issues/93 -patch -p1 < $CWD/fix_font_narrow_space.diff +patch -p0 < $CWD/fix_font_narrow_space.diff lrelease-qt5 gpxsee.pro qmake-qt5 \ @@ -93,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/gpxsee/gpxsee.info b/gis/gpxsee/gpxsee.info index b86ace2e1f..2fca84e828 100644 --- a/gis/gpxsee/gpxsee.info +++ b/gis/gpxsee/gpxsee.info @@ -1,10 +1,10 @@ PRGNAM="gpxsee" -VERSION="7.18" +VERSION="13.18" HOMEPAGE="https://www.gpxsee.org/" -DOWNLOAD="https://github.com/tumic0/GPXSee/archive/7.18/GPXSee-7.18.tar.gz" -MD5SUM="b7b9664c8a2bfa38b797c23445c5607f" +DOWNLOAD="https://github.com/tumic0/GPXSee/archive/13.18/GPXSee-13.18.tar.gz" +MD5SUM="edd35b435e1d1c1b6f89688927d56248" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5" -MAINTAINER="Nikolay Korotkiy" -EMAIL="sikmir@gmail.com" +REQUIRES="" +MAINTAINER="titopoquito" +EMAIL="titopoquito@gmail.com" diff --git a/gis/grass/README b/gis/grass/README index 6ae5d756b4..f50d60cb6f 100644 --- a/gis/grass/README +++ b/gis/grass/README @@ -1,8 +1,8 @@ -GRASS (Geographic Resources Analysis Support System) is a free Geographic -Information System (GIS) used for geospatial data management and -analysis, image processing, graphics/maps production, spatial modeling, -and visualization. GRASS is an official project of the Open Source -Geospatial Foundation. +GRASS (Geographic Resources Analysis Support System) is a free +Geographic Information System (GIS) used for geospatial data +management and analysis, image processing, graphics/maps production, +spatial modeling, and visualization. GRASS is an official project of +the Open Source Geospatial Foundation. The following options may be enabled: @@ -26,18 +26,18 @@ The following options may be enabled: (requires libLAS) opencl for OpenCL GPU acceleration - (requires opencl-headers, either nvidia-driver or amd-app-sdk, - and suitable GPU hardware) + (requires nvidia-driver or amd-app-sdk and + suitable GPU) -The options you require must be specified by setting the variable ENABLE -before running grass.SlackBuild, for example +The options you require must be specified by setting the variable +ENABLE before running grass.SlackBuild, for example ENABLE="sqlite,netcdf" ./grass.SlackBuild ffmpeg is an optional runtime dependency for the Animation tool (g.gui.module). -If you need to make grass libraries available to other applications (e.g. -qgis) do this: +If you need to make grass libraries available to other applications +(e.g. qgis) do this: echo /opt/grass/lib >> /etc/ld.so.conf && ldconfig diff --git a/gis/grass/gdal-3.3.patch b/gis/grass/gdal-3.3.patch new file mode 100644 index 0000000000..c5e018aaaa --- /dev/null +++ b/gis/grass/gdal-3.3.patch @@ -0,0 +1,84 @@ +From b86314c7f3b8aea961d380dbb836087b3990d7af Mon Sep 17 00:00:00 2001 +From: nilason <n_larsson@yahoo.com> +Date: Thu, 6 May 2021 22:27:48 +0200 +Subject: [PATCH] v.hull: use standard C boolean type + +Fixes #1563 +--- + vector/v.hull/chull.c | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c +index 1ad97396fa..41b627c50f 100644 +--- a/vector/v.hull/chull.c ++++ b/vector/v.hull/chull.c +@@ -22,6 +22,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <math.h> ++#include <stdbool.h> + + #include <grass/gis.h> + #include <grass/vector.h> +@@ -29,10 +30,6 @@ + + #include "globals.h" + +-/*Define Boolean type */ +-typedef enum +-{ BFALSE, BTRUE } bool; +- + /* Define vertex indices. */ + #define X 0 + #define Y 1 +@@ -76,10 +73,10 @@ struct tFaceStructure + }; + + /* Define flags */ +-#define ONHULL BTRUE +-#define REMOVED BTRUE +-#define VISIBLE BTRUE +-#define PROCESSED BTRUE ++#define ONHULL true ++#define REMOVED true ++#define VISIBLE true ++#define PROCESSED true + + /* Global variable definitions */ + tVertex vertices = NULL; +@@ -436,7 +433,7 @@ bool AddOne(tVertex p) + tFace f; + tEdge e, temp; + long int vol; +- bool vis = BFALSE; ++ bool vis = false; + + + /* Mark faces visible from p. */ +@@ -446,7 +443,7 @@ bool AddOne(tVertex p) + + if (vol < 0) { + f->visible = VISIBLE; +- vis = BTRUE; ++ vis = true; + } + f = f->next; + } while (f != faces); +@@ -454,7 +451,7 @@ bool AddOne(tVertex p) + /* If no faces are visible from p, then p is inside the hull. */ + if (!vis) { + p->onhull = !ONHULL; +- return BFALSE; ++ return false; + } + + /* Mark edges in interior of visible region for deletion. +@@ -470,7 +467,7 @@ bool AddOne(tVertex p) + e->newface = MakeConeFace(e, p); + e = temp; + } while (e != edges); +- return BTRUE; ++ return true; + } + + /*--------------------------------------------------------------------- diff --git a/gis/grass/grass.SlackBuild b/gis/grass/grass.SlackBuild index 28d48e51ad..64706bdb1c 100644 --- a/gis/grass/grass.SlackBuild +++ b/gis/grass/grass.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for grass @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=grass VERSION=${VERSION:-7.8.0} SHRTVER=`echo $VERSION | sed "s/\([0-9]*\).\([0-9]*\)..*/\1\2/"` BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -73,6 +83,8 @@ find -L . \ # Option handling: set -- $(echo $ENABLE | sed 's/,/ /g') +patch -p1 < $CWD/gdal-3.3.patch + while [ "$1" != "" ]; do case "$1" in @@ -206,4 +218,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/grass/grass.info b/gis/grass/grass.info index 2ce125aa93..c636164541 100644 --- a/gis/grass/grass.info +++ b/gis/grass/grass.info @@ -5,6 +5,6 @@ DOWNLOAD="https://grass.osgeo.org/grass78/source/grass-7.8.0.tar.gz" MD5SUM="e9b9d3bbbfe3ef9055ea1398b2222de4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal numpy3 wxPython4 zstd" +REQUIRES="gdal python3-numpy wxPython4" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" diff --git a/gis/josm/README b/gis/josm/README index c893f14abe..2fe1984ce5 100644 --- a/gis/josm/README +++ b/gis/josm/README @@ -1,11 +1,11 @@ JOSM is an extensible editor for OpenStreetMap (OSM) written in Java -Currently it supports loading stand-alone GPX tracks and GPX track data from the -OSM database as well as loading and editing existing nodes, ways, metadata tags -and relations from the OSM database. +Currently it supports loading stand-alone GPX tracks and GPX track +data from the OSM database as well as loading and editing existing +nodes, ways, metadata tags and relations from the OSM database. -Josm is very active so it is highly recommended to install the latest version -http://josm.openstreetmap.de/download/josm-tested.jar -and execute the script with VERSION=tested +Josm is very active so it is highly recommended to install the latest +version http://josm.openstreetmap.de/download/josm-tested.jar and +execute the script with VERSION=tested The script will automagically find the version number in packaging. diff --git a/gis/josm/josm.SlackBuild b/gis/josm/josm.SlackBuild index 3beb3186d4..acc0fb1540 100644 --- a/gis/josm/josm.SlackBuild +++ b/gis/josm/josm.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware java packaging script for josm # # Michales - clavisound - Michaloudes korgie@gmail.com <2012-2017> @@ -7,10 +7,13 @@ # http://josm.openstreetmap.de/download/josm-tested.jar # execute the script with VERSION=tested +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=josm VERSION=${VERSION:-12450} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -20,7 +23,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -79,4 +89,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/josm/josm.info b/gis/josm/josm.info index 9603d00a01..77461996d4 100644 --- a/gis/josm/josm.info +++ b/gis/josm/josm.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/josm-snapshot-12450.jar" MD5SUM="1bb587427acb4b87300093ae298a0f13" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Michales Michaloudes" EMAIL="korgie@gmail.com" diff --git a/gis/laszip/README b/gis/laszip/README index 61951f4705..63b526820d 100644 --- a/gis/laszip/README +++ b/gis/laszip/README @@ -1,6 +1,7 @@ -LASzip - a free product of rapidlasso GmbH - quickly turns bulky LAS files -into compact LAZ files without information loss. Terabytes of LAZ data are -now available for free download from various agencies making LASzip, winner -of the 2012 Geospatial World Forum Technology Innovation Award in LiDAR -Processing and 2nd place winner for innovative product at INTERGEO 2012, -the de-facto standard for LiDAR compression. +LASzip - a free product of rapidlasso GmbH - quickly turns bulky LAS +files into compact LAZ files without information loss. Terabytes of +LAZ data are now available for free download from various agencies +making LASzip, winner of the 2012 Geospatial World Forum Technology +Innovation Award in LiDAR Processing and 2nd place winner for +innovative product at INTERGEO 2012, the de-facto standard for LiDAR +compression. diff --git a/gis/laszip/laszip.SlackBuild b/gis/laszip/laszip.SlackBuild index 49adcb800e..49832cd3dc 100644 --- a/gis/laszip/laszip.SlackBuild +++ b/gis/laszip/laszip.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for laszip @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=laszip VERSION=${VERSION:-2.2.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -81,6 +91,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -90,8 +103,12 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch b/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch new file mode 100644 index 0000000000..fc7dee623e --- /dev/null +++ b/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch @@ -0,0 +1,40 @@ +From af431abce95076b59f4eb7c6ef0930ca57c8a063 Mon Sep 17 00:00:00 2001 +From: Piotr Dobrowolski <dobrypd@gmail.com> +Date: Thu, 25 Apr 2019 15:33:28 +0200 +Subject: [PATCH] Use LIBLAS_BIG_ENDIAN instead of BOOST_BIG_ENDIAN (#166) + +Fixes #165 +--- + include/liblas/detail/binary.hpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp +index 3dd8a6fc..8f0b3d47 100644 +--- a/include/liblas/detail/binary.hpp ++++ b/include/liblas/detail/binary.hpp +@@ -17,6 +17,8 @@ + #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@ +
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary { + struct big_endian_tag {};
+ struct little_endian_tag {};
+
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
diff --git a/gis/libLAS/boost-1.73.patch b/gis/libLAS/boost-1.73.patch new file mode 100644 index 0000000000..818c15ef3b --- /dev/null +++ b/gis/libLAS/boost-1.73.patch @@ -0,0 +1,36 @@ +Qualify placeholders +Matteo Bernardini <ponce@slackbuilds.org> + +diff -Naur libLAS-1.8.1.orig/src/c_api.cpp libLAS-1.8.1/src/c_api.cpp +--- libLAS-1.8.1.orig/src/c_api.cpp 2016-08-22 15:06:34.000000000 +0200 ++++ libLAS-1.8.1/src/c_api.cpp 2020-08-04 14:54:22.311996000 +0200 +@@ -498,7 +498,7 @@ + + transforms.erase( std::remove_if( transforms.begin(), + transforms.end(), +- boost::bind( &IsReprojectionTransform, _1 ) ), ++ boost::bind( &IsReprojectionTransform, boost::placeholders::_1 ) ), + transforms.end()); + + liblas::TransformPtr srs_transform = liblas::TransformPtr(new liblas::ReprojectionTransform(in_ref, *out_ref, &h)); +@@ -1840,7 +1840,7 @@ + + transforms.erase( std::remove_if( transforms.begin(), + transforms.end(), +- boost::bind( &IsReprojectionTransform, _1 ) ), ++ boost::bind( &IsReprojectionTransform, boost::placeholders::_1 ) ), + transforms.end()); + + liblas::TransformPtr srs_transform = liblas::TransformPtr(new liblas::ReprojectionTransform(in_ref, *out_ref, &h)); +diff -Naur libLAS-1.8.1.orig/src/header.cpp libLAS-1.8.1/src/header.cpp +--- libLAS-1.8.1.orig/src/header.cpp 2016-08-22 15:06:34.000000000 +0200 ++++ libLAS-1.8.1/src/header.cpp 2020-08-04 14:53:36.599996000 +0200 +@@ -610,7 +610,7 @@ + + m_vlrs.erase( std::remove_if( m_vlrs.begin(), + m_vlrs.end(), +- boost::bind( &SameVLRs, name, id, _1 ) ), ++ boost::bind( &SameVLRs, name, id, boost::placeholders::_1 ) ), + m_vlrs.end()); + + m_recordsCount = static_cast<uint32_t>(m_vlrs.size()); diff --git a/gis/libLAS/libLAS.SlackBuild b/gis/libLAS/libLAS.SlackBuild index 706f11fa16..fa1336c7e5 100644 --- a/gis/libLAS/libLAS.SlackBuild +++ b/gis/libLAS/libLAS.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for libLAS @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=libLAS VERSION=${VERSION:-1.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,6 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/Use_LIBLAS_BIG_ENDIAN.patch +patch -p1 < $CWD/boost-1.73.patch + mkdir -p build cd build cmake \ @@ -97,4 +110,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/libecwj2/README b/gis/libecwj2/README new file mode 100644 index 0000000000..ad59becd5e --- /dev/null +++ b/gis/libecwj2/README @@ -0,0 +1,33 @@ +libecwj2 is a library that gives support to GDAL for reading, import, +and convert raster geospatial data in non-free ECW and JPEG 2000 +formats. This library was released as free and open source in 2006 by +Earth Resource Mapping, formerly owner of ECW patents. + +ECW (Enhanced Compression Wavelet) is a full proprietary standard of +compression image format. +JPEG 2000 (or JP2) is a similar standard under free concession but +protected by patents in some parts. + +Both the formats are more powerful than other formats in lossy +compression of large image data without significant losses of quality, +but are mainly accessible through proprietary software, specially to +manage geospatial data. + +libecwj2 is the only one free and open source library that includes +the support to these formats in GDAL and indirectly in platforms that +require it as dependency (i.e. QGIS and Orfeo Toolbox). GDAL can be +also used to convert ECW or JP2 files in other graphic formats. + +After the installation, to apply the support to ECW/JP2 formats, GDAL +must be rebuilt without any other setting: libecwj2 is an optional +dependency autodetected. + +To verify if the plugin is enabled, you can launch the following +command: + + $ gdalinfo --formats | grep ECW + +If the plugin is successfully enabled, this command returns + + ECW -raster- (rw): ERDAS Compressed Wavelets (SDK 3.x) + JP2ECW -raster,vector- (rw+v): ERDAS JPEG2000 (SDK 3.x) diff --git a/gis/libecwj2/libecwj2-3.3-NCSPhysicalMemorySize-Linux.patch b/gis/libecwj2/libecwj2-3.3-NCSPhysicalMemorySize-Linux.patch new file mode 100644 index 0000000000..5489030839 --- /dev/null +++ b/gis/libecwj2/libecwj2-3.3-NCSPhysicalMemorySize-Linux.patch @@ -0,0 +1,16 @@ +--- Source/C/NCSUtil/malloc.c.ori 2010-02-02 00:09:24.000000000 +0100 ++++ Source/C/NCSUtil/malloc.c 2010-02-02 00:17:13.000000000 +0100 +@@ -390,7 +390,12 @@ + #else /* SOLARIS */ + + #ifdef LINUX +- return(sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE)); ++ long nPages = sysconf(_SC_PHYS_PAGES); ++ long nPageSize = sysconf(_SC_PAGESIZE); ++ if (nPages > INT_MAX / nPageSize) ++ return INT_MAX; ++ else ++ return (INT32)(nPages * nPageSize); + #elif defined MACOSX + return(128*1024*1024); + diff --git a/gis/libecwj2/libecwj2-3.3-msvc90-fixes.patch b/gis/libecwj2/libecwj2-3.3-msvc90-fixes.patch new file mode 100644 index 0000000000..b58cab10d6 --- /dev/null +++ b/gis/libecwj2/libecwj2-3.3-msvc90-fixes.patch @@ -0,0 +1,239 @@ +diff -r 486075d14769 -r d53918598fbf libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJP2File.cpp +--- libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJP2File.cpp Wed Sep 30 11:55:26 2009 +0100 ++++ libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJP2File.cpp Wed Sep 30 12:20:09 2009 +0100 +@@ -137,7 +137,7 @@ + m_bCodestreamOnly = false; + + m_eCompressionOrder = CNCSJPCProgressionOrderType::RPCL; +- m_nDecompressionLayers = CNCSJPCBuffer::MAXUINT16; ++ m_nDecompressionLayers = CNCSJPCBuffer::NCS_MAXUINT16; + + m_nNextLine = 0; + //Default geodata usage - was JP2_GEODATA_USE_WLD_GML_PCS +diff -r 486075d14769 -r d53918598fbf libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCBuffer.cpp +--- libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCBuffer.cpp Wed Sep 30 11:55:26 2009 +0100 ++++ libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCBuffer.cpp Wed Sep 30 12:20:09 2009 +0100 +@@ -26,19 +26,19 @@ + + //void * memcpy_amd(void *dest, const void *src, size_t n); + +-const UINT32 CNCSJPCBuffer::MAXUINT8 = (unsigned)0xff; +-const UINT32 CNCSJPCBuffer::MAXUINT16 = (unsigned)0xffff; +-const UINT32 CNCSJPCBuffer::MAXUINT32 = (unsigned)0xffffffff; +-const UINT32 CNCSJPCBuffer::MINUINT8 = 0; +-const UINT32 CNCSJPCBuffer::MINUINT16 = 0; +-const UINT32 CNCSJPCBuffer::MINUINT32 = 0; ++const UINT32 CNCSJPCBuffer::NCS_MAXUINT8 = (unsigned)0xff; ++const UINT32 CNCSJPCBuffer::NCS_MAXUINT16 = (unsigned)0xffff; ++const UINT32 CNCSJPCBuffer::NCS_MAXUINT32 = (unsigned)0xffffffff; ++const UINT32 CNCSJPCBuffer::NCS_MINUINT8 = 0; ++const UINT32 CNCSJPCBuffer::NCS_MINUINT16 = 0; ++const UINT32 CNCSJPCBuffer::NCS_MINUINT32 = 0; + +-const UINT32 CNCSJPCBuffer::MAXINT8 = 0x7f; +-const UINT32 CNCSJPCBuffer::MAXINT16 = 0x7fff; +-const UINT32 CNCSJPCBuffer::MAXINT32 = 0x7fffffff; +-const INT32 CNCSJPCBuffer::MININT8 = (-1 * (signed)CNCSJPCBuffer::MAXINT8 - 1); +-const INT32 CNCSJPCBuffer::MININT16 = (-1 * (signed)CNCSJPCBuffer::MAXINT16 - 1); +-const INT32 CNCSJPCBuffer::MININT32 = (-1 * (signed)CNCSJPCBuffer::MAXINT32 - 1); ++const UINT32 CNCSJPCBuffer::NCS_MAXINT8 = 0x7f; ++const UINT32 CNCSJPCBuffer::NCS_MAXINT16 = 0x7fff; ++const UINT32 CNCSJPCBuffer::NCS_MAXINT32 = 0x7fffffff; ++const INT32 CNCSJPCBuffer::NCS_MININT8 = (-1 * (signed)CNCSJPCBuffer::NCS_MAXINT8 - 1); ++const INT32 CNCSJPCBuffer::NCS_MININT16 = (-1 * (signed)CNCSJPCBuffer::NCS_MAXINT16 - 1); ++const INT32 CNCSJPCBuffer::NCS_MININT32 = (-1 * (signed)CNCSJPCBuffer::NCS_MAXINT32 - 1); + + const UINT32 CNCSJPCBuffer::AT_OWNER = (1 << 0); + const UINT32 CNCSJPCBuffer::AT_CHILD = (1 << 1); +@@ -308,27 +308,27 @@ + switch(m_eType) { + case CNCSJPCBuffer::BT_INT16: + // Optimise some common cases +- if(nMin == MINUINT8 && nMax == MAXUINT8) { ++ if(nMin == NCS_MINUINT8 && nMax == NCS_MAXUINT8) { + // UINT8 range + for(x = 0; x < nWidth; x++) { + INT16 v = ((INT16*)m_pBuffer)[x]; + if(v & 0xff00) { // Top bit is sign bit, so this tests for both >nMax & <nMin in one +- if(v > (INT16)MAXUINT8) { +- ((INT16*)m_pBuffer)[x] = MAXUINT8; +- } else if(v < (INT16)MINUINT8) { +- ((INT16*)m_pBuffer)[x] = MINUINT8; ++ if(v > (INT16)NCS_MAXUINT8) { ++ ((INT16*)m_pBuffer)[x] = NCS_MAXUINT8; ++ } else if(v < (INT16)NCS_MINUINT8) { ++ ((INT16*)m_pBuffer)[x] = NCS_MINUINT8; + } + } + } +- } else if(nMin == MININT8 && nMax == MAXINT8) { ++ } else if(nMin == NCS_MININT8 && nMax == NCS_MAXINT8) { + // INT8 range + for(x = 0; x < nWidth; x++) { + INT16 v = ((INT16*)m_pBuffer)[x]; + if(v & 0xff80) { // Top bit is sign bit, so this tests for both >nMax & <nMin in one +- if(v > (INT16)MAXINT8) { +- ((INT16*)m_pBuffer)[x] = MAXINT8; +- } else if(v < (INT16)MININT8) { +- ((INT16*)m_pBuffer)[x] = MININT8; ++ if(v > (INT16)NCS_MAXINT8) { ++ ((INT16*)m_pBuffer)[x] = NCS_MAXINT8; ++ } else if(v < (INT16)NCS_MININT8) { ++ ((INT16*)m_pBuffer)[x] = NCS_MININT8; + } + } + } +@@ -345,27 +345,27 @@ + break; + case CNCSJPCBuffer::BT_INT32: + // Optimise some common cases +- if(nMin == MINUINT16 && nMax == MAXUINT16) { ++ if(nMin == NCS_MINUINT16 && nMax == NCS_MAXUINT16) { + // UINT16 range + for(x = 0; x < nWidth; x++) { + INT32 v = ((INT32*)m_pBuffer)[x]; + if(v & 0xffff0000) { // Top bit is sign bit, so this tests for both >nMax & <nMin in one +- if(v > (INT32)MAXUINT16) { +- ((INT32*)m_pBuffer)[x] = MAXUINT16; +- } else if(v < (INT32)MINUINT16) { +- ((INT32*)m_pBuffer)[x] = MINUINT16; ++ if(v > (INT32)NCS_MAXUINT16) { ++ ((INT32*)m_pBuffer)[x] = NCS_MAXUINT16; ++ } else if(v < (INT32)NCS_MINUINT16) { ++ ((INT32*)m_pBuffer)[x] = NCS_MINUINT16; + } + } + } +- } else if(nMin == MININT16 && nMax == MAXINT16) { ++ } else if(nMin == NCS_MININT16 && nMax == NCS_MAXINT16) { + // INT16 range + for(x = 0; x < nWidth; x++) { + INT32 v = ((INT32*)m_pBuffer)[x]; + if(v & 0xffff8000) { // Top bit is sign bit, so this tests for both >nMax & <nMin in one +- if(v > (INT32)MAXINT16) { +- ((INT32*)m_pBuffer)[x] = MAXINT16; +- } else if(v < (INT32)MININT16) { +- ((INT32*)m_pBuffer)[x] = MININT16; ++ if(v > (INT32)NCS_MAXINT16) { ++ ((INT32*)m_pBuffer)[x] = NCS_MAXINT16; ++ } else if(v < (INT32)NCS_MININT16) { ++ ((INT32*)m_pBuffer)[x] = NCS_MININT16; + } + } + } +@@ -403,13 +403,13 @@ + return(Clip(NCSCeil(fMin), NCSFloor(fMax))); + break; + case CNCSJPCBuffer::BT_IEEE4: +- if(fMin == MINUINT8 && fMax == MAXUINT8) { ++ if(fMin == NCS_MINUINT8 && fMax == NCS_MAXUINT8) { + for(x = 0; x < nWidth; x++) { + IEEE4 v = ((IEEE4*)m_pBuffer)[x]; +- if(v > MAXUINT8) { +- ((IEEE4*)m_pBuffer)[x] = MAXUINT8; +- } else if(v < MINUINT8) { +- ((IEEE4*)m_pBuffer)[x] = MINUINT8; ++ if(v > NCS_MAXUINT8) { ++ ((IEEE4*)m_pBuffer)[x] = NCS_MAXUINT8; ++ } else if(v < NCS_MINUINT8) { ++ ((IEEE4*)m_pBuffer)[x] = NCS_MINUINT8; + } + } + } else { +diff -r 486075d14769 -r d53918598fbf libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCPLTMarker.cpp +--- libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCPLTMarker.cpp Wed Sep 30 11:55:26 2009 +0100 ++++ libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCPLTMarker.cpp Wed Sep 30 12:20:09 2009 +0100 +@@ -173,7 +173,7 @@ + nPrevHeaderLength = TMP.m_nHeaderLength; + TMP.m_nHeaderLength += (UINT32)nTotalHeaderLength; + } +- if(nTotalHeaderLength > CNCSJPCBuffer::MAXUINT32) { ++ if(nTotalHeaderLength > CNCSJPCBuffer::NCS_MAXUINT32) { + // Too big to store cumulated length in the PacketLength struct, so + // set it back to false and reparse the entire PLT + m_bCumulativeLengths = false; +@@ -202,7 +202,7 @@ + nPrevHeaderLength = TMP.m_nHeaderLength; + TMP.m_nHeaderLength += nTotalHeaderLength; + } +- if(nTotalHeaderLength > CNCSJPCBuffer::MAXUINT32) { ++ if(nTotalHeaderLength > CNCSJPCBuffer::NCS_MAXUINT32) { + // Too big to store cumulated length in the PacketLength struct, so + // set it back to false and reparse the entire PLT + m_bCumulativeLengths = false; +diff -r 486075d14769 -r d53918598fbf libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCT1Coder.cpp +--- libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCT1Coder.cpp Wed Sep 30 11:55:26 2009 +0100 ++++ libecwj2-3.3/Source/C/NCSEcw/NCSJP2/NCSJPCT1Coder.cpp Wed Sep 30 12:20:09 2009 +0100 +@@ -917,7 +917,7 @@ + + int passno=0; + int passtype; +- INT32 nMax = CNCSJPCBuffer::MININT32; ++ INT32 nMax = CNCSJPCBuffer::NCS_MININT32; + + UINT32 nWidth = pDecBuf->GetWidth(); + UINT32 nHeight = pDecBuf->GetHeight(); +@@ -956,7 +956,7 @@ + UINT32 nSubWidth = nWidth / 8; + + __m128 mm7 = _mm_set1_ps(fRatio); +- __m128i mm4 = _mm_set1_epi16((short)CNCSJPCBuffer::MININT16); ++ __m128i mm4 = _mm_set1_epi16((short)CNCSJPCBuffer::NCS_MININT16); + + for(UINT32 y = 0; y < nHeight; y++) { + INT16 *pSrc = (INT16*)pDecBuf->GetPtr() + y * nDecStep; +@@ -1008,7 +1008,7 @@ + UINT32 nSubWidth = nWidth / 4; + + __m128 mm7 = _mm_set1_ps(fRatio); +- __m64 mm4 = _mm_set1_pi16((short)CNCSJPCBuffer::MININT16); ++ __m64 mm4 = _mm_set1_pi16((short)CNCSJPCBuffer::NCS_MININT16); + + for(UINT32 y = 0; y < nHeight; y++) { + INT16 *pSrc = (INT16*)pDecBuf->GetPtr() + y * nDecStep; +diff -r 486075d14769 -r d53918598fbf libecwj2-3.3/Source/include/NCSJPCBuffer.h +--- libecwj2-3.3/Source/include/NCSJPCBuffer.h Wed Sep 30 11:55:26 2009 +0100 ++++ libecwj2-3.3/Source/include/NCSJPCBuffer.h Wed Sep 30 12:20:09 2009 +0100 +@@ -48,30 +48,30 @@ + class NCSJPC_EXPORT_ALL CNCSJPCBuffer: public CNCSJPCRect { + public: + /** Maximum UINT8 value */ +- static const UINT32 MAXUINT8; ++ static const UINT32 NCS_MAXUINT8; + /** Maximum UINT16 value */ +- static const UINT32 MAXUINT16; ++ static const UINT32 NCS_MAXUINT16; + /** Maximum UINT32 value */ +- static const UINT32 MAXUINT32; ++ static const UINT32 NCS_MAXUINT32; + /** Minimum UINT8 value */ +- static const UINT32 MINUINT8; ++ static const UINT32 NCS_MINUINT8; + /** Minimum UINT16 value */ +- static const UINT32 MINUINT16; ++ static const UINT32 NCS_MINUINT16; + /** Minimum UINT32 value */ +- static const UINT32 MINUINT32; ++ static const UINT32 NCS_MINUINT32; + + /** Maximum INT8 value */ +- static const UINT32 MAXINT8; ++ static const UINT32 NCS_MAXINT8; + /** Maximum INT16 value */ +- static const UINT32 MAXINT16; ++ static const UINT32 NCS_MAXINT16; + /** Maximum INT32 value */ +- static const UINT32 MAXINT32; ++ static const UINT32 NCS_MAXINT32; + /** Minimum INT8 value */ +- static const INT32 MININT8; ++ static const INT32 NCS_MININT8; + /** Minimum INT16 value */ +- static const INT32 MININT16; ++ static const INT32 NCS_MININT16; + /** Minimum INT32 value */ +- static const INT32 MININT32; ++ static const INT32 NCS_MININT32; + + /** + * SystemInfo class - Some basic system capabilities we care about. diff --git a/gis/libecwj2/libecwj2-3.3-wcharfix.patch b/gis/libecwj2/libecwj2-3.3-wcharfix.patch new file mode 100644 index 0000000000..b00729c47c --- /dev/null +++ b/gis/libecwj2/libecwj2-3.3-wcharfix.patch @@ -0,0 +1,15 @@ +diff -Nur libecwj2-3.3-orig/Source/C/NCSUtil/NCSPrefsXML.cpp libecwj2-3.3-wcharfix/Source/C/NCSUtil/NCSPrefsXML.cpp +--- libecwj2-3.3-orig/Source/C/NCSUtil/NCSPrefsXML.cpp 2006-07-03 03:15:12.000000000 +0200 ++++ libecwj2-3.3-wcharfix/Source/C/NCSUtil/NCSPrefsXML.cpp 2012-09-12 21:51:19.477487746 +0200 +@@ -32,7 +32,11 @@ + } else { + char *pHomeDir = getenv("HOME"); + if( pHomeDir ) { ++#ifdef NCS_BUILD_UNICODE ++ sUserPrefsFile.Format( NCS_T("%s%ls"), pHomeDir, NCS_T("/.erm/ncsuserprefs.xml") ); ++#else + sUserPrefsFile.Format( NCS_T("%s%s"), pHomeDir, NCS_T("/.erm/ncsuserprefs.xml") ); ++#endif + } else { + sUserPrefsFile = NCS_T("/etc/erm/ncsuserprefs.xml"); + } diff --git a/gis/libecwj2/libecwj2.SlackBuild b/gis/libecwj2/libecwj2.SlackBuild new file mode 100644 index 0000000000..7a6cfd26c4 --- /dev/null +++ b/gis/libecwj2/libecwj2.SlackBuild @@ -0,0 +1,126 @@ +#!/bin/bash + +# Slackware build script for libecwj2 + +# Copyright 2014-2022 Giancarlo Dessì, Cagliari IT +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=libecwj2 +VERSION=${VERSION:-3.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} +SRCVER=2006-09-06 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION + +# Create $PKG/usr/include because make install does not do it +mkdir $PKG/usr +mkdir $PKG/usr/include + +unzip $CWD/$PRGNAM-$VERSION-$SRCVER.zip +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Apply some patches to the original source code +# thanks to Authors +# see http://osgeo-org.1560.x6.nabble.com/ECW-support-on-Fedora-Linux-error-td4991388.html +# and http://wiki.openstreetmap.org/wiki/ECW#Howto_install_gdal_with_ECW_support + +# Patch downloaded from http://trac.osgeo.org/gdal/raw-attachment/ticket/3162/libecwj2-3.3-msvc90-fixes.patch +patch -p1 <$CWD/libecwj2-3.3-msvc90-fixes.patch + +# Patch downloaded from http://osgeo-org.1560.x6.nabble.com/attachment/5001530/0/libecwj2-3.3-wcharfix.patch +patch -p0 <$CWD/libecwj2-3.3-NCSPhysicalMemorySize-Linux.patch + +# Patch downloaded from http://trac.osgeo.org/gdal/raw-attachment/ticket/3366/libecwj2-3.3-NCSPhysicalMemorySize-Linux.patch +patch -p1 <$CWD/libecwj2-3.3-wcharfix.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a License.txt Build.txt SDK.pdf $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/libecwj2/libecwj2.info b/gis/libecwj2/libecwj2.info new file mode 100644 index 0000000000..259b0f701e --- /dev/null +++ b/gis/libecwj2/libecwj2.info @@ -0,0 +1,10 @@ +PRGNAM="libecwj2" +VERSION="3.3" +HOMEPAGE="https://sourceforge.net/projects/libecw-legacy/" +DOWNLOAD="https://sourceforge.net/projects/libecw-legacy/files/libecwj2-3.3-2006-09-06.zip/download" +MD5SUM="acc04e07153c2a2a6595b3e2ebf34432" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Giancarlo Dessì" +EMAIL="slack@giand.it" diff --git a/gis/libecwj2/slack-desc b/gis/libecwj2/slack-desc new file mode 100644 index 0000000000..eb8dd0fafa --- /dev/null +++ b/gis/libecwj2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libecwj2: libecwj2 (translator library for raster geospatial data) +libecwj2: +libecwj2: libecwj2 is an old library and the only one that extends the support +libecwj2: of GDAL to non-free graphic formats ECW and JPEG 2000. +libecwj2: +libecwj2: +libecwj2: +libecwj2: +libecwj2: Repository: https://sourceforge.net/projects/libecw-legacy/ +libecwj2: +libecwj2: diff --git a/gis/libgeotiff/libgeotiff.SlackBuild b/gis/libgeotiff/libgeotiff.SlackBuild index 1ccaeacd83..e090ebf422 100644 --- a/gis/libgeotiff/libgeotiff.SlackBuild +++ b/gis/libgeotiff/libgeotiff.SlackBuild @@ -1,8 +1,11 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for libgeotiff # Copyright 2009 Marco Cecchetti (mrc.ildp@gmail.com) +# Previously maintained by David Spencer <baildon.research@googlemail.com> +# Copyright 2024 Gregory J. L. Tourte <artourter@gmail.com> +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +25,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Maintained by David Spencer <baildon.research@googlemail.com> + +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libgeotiff -VERSION=${VERSION:-1.5.1} +VERSION=${VERSION:-1.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +42,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -66,10 +78,8 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + # We'll stick with autotools because the new cmake build is a train wreck. # This means you don't get inline EPSG CSV, which isn't supported in @@ -85,15 +95,18 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ --localstatedir=/var \ --mandir=/usr/man \ --datadir=/usr/share \ - --infodir=/usr/info \ --with-zlib=yes \ --with-jpeg=yes \ + --with-proj=yes \ --disable-static \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -102,7 +115,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING ChangeLog LICENSE README \ + ChangeLog COPYING LICENSE NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -110,4 +123,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/libgeotiff/libgeotiff.info b/gis/libgeotiff/libgeotiff.info index 3fdc00c1b6..65f30498dd 100644 --- a/gis/libgeotiff/libgeotiff.info +++ b/gis/libgeotiff/libgeotiff.info @@ -1,10 +1,10 @@ PRGNAM="libgeotiff" -VERSION="1.5.1" +VERSION="1.7.1" HOMEPAGE="http://trac.osgeo.org/geotiff/" -DOWNLOAD="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz" -MD5SUM="6d0fa650c206791bc7d5e60ef625ea77" +DOWNLOAD="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.7.1.tar.gz" +MD5SUM="22879ac6f83460605f9c39147a2ccc7a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="proj" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/librasterlite/0001-fix-autotools.patch.gz b/gis/librasterlite/0001-fix-autotools.patch.gz Binary files differnew file mode 100644 index 0000000000..3132200872 --- /dev/null +++ b/gis/librasterlite/0001-fix-autotools.patch.gz diff --git a/gis/librasterlite/librasterlite.SlackBuild b/gis/librasterlite/librasterlite.SlackBuild index 0052a009a6..4ac2da1bad 100644 --- a/gis/librasterlite/librasterlite.SlackBuild +++ b/gis/librasterlite/librasterlite.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for librasterlite @@ -22,26 +22,36 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=librasterlite VERSION=${VERSION:-1.1g} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -62,6 +72,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +zcat $CWD/0001-fix-autotools.patch.gz | patch -p1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-ldl" \ @@ -89,8 +102,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/librttopo/README b/gis/librttopo/README new file mode 100644 index 0000000000..87f86ced7a --- /dev/null +++ b/gis/librttopo/README @@ -0,0 +1,11 @@ +The RT Topology Library exposes an API to create and manage standard +(ISO 13249 aka SQL/MM) topologies using user-provided data stores and +released under the GNU GPL license (version 2 or later). + +The code is derived from PostGIS liblwgeom library enhanced to provide +thread-safety, have less dependencies and be independent from PostGIS +release cycles. + +The RT Topology Library was funded by "Regione Toscana - SITA" (CIG: +6445512CC1), which also funded many improvements in the originating +liblwgeom. diff --git a/gis/spatialite_gui/spatialite_gui.SlackBuild b/gis/librttopo/librttopo.SlackBuild index 830f79b106..569c9ec8ab 100644 --- a/gis/spatialite_gui/spatialite_gui.SlackBuild +++ b/gis/librttopo/librttopo.SlackBuild @@ -1,7 +1,8 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for spatialite-gui -# Copyright 2015 Alexander Bruy <alexander.bruy@gmail.com> +# Slackware build script for librttopo + +# Copyright 2023 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,26 +22,33 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=spatialite_gui -VERSION=${VERSION:-1.7.1} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=librttopo +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -58,23 +66,23 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz +cd $PRGNAM chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-ldl" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --build=$ARCH-slackware-linux @@ -82,15 +90,19 @@ LDFLAGS="-ldl" \ make make install DESTDIR=$PKG +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING CREDITS NEWS.md README.md TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/librttopo/librttopo.info b/gis/librttopo/librttopo.info new file mode 100644 index 0000000000..3f6a201e7e --- /dev/null +++ b/gis/librttopo/librttopo.info @@ -0,0 +1,10 @@ +PRGNAM="librttopo" +VERSION="1.1.0" +HOMEPAGE="https://git.osgeo.org/gitea/rttopo/librttopo/" +DOWNLOAD="https://git.osgeo.org/gitea/rttopo/librttopo/archive/librttopo-1.1.0.tar.gz" +MD5SUM="0952b78943047ca69a9e6cbef6146869" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="geos" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/librttopo/slack-desc b/gis/librttopo/slack-desc new file mode 100644 index 0000000000..2db6351e2b --- /dev/null +++ b/gis/librttopo/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +librttopo: librttopo (RT Topology Library) +librttopo: +librttopo: The RT Topology Library exposes an API to create and manage standard +librttopo: (ISO 13249 aka SQL/MM) topologies using user-provided data stores. +librttopo: The code is derived from PostGIS liblwgeom library enhanced to provide +librttopo: thread-safety, have less dependencies and be independent from PostGIS +librttopo: release cycles. +librttopo: The RT Topology Library was funded by "Regione Toscana - SITA" +librttopo: (CIG: 6445512CC1), which also funded many improvements in the +librttopo: originating liblwgeom. +librttopo: diff --git a/gis/libspatialindex/README b/gis/libspatialindex/README index f5c891e73a..d120164e2d 100644 --- a/gis/libspatialindex/README +++ b/gis/libspatialindex/README @@ -1,6 +1,6 @@ -libspatialindex provides an extensible framework that support robust spatial -indexing methods and sophisticated spatial queries. Main features are: -generic main memory and disk based storage managers, R*-tree index (also -supports linear and quadratic splitting), MVR-tree index (a.k.a. PPR-tree), -TPR-tree index, advanced query capabilities, using Strategy and Visitor -patterns, STR packing / bulk loading etc. +libspatialindex provides an extensible framework that support robust +spatial indexing methods and sophisticated spatial queries. Main +features are: generic main memory and disk based storage managers, +R*-tree index (also supports linear and quadratic splitting), MVR-tree +index (a.k.a. PPR-tree), TPR-tree index, advanced query capabilities, +using Strategy and Visitor patterns, STR packing / bulk loading etc. diff --git a/gis/libspatialindex/libspatialindex.SlackBuild b/gis/libspatialindex/libspatialindex.SlackBuild index 57e7b4f4b7..c7471bbed3 100644 --- a/gis/libspatialindex/libspatialindex.SlackBuild +++ b/gis/libspatialindex/libspatialindex.SlackBuild @@ -1,7 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for libspatialindex +# # Copyright 2012 Alexander Bruy <alexander.bruy@gmail.com> +# Copyright 2023 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,27 +23,35 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=libspatialindex -TARBALLNAME=spatialindex -VERSION=${VERSION:-1.7.1} +VERSION=${VERSION:-1.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=spatialindex if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xjvf $CWD/$TARBALLNAME-src-$VERSION.tar.bz2 -cd $TARBALLNAME-src-$VERSION +rm -rf $SRCNAM-src-$VERSION +tar xjvf $CWD/$SRCNAM-src-$VERSION.tar.bz2 +cd $SRCNAM-src-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -69,30 +79,27 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL INSTALL.WIN NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/libspatialindex/libspatialindex.info b/gis/libspatialindex/libspatialindex.info index add4a3cdb9..7ec4edc0f2 100644 --- a/gis/libspatialindex/libspatialindex.info +++ b/gis/libspatialindex/libspatialindex.info @@ -1,10 +1,10 @@ PRGNAM="libspatialindex" -VERSION="1.7.1" -HOMEPAGE="http://libspatialindex.github.com/" -DOWNLOAD="http://download.osgeo.org/libspatialindex/spatialindex-src-1.7.1.tar.bz2" -MD5SUM="15e5fcff393a56ab9aa7553e4a9cd64a" +VERSION="1.9.3" +HOMEPAGE="https://libspatialindex.github.io/" +DOWNLOAD="https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2" +MD5SUM="db89182e1ac9cb12a88db958de2797df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Alexander Bruy" -EMAIL="alexander.bruy@gmail.com" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/gis/libspatialindex/slack-desc b/gis/libspatialindex/slack-desc index 9056eb9703..361862a004 100644 --- a/gis/libspatialindex/slack-desc +++ b/gis/libspatialindex/slack-desc @@ -11,7 +11,7 @@ libspatialindex: libspatialindex: This library provides and An extensible framework that will support libspatialindex: robust spatial indexing methods and sophisticated spatial queries. libspatialindex: -libspatialindex: Homepage: http://libspatialindex.github.com/ +libspatialindex: Homepage: http://libspatialindex.github.io/ libspatialindex: libspatialindex: libspatialindex: diff --git a/gis/libspatialite/README b/gis/libspatialite/README index 52bbc54ffb..0a58e0d43e 100644 --- a/gis/libspatialite/README +++ b/gis/libspatialite/README @@ -1,9 +1,6 @@ -SpatiaLite is an open source library intended to extend the SQLite core -to support fully fledged Spatial SQL capabilities. SpatiaLite is smoothly -integrated into SQLite to provide a complete and powerful Spatial DBMS -(mostly OGC-SFS compliant). Using SQLite + SpatiaLite you can effectively -deploy an alternative open source Spatial DBMS roughly equivalent to -PostgreSQL + PostGIS. - -liblwgeom (postgis) is optional but strongly recommended dependency. To build -spatialite with liblwgeom support set LWGEOM=yes. +SpatiaLite is an open source library intended to extend the SQLite +core to support fully fledged Spatial SQL capabilities. SpatiaLite +is smoothly integrated into SQLite to provide a complete and powerful +Spatial DBMS (mostly OGC-SFS compliant). Using SQLite + SpatiaLite you +can effectively deploy an alternative open source Spatial DBMS roughly +equivalent to PostgreSQL + PostGIS. diff --git a/gis/libspatialite/libspatialite.SlackBuild b/gis/libspatialite/libspatialite.SlackBuild index dcaa6a3648..ad44b1f1ba 100644 --- a/gis/libspatialite/libspatialite.SlackBuild +++ b/gis/libspatialite/libspatialite.SlackBuild @@ -1,6 +1,8 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for SpatiaLite +# Slackware build script for libspatialite +# +# Copyright 2023-2024 Gregory J. L. Tourte <artourter@gmail.com> # Copyright 2012-2015 Alexander Bruy <alexander.bruy@gmail.com> # All rights reserved. # @@ -21,30 +23,33 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=libspatialite -VERSION=${VERSION:-4.3.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-5.1.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$LWGEOM" = "yes" ] ; then - LWGEOM_SUPPORT="--enable-lwgeom" -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -67,12 +72,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \ +CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-ldl" \ ./configure \ @@ -82,7 +85,22 @@ LDFLAGS="-ldl" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --enable-freexl \ - $LWGEOM_SUPPORT \ + --enable-rttopo \ + --enable-mathsql \ + --enable-proj \ + --enable-iconv \ + --enable-epsg \ + --enable-geos \ + --enable-gcp \ + --enable-geosadvanced \ + --enable-geosreentrant \ + --enable-geos370 \ + --enable-geos3100 \ + --enable-geos3100 \ + --enable-libxml2 \ + --enable-minizip \ + --enable-geopackage \ + --enable-examples \ --build=$ARCH-slackware-linux make @@ -92,12 +110,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL README README.coverage spatialite-sql-latest.html \ +cp -a AUTHORS COPYING README README.coverage spatialite-sql-latest.html \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/libspatialite/libspatialite.info b/gis/libspatialite/libspatialite.info index f17c92f24a..f5d8039608 100644 --- a/gis/libspatialite/libspatialite.info +++ b/gis/libspatialite/libspatialite.info @@ -1,10 +1,10 @@ PRGNAM="libspatialite" -VERSION="4.3.0" +VERSION="5.1.0" HOMEPAGE="https://www.gaia-gis.it/fossil/libspatialite/index" -DOWNLOAD="http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.3.0.tar.gz" -MD5SUM="59ec162d3e4db2d247945e3a943f64bc" +DOWNLOAD="http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-5.1.0.tar.gz" +MD5SUM="2db597114bd6ee20db93de3984fd116c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="proj geos freexl postgis" -MAINTAINER="Alexander Bruy" -EMAIL="alexander.bruy@gmail.com" +REQUIRES="proj librttopo freexl" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/mapnik/README b/gis/mapnik/README index cf54387091..831ea83dcd 100644 --- a/gis/mapnik/README +++ b/gis/mapnik/README @@ -1,8 +1,7 @@ -Mapnik is a free toolkit for developing mapping applications. Mapnik can be -used for both desktop map design and web development. +Mapnik is a free toolkit for developing mapping applications. Mapnik +can be used for both desktop map design and web development. Optional dependencies: - gdal: GDAL and OGR plugin support -- libwebp: WebP image support -- postgis: PostGIS plugin support +- postgresql: PostGIS plugin support - proj: reprojection support diff --git a/gis/mapnik/mapnik.SlackBuild b/gis/mapnik/mapnik.SlackBuild index e6824b5567..ce36a0ea4e 100644 --- a/gis/mapnik/mapnik.SlackBuild +++ b/gis/mapnik/mapnik.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # # SlackBuild for Mapnik # -# Copyright 2012-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2012-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=mapnik -VERSION=${VERSION:-3.0.22} -VARIANT=1.1.5 -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1.0} +VARIANT=1.2.0 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -83,7 +93,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -scons configure \ +python3 scons/scons.py configure \ FAST=True \ CUSTOM_CFLAGS="$SLKCFLAGS" \ CUSTOM_CXXFLAGS="$SLKCFLAGS" \ @@ -93,7 +103,7 @@ scons configure \ INPUT_PLUGINS=all \ CUSTOM_DEFINES="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 $CUSTOM_DEFINES" \ DESTDIR=$PKG -make install +make PYTHON=python3 install find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -108,4 +118,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/mapnik/mapnik.info b/gis/mapnik/mapnik.info index 0e80cd2fd0..3704b3ae58 100644 --- a/gis/mapnik/mapnik.info +++ b/gis/mapnik/mapnik.info @@ -1,10 +1,10 @@ PRGNAM="mapnik" -VERSION="3.0.22" +VERSION="3.1.0" HOMEPAGE="https://mapnik.org" -DOWNLOAD="https://github.com/mapnik/mapnik/archive/v3.0.22/mapnik-3.0.22.tar.gz \ - https://github.com/mapbox/variant/archive/v1.1.5/variant-1.1.5.tar.gz" -MD5SUM="2e26d8614484b8d4015c42f91a4a2dff \ - efeccaf1adb1da180983445020275c9c" +DOWNLOAD="https://github.com/mapnik/mapnik/archive/v3.1.0/mapnik-3.1.0.tar.gz \ + https://github.com/mapbox/variant/archive/v1.2.0/variant-1.2.0.tar.gz" +MD5SUM="a83ef25e8df0e533cba12f094a17eeac \ + 695181bbd9a0fd577a4bed4a07c960fb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/gis/merkaartor/README b/gis/merkaartor/README index 3d3f5f9df0..a60e997674 100644 --- a/gis/merkaartor/README +++ b/gis/merkaartor/README @@ -2,3 +2,11 @@ Merkaartor is an openstreetmap mapping program. Merkaartor focuses on providing a visually pleasing but performant editing environment for free geographical data. + +gpsd is an optional dependency autodetected enabled by default +if found in the system. You can disable the support by passing + GPSD=no ./merkaartor.SlackBuild + +The option -DWEBENGINE is set to ON by default. You can disable +it by passing + WEBENGINE=no ./merkaartor.SlackBuild diff --git a/gis/merkaartor/merkaartor.SlackBuild b/gis/merkaartor/merkaartor.SlackBuild index b81fd85524..123e5d7e75 100644 --- a/gis/merkaartor/merkaartor.SlackBuild +++ b/gis/merkaartor/merkaartor.SlackBuild @@ -1,29 +1,64 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for Merkaartor +# Slackware build script for merkaartor # Written by otzy_007 (oz@oprod.net) +# Maintained 2020-2021 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Maintained 2023 by Giancarlo Dessi, Cagliari, IT +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=merkaartor -VERSION=${VERSION:-0.18.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.19.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +if [ -x /etc/rc.d/rc.gpsd ] ; then + gpsd="-DGPSD=ON" ; [ "${GPSD:-yes}" = "no" ] && gpsd="" +else + gpsd="" +fi + +webengine="-DWEBENGINE=ON" ; [ "${WEBENGINE:-yes}" = "no" ] && webengine="" + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -51,18 +86,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -make -C translations release +# fix build failure in current +if [ -f /usr/lib${LIBDIRSUFFIX}/libexiv2.so.0.28* ] ; then + sed -i ./src/Docks/GeoImageDock.cpp -e "s/AutoPtr/UniquePtr/g" +fi -qmake-qt5 \ - QMAKE_CFLAGS="$SLKCFLAGS" \ - QMAKE_CXXFLAGS="$SLKCFLAGS -std=c++11" \ - NODEBUG=1 \ - PREFIX=/usr \ - DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - LIBDIR="/usr/lib${LIBDIRSUFFIX}" +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + $gpsd \ + $webengine \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. -make -make install INSTALL_ROOT=$PKG +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -78,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/merkaartor/merkaartor.info b/gis/merkaartor/merkaartor.info index a7949669cc..5e426ded21 100644 --- a/gis/merkaartor/merkaartor.info +++ b/gis/merkaartor/merkaartor.info @@ -1,10 +1,10 @@ PRGNAM="merkaartor" -VERSION="0.18.4" +VERSION="0.19.0" HOMEPAGE="http://www.merkaartor.be" -DOWNLOAD="https://github.com/openstreetmap/merkaartor/archive/0.18.4/merkaartor-0.18.4.tar.gz" -MD5SUM="6669b697105d4e02202fa63d741580d0" +DOWNLOAD="https://github.com/openstreetmap/merkaartor/archive/0.19.0/merkaartor-0.19.0.tar.gz" +MD5SUM="3696fde6c0521182e9e8c51563d68b94" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal qt5" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="gdal" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/mobac/README b/gis/mobac/README deleted file mode 100644 index 0c987b1f4e..0000000000 --- a/gis/mobac/README +++ /dev/null @@ -1,10 +0,0 @@ -Mobile Atlas Creator (formerly known as TrekBuddy Atlas Creator) is an open -source program which creates offline atlases for GPS handhelds and cell phone -applications like TrekBuddy, AndNav and other Android and WindowsCE-based -applications. For the full list of supported applications please see the -features section. Additionally individual maps can be exported as one large PNG -image with calibration MAP file for OziExplorer. As source for an offline atlas -Mobile Atlas Creator can use a large number of different online maps such as -OpenStreetMap and other online map providers. - -The SlackBuild will create /usr/bin/mobac to launch Mobile Atlas Creator. diff --git a/gis/mobac/directories.ini b/gis/mobac/directories.ini deleted file mode 100644 index fd4a41091c..0000000000 --- a/gis/mobac/directories.ini +++ /dev/null @@ -1,42 +0,0 @@ -################################################ -# MOBAC system wide directory configuration -################################################ -# -# For activating this configuration file rename it to "directories.ini" -# and place it in the same directory as the file Mobile_Atlas_Creator.jar -# -# You can use any available system variable - but you have to write it in Java notation -# -# Therefore the tmp directory is available on all platforms via "${TMP}" -# -# Besides the default system variables MOBAC defines two own variables: -# -# ${home} -# user home directory, e.g. /home/username/ on Linux -# -# ${mobac-prog} -# directory where MOBAC (or to be detailed Mobile_Atlas_Creator.jar) has been installed into -# -# Notes: -# Absolute pathes are also valid - -#Uncomment one of the following lines starting with "mobac." for redefining the directory - -# Directory where to save settings.xml and search for log4j.xml -mobac.usersettingsdir=${home}/.mobac - -# Directory where to save and load atlas profiles -mobac.atlasprofilesdir=${home}/.mobac - -# Directory where to search "map packs", custom maps and beanShell map sources -# Updated map packs are also saved into this directory overwriting old ones -mobac.mapsourcesdir=${mobac-prog}/mapsources - -# Directory where to create the cache databases of downloaded tiles -mobac.tilestoredir=${home}/.cache/mobac - -# Directory where to save config files for executing external tools from within MOBAC -#mobac.toolsdir=${mobac-prog}/tools - -# Directory where to create the temporary download container -mobac.tmpdir=/tmp diff --git a/gis/mobac/mobac.SlackBuild b/gis/mobac/mobac.SlackBuild deleted file mode 100644 index 1364e36a54..0000000000 --- a/gis/mobac/mobac.SlackBuild +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -# Slackware build script for mobac -# Benjamin Trigona-Harany -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=mobac -SRCNAM=Mobile\ Atlas\ Creator -VERSION=${VERSION:-1.9.16} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -MOBAC_HOME=usr/share/$PRGNAM - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG/$MOBAC_HOME $PKG/usr/bin $OUTPUT -cd $TMP -rm -rf $PRGNAM -mkdir $PRGNAM -cd $PRGNAM -unzip "$CWD/$SRCNAM $VERSION.zip" -chown -R root:root . - -sed -i "s/-jar /\-jar \/usr\/share\/$PRGNAM\//g" start.sh -cp -ar *.jar mapsources start.sh $PKG/$MOBAC_HOME -cp $CWD/directories.ini $PKG/$MOBAC_HOME - -chmod +x $PKG/$MOBAC_HOME/start.sh -ln -s /$MOBAC_HOME/start.sh $PKG/usr/bin/$PRGNAM - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG.txt README.HTM ReleaseNotes.txt gpl.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/mobac/mobac.info b/gis/mobac/mobac.info deleted file mode 100644 index 1dda0eae71..0000000000 --- a/gis/mobac/mobac.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mobac" -VERSION="1.9.16" -HOMEPAGE="http://mobac.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/mobac/files/Mobile%20Atlas%20Creator/MOBAC%201.9/Mobile%20Atlas%20Creator%201.9.16.zip" -MD5SUM="79e0412e5a084c2795a7a487cc6cb632" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="jdk" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/mobac/slack-desc b/gis/mobac/slack-desc deleted file mode 100644 index d145335160..0000000000 --- a/gis/mobac/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -mobac: mobac (Mobile Atlas Creator) -mobac: -mobac: Mobile Atlas Creator (formerly known as TrekBuddy Atlas Creator) is -mobac: an open source program which creates offline atlases for GPS handhelds -mobac: and cell phone applications like TrekBuddy, AndNav and other Android -mobac: and WindowuCE-based applications. For the full list of supported -mobac: applications please see the features section. Additionally individual -mobac: maps can be exported as one large PNG image with calibration MAP file -mobac: for OziExplorer. As source for an offline atlas Mobile Atlas Creator -mobac: can use a large number of different online maps such as OpenStreetMap -mobac: and other online map providers. diff --git a/gis/navit/navit.SlackBuild b/gis/navit/navit.SlackBuild index bdfe25c6cc..ae63ec7946 100644 --- a/gis/navit/navit.SlackBuild +++ b/gis/navit/navit.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for navit @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=navit -VERSION=${VERSION:-R7651} +VERSION=${VERSION:-0.5.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -72,7 +82,7 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSAMPLE_MAP=n \ @@ -86,11 +96,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mv $PKG/usr/share/man $PKG/usr/man +cp -a man/* $PKG/usr/man find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/share/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog COPYRIGHT README GPL-2 LGPL-2 $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING CONTRIBUTING.md CHANGELOG.md COPYRIGHT README.md GPL-2 LGPL-2 $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -98,4 +109,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/navit/navit.info b/gis/navit/navit.info index b30a3e705f..0290e268be 100644 --- a/gis/navit/navit.info +++ b/gis/navit/navit.info @@ -1,8 +1,8 @@ PRGNAM="navit" -VERSION="R7651" +VERSION="0.5.6" HOMEPAGE="https://www.navit-project.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/navit-R7651.tar.gz" -MD5SUM="cf23a4bc24d1b552da80861b93e86343" +DOWNLOAD="https://github.com/navit-gps/navit/archive/v0.5.6/navit-0.5.6.tar.gz" +MD5SUM="98b93da6b70c928d825c1ede6691087a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild index 17eb3dce8f..7c4a2a8780 100644 --- a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild +++ b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for opencpn-plugin-oesenc @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=opencpn-plugin-oesenc -VERSION=${VERSION:-3.3.8} +VERSION=${VERSION:-4.0.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} SRCNAM=oesenc_pi @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -98,11 +108,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Notes README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info index 4112744805..576e3c446b 100644 --- a/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info +++ b/gis/opencpn-plugin-oesenc/opencpn-plugin-oesenc.info @@ -1,8 +1,8 @@ PRGNAM="opencpn-plugin-oesenc" -VERSION="3.3.8" +VERSION="4.0.10" HOMEPAGE="https://opencpn.org/OpenCPN/plugins/oesenc.html" -DOWNLOAD="https://github.com/bdbcat/oesenc_pi/archive/v3.3.8/oesenc_pi-3.3.8.tar.gz" -MD5SUM="6832bdaa4d62f93f2241582429cc616e" +DOWNLOAD="https://github.com/bdbcat/oesenc_pi/archive/v4.0.10/oesenc_pi-4.0.10.tar.gz" +MD5SUM="bfd9b8a1a1661990e95ee73bf86e6bd0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opencpn" diff --git a/gis/opencpn/README b/gis/opencpn/README deleted file mode 100644 index 13429d3b66..0000000000 --- a/gis/opencpn/README +++ /dev/null @@ -1,17 +0,0 @@ -OpenCPN is a free software (GPLv2) project to create a concise chart -plotter and navigation software, for use underway or as a planning -tool. OpenCPN is developed by a team of active sailors using real -world conditions for program testing and refinement. - -If you are upgrading or installing new, OpenCPN 5.x now requires -that wxGTK3 be built with webkitgtk support. So you will have to -install webkitgtk available here at SBo, then build and install -wxGTK3. - -OpenCPN only looks for plugins in the "lib" directories. So on -x86_64 we have to pass an environment variable to use plugins. -The menu launcher will automatically set this for you, however -if you choose to launch OpenCPN from the command line you must -launch it with this command to get plugin support on x86_64. - -OPENCPN_PLUGIN_DIRS="/usr/lib64/opencpn" opencpn diff --git a/gis/opencpn/opencpn.SlackBuild b/gis/opencpn/opencpn.SlackBuild deleted file mode 100644 index f0d12e610b..0000000000 --- a/gis/opencpn/opencpn.SlackBuild +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh - -# Slackware build script for opencpn - -# Copyright 2019 Matt Dinslage, Springfield, MO -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=opencpn -VERSION=${VERSION:-5.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/OpenCPN-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz -cd OpenCPN-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Apply patches to fix following issues... -# Honor MANDIR -# Honor LIBSUFFIXDIR -# Fix building with newer cmake versions -for patch in $CWD/patches/* ; do - patch -p1 < $patch -done - -# opencpn does not have specific checks for Slackware so it -# defautls to a i386 arch. Change this for x86_64 -if [ "$ARCH" = "x86_64" ]; then - sed -i '0,/i386/s//x86_64/' CMakeLists.txt -fi - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DBUNDLE_GSHHS=CRUDE \ - -DBUNDLE_TCDATA=ON \ - -DBUNDLE_DOCS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a INSTALL README data/doc/help_en_US.html data/license.txt $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# Add an icon to /usr/share/pixmaps so menu launcher has icon -mkdir -p $PKG/usr/share/pixmaps -convert $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg -resize 256x256 \ - $PKG/usr/share/pixmaps/opencpn.png - -# OpenCPN only looks for plugins in the "lib" directories. We -# have to set an evnironment variable in order for OpenCPN to -# find plugins in "lib64" -if [ "$ARCH" = "x86_64" ]; then - sed -i 's,Exec=opencpn,Exec=env OPENCPN_PLUGIN_DIRS="/usr/lib64/opencpn" opencpn,g' $PKG/usr/share/applications/opencpn.desktop -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/opencpn/opencpn.info b/gis/opencpn/opencpn.info deleted file mode 100644 index b90d60ab9f..0000000000 --- a/gis/opencpn/opencpn.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opencpn" -VERSION="5.0.0" -HOMEPAGE="https://opencpn.org/" -DOWNLOAD="https://github.com/OpenCPN/OpenCPN/archive/v5.0.0/OpenCPN-5.0.0.tar.gz" -MD5SUM="a6e79c2c6f64037be1894b48b9a1014a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gpsd tinyxml libmspack portaudio webkitgtk wxGTK3" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" diff --git a/gis/opencpn/patches/cmake_build_fix.patch b/gis/opencpn/patches/cmake_build_fix.patch deleted file mode 100644 index aca98fe9f0..0000000000 --- a/gis/opencpn/patches/cmake_build_fix.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fcec1191a..8df2a9e21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7")) - ENDIF() - - IF((_wx_selected_config MATCHES "qt-armv7")) -- SET(wxWidgets_USE_LIBS base core xml html adv aui) -+ SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui) - ELSE() -- SET(wxWidgets_USE_LIBS net xml html adv aui core base webview) -+ SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview) - ENDIF() - - OPTION (USE_GL "Enable OpenGL support" ON) -@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li - SET(OPENGLES_FOUND "YES") - SET(OPENGL_FOUND "YES") - -- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl ) -+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl ) - add_subdirectory(src/glshim) - - SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm" ) -@@ -455,7 +455,7 @@ IF(QT_ANDROID) - SET(OPENGLES_FOUND "YES") - SET(OPENGL_FOUND "YES") - -- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl ) -+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl ) - add_subdirectory(src/glshim) - ENDIF(QT_ANDROID) - -@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID)) - ENDIF(USE_GL) - - IF(OPENGL_FOUND) -- SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} ) -+ SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} ) - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - - MESSAGE (STATUS "Found OpenGL...." ) -@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID) - ENDIF(MSVC) - - IF(WIN32 OR APPLE OR QT_ANDROID) -- FIND_PACKAGE(wxWidgets) -+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - if (wxWidgets_FOUND) - message(STATUS "Found wxWidgets webview add-on") - add_definitions(-DOCPN_USE_WEBVIEW) - else () -- list(REMOVE_ITEM wxWidgets_USE_LIBS webview) -+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview) - message(STATUS "Could not find wxWidgets webview add-on") -- FIND_PACKAGE(wxWidgets REQUIRED) -+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - endif () - IF(MSYS) - # this is to convert msys to windows paths, and handle the missing /usr -@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID) - set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3) - MESSAGE(STATUS "Building against GTK3...") - ENDIF(GTK2_FOUND) -- FIND_PACKAGE(wxWidgets) -+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - if (wxWidgets_FOUND) - message(STATUS "Found wxWidgets webview add-on") - add_definitions(-DOCPN_USE_WEBVIEW) - else () -- list(REMOVE_ITEM wxWidgets_USE_LIBS webview) -+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview) - message(STATUS "Could not find wxWidgets webview add-on") -- FIND_PACKAGE(wxWidgets REQUIRED) -+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - endif () - MESSAGE (STATUS "Found wxWidgets..." ) - MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}") diff --git a/gis/opencpn/patches/honor_mandir.patch b/gis/opencpn/patches/honor_mandir.patch deleted file mode 100644 index 8a92dd86c8..0000000000 --- a/gis/opencpn/patches/honor_mandir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up OpenCPN-5.0.0/CMakeLists.txt.orig OpenCPN-5.0.0/CMakeLists.txt ---- OpenCPN-5.0.0/CMakeLists.txt.orig 2019-04-03 13:49:21.423885285 -0500 -+++ OpenCPN-5.0.0/CMakeLists.txt 2019-04-03 13:51:19.789880135 -0500 -@@ -91,6 +91,7 @@ SET(CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/cmake - ) - -+SET(MAN_PATH "man/man1") - - set (CMAKE_CXX_STANDARD 11) - message(STATUS "Setting C++11 standard via cmake standard mechanism") -@@ -2422,7 +2423,7 @@ IF(NOT APPLE) - INSTALL(FILES src/bitmaps/other_svg_src/opencpn.svg DESTINATION ${PREFIX_DATA}/icons/hicolor/scalable/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) - INSTALL(FILES data/opencpn.desktop DESTINATION ${PREFIX_DATA}/applications PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) - INSTALL(FILES data/opencpn.appdata.xml DESTINATION ${PREFIX_DATA}/appdata PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -- INSTALL(FILES opencpn.1 DESTINATION ${PREFIX_DATA}/man/man1 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -+ INSTALL(FILES opencpn.1 DESTINATION ${MAN_PATH} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) - ENDIF(UNIX) - - ENDIF(NOT APPLE) diff --git a/gis/opencpn/patches/opencpn-4.4.0-multilib-strict.patch b/gis/opencpn/patches/opencpn-4.4.0-multilib-strict.patch deleted file mode 100644 index 877e7beb8c..0000000000 --- a/gis/opencpn/patches/opencpn-4.4.0-multilib-strict.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up OpenCPN-4.4.0/CMakeLists.txt.orig OpenCPN-4.4.0/CMakeLists.txt ---- OpenCPN-4.4.0/CMakeLists.txt.orig 2016-10-22 03:24:56.824710722 -0500 -+++ OpenCPN-4.4.0/CMakeLists.txt 2016-10-22 03:28:10.592724737 -0500 -@@ -101,6 +101,9 @@ IF (NOT WIN32) - IF (EXISTS /etc/gentoo-release) - SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}") - ENDIF (EXISTS /etc/gentoo-release) -+ IF (EXISTS /etc/slackware-version) -+ SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}") -+ ENDIF (EXISTS /etc/slackware-version) - IF(APPLE) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - # IF (CMAKE_OSX_64) - diff --git a/gis/opencpn/slack-desc b/gis/opencpn/slack-desc deleted file mode 100644 index db7e4e4e3d..0000000000 --- a/gis/opencpn/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opencpn: opencpn (A Chartplotter and GPS Navigation Software) -opencpn: -opencpn: OpenCPN is a free software (GPLv2) project to create a concise chart -opencpn: plotter and navigation software, for use underway or as a planning -opencpn: tool. OpenCPN is developed by a team of active sailors using real -opencpn: world conditions for program testing and refinement. -opencpn: -opencpn: -opencpn: -opencpn: -opencpn: diff --git a/gis/opengrads/README b/gis/opengrads/README index 8e53ac4fed..ba9eb6f718 100644 --- a/gis/opengrads/README +++ b/gis/opengrads/README @@ -1,5 +1,6 @@ -The Grid Analysis and Display System (GrADS) is an interactive desktop tool for -easy access, manipulation, and visualization of earth science data. +The Grid Analysis and Display System (GrADS) is an interactive desktop +tool for easy access, manipulation, and visualization of earth science +data. -The OpenGrADS Project seeks to develop advanced interfaces and extensions based -on the main GrADS engine. +The OpenGrADS Project seeks to develop advanced interfaces and +extensions based on the main GrADS engine. diff --git a/gis/opengrads/opengrads.SlackBuild b/gis/opengrads/opengrads.SlackBuild index cc95db3dbd..518524257b 100644 --- a/gis/opengrads/opengrads.SlackBuild +++ b/gis/opengrads/opengrads.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for OpenGrADS @@ -24,13 +24,23 @@ # Written by Oda - edu.oda@gmail.com +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=opengrads VERSION=${VERSION:-2.0.1.oga.1} ARCH=${ARCH:-i686} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +# 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 +fi -CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -81,4 +91,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/openorienteering-mapper/69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch b/gis/openorienteering-mapper/69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch new file mode 100644 index 0000000000..6545099e95 --- /dev/null +++ b/gis/openorienteering-mapper/69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch @@ -0,0 +1,35 @@ +From 69977dfd4cbb8608aafa8ca8b5388d4983f5430a Mon Sep 17 00:00:00 2001 +From: Bas Couwenberg <sebastic@debian.org> +Date: Sat, 23 Oct 2021 17:08:31 +0200 +Subject: [PATCH] Add support for proj.h, proj_api.h is removed in PROJ 8. + +--- + cmake/FindPROJ4.cmake | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/cmake/FindPROJ4.cmake b/cmake/FindPROJ4.cmake +index 093deaa79..10dfc7afa 100644 +--- a/cmake/FindPROJ4.cmake ++++ b/cmake/FindPROJ4.cmake +@@ -91,6 +91,21 @@ if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h") + string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}") + set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}") + set(PROJ4_VERSION_COUNT 3) ++else() ++ find_path(PROJ4_INCLUDE_DIR NAMES proj.h ${_PROJ4_SEARCH} PATH_SUFFIXES include) ++ mark_as_advanced(PROJ4_INCLUDE_DIR) ++ ++ if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj.h") ++ file(STRINGS "${PROJ4_INCLUDE_DIR}/proj.h" PROJ_VERSION_MAJOR REGEX "^#define PROJ_VERSION_MAJOR [0-9]+$") ++ file(STRINGS "${PROJ4_INCLUDE_DIR}/proj.h" PROJ_VERSION_MINOR REGEX "^#define PROJ_VERSION_MINOR [0-9]+$") ++ file(STRINGS "${PROJ4_INCLUDE_DIR}/proj.h" PROJ_VERSION_PATCH REGEX "^#define PROJ_VERSION_PATCH [0-9]+$") ++ ++ string(REGEX REPLACE "^.*PROJ_VERSION_[A-Z]+ ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ_VERSION_MAJOR}") ++ string(REGEX REPLACE "^.*PROJ_VERSION_[A-Z]+ ([0-9]).*$" "\\1" PROJ4_VERSION_MINOR "${PROJ_VERSION_MINOR}") ++ string(REGEX REPLACE "^.*PROJ_VERSION_[A-Z]+ ([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ_VERSION_PATCH}") ++ set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}") ++ set(PROJ4_VERSION_COUNT 3) ++ endif() + endif() + + # Allow PROJ4_LIBRARY to be set manually, as the location of the proj library diff --git a/gis/openorienteering-mapper/README b/gis/openorienteering-mapper/README index 8dafcbf0d5..316c8a5b7f 100644 --- a/gis/openorienteering-mapper/README +++ b/gis/openorienteering-mapper/README @@ -1,2 +1,3 @@ -OpenOrienteering Mapper is an orienteering mapmaking program and provides -a free and open source alternative to existing commercial software. +OpenOrienteering Mapper is an orienteering mapmaking program and +provides a free and open source alternative to existing commercial +software. diff --git a/gis/openorienteering-mapper/fix_doc_path.diff b/gis/openorienteering-mapper/fix_doc_path.diff deleted file mode 100644 index 87b1586cf0..0000000000 --- a/gis/openorienteering-mapper/fix_doc_path.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- mapper-0.9.0/CMakeLists.txt.orig 2019-10-24 00:33:05.001359242 +0300 -+++ mapper-0.9.0/CMakeLists.txt 2019-10-24 00:33:50.964840135 +0300 -@@ -133,7 +133,7 @@ - set(MAPPER_RUNTIME_DESTINATION "bin") - set(MAPPER_LIBRARY_DESTINATION "lib/${Mapper_PACKAGE_NAME}") - set(MAPPER_DATA_DESTINATION "share/${Mapper_PACKAGE_NAME}") -- set(MAPPER_ABOUT_DESTINATION "share/doc/${Mapper_PACKAGE_NAME}") -+ set(MAPPER_ABOUT_DESTINATION "doc/${Mapper_PACKAGE_NAME}-${Mapper_VERSION}") - endif() - - if(CMAKE_CROSSCOMPILING) diff --git a/gis/openorienteering-mapper/openorienteering-mapper.SlackBuild b/gis/openorienteering-mapper/openorienteering-mapper.SlackBuild index 752d1ef2b4..ed77cca493 100644 --- a/gis/openorienteering-mapper/openorienteering-mapper.SlackBuild +++ b/gis/openorienteering-mapper/openorienteering-mapper.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for OpenOrienteering Mapper @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=openorienteering-mapper -VERSION=${VERSION:-0.9.0} +VERSION=${VERSION:-0.9.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,7 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/fix_doc_path.diff +# patch for Proj 8 submitted PR to upstream from debian +patch -p1 < $CWD/69977dfd4cbb8608aafa8ca8b5388d4983f5430a.patch mkdir -p build cd build @@ -78,6 +89,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_DOCDIR="/usr/doc/$PRGNAM-$VERSION" \ -DLICENSING_PROVIDER:BOOL=OFF \ -DMapper_PACKAGE_NAME=$PRGNAM \ -Wno-dev .. @@ -99,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/openorienteering-mapper/openorienteering-mapper.info b/gis/openorienteering-mapper/openorienteering-mapper.info index 9df71846be..b7e51274b6 100644 --- a/gis/openorienteering-mapper/openorienteering-mapper.info +++ b/gis/openorienteering-mapper/openorienteering-mapper.info @@ -1,10 +1,10 @@ PRGNAM="openorienteering-mapper" -VERSION="0.9.0" +VERSION="0.9.5" HOMEPAGE="https://www.openorienteering.org/apps/mapper/" -DOWNLOAD="https://github.com/OpenOrienteering/mapper/archive/v0.9.0/mapper-0.9.0.tar.gz" -MD5SUM="7135d60bcacaba0fde002543705c9eea" +DOWNLOAD="https://github.com/OpenOrienteering/mapper/archive/v0.9.5/mapper-0.9.5.tar.gz" +MD5SUM="87cde1b4bbb94704ec1dc356674ec92d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal polyclipping proj qt5" +REQUIRES="gdal polyclipping" MAINTAINER="Nikolay Korotkiy" EMAIL="sikmir@gmail.com" diff --git a/gis/osgEarth/README b/gis/osgEarth/README index eb37a51796..f589884f3f 100644 --- a/gis/osgEarth/README +++ b/gis/osgEarth/README @@ -1,10 +1,6 @@ -osgEarth is a C++ terrain rendering toolkit. Just create a simple XML file, -point it at your imagery, elevation, and vector data, load it into your favorite -OpenSceneGraph application, and go! +osgEarth is a C++ terrain rendering toolkit. Just create a simple XML +file, point it at your imagery, elevation, and vector data, load it +into your favorite OpenSceneGraph application, and go! -osgEarth supports all kinds of data and comes with lots of examples to help you -get up and running quickly and easily. - -Some optional requirements are recommended for enhanced functionality -and/or performance. They include: - poco, protobuf, rocksdb +osgEarth supports all kinds of data and comes with lots of examples to +help you get up and running quickly and easily. diff --git a/gis/osgEarth/geos-3_8-support.patch b/gis/osgEarth/geos-3_8-support.patch deleted file mode 100644 index 5993d4cb0c..0000000000 --- a/gis/osgEarth/geos-3_8-support.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Nur osgearth-osgearth-2.10.2.a/src/osgEarthSymbology/GEOS.cpp osgearth-osgearth-2.10.2.b/src/osgEarthSymbology/GEOS.cpp ---- osgearth-osgearth-2.10.2.a/src/osgEarthSymbology/GEOS.cpp 2019-07-12 08:49:14.000000000 -0700 -+++ osgearth-osgearth-2.10.2.b/src/osgEarthSymbology/GEOS.cpp 2019-11-16 10:00:08.966241888 -0800 -@@ -49,7 +49,7 @@ - - namespace - { -- geom::CoordinateSequence* -+ std::unique_ptr<geom::CoordinateSequence> - vec3dArray2CoordSeq( const Symbology::Geometry* input, bool close, const geom::CoordinateSequenceFactory* factory ) - { - bool needToClose = close && input->size() > 2 && input->front() != input->back(); -@@ -64,7 +64,7 @@ - { - coords->push_back( coords->front() ); - } -- geom::CoordinateSequence* seq = factory->create( coords ); -+ std::unique_ptr<geom::CoordinateSequence> seq = factory->create( coords ); - - return seq; - } -@@ -108,7 +108,8 @@ - else - { - // any other type will at least contain points: -- geom::CoordinateSequence* seq = 0L; -+ std::unique_ptr<geom::CoordinateSequence> seq = 0L; -+ - try - { - switch( input->getType() ) -@@ -119,24 +120,24 @@ - - case Symbology::Geometry::TYPE_POINTSET: - seq = vec3dArray2CoordSeq( input, false, f->getCoordinateSequenceFactory() ); -- if ( seq ) output = f->createPoint( seq ); -+ if ( seq ) output = f->createPoint( *seq ); - break; - - case Symbology::Geometry::TYPE_LINESTRING: - seq = vec3dArray2CoordSeq( input, false, f->getCoordinateSequenceFactory() ); -- if ( seq ) output = f->createLineString( seq ); -+ if ( seq ) output = f->createLineString( *seq ); - break; - - case Symbology::Geometry::TYPE_RING: - seq = vec3dArray2CoordSeq( input, true, f->getCoordinateSequenceFactory() ); -- if ( seq ) output = f->createLinearRing( seq ); -+ if ( seq ) output = f->createLinearRing( *seq ); - break; - - case Symbology::Geometry::TYPE_POLYGON: - seq = vec3dArray2CoordSeq( input, true, f->getCoordinateSequenceFactory() ); - geom::LinearRing* shell = 0L; - if ( seq ) -- shell = f->createLinearRing( seq ); -+ shell = f->createLinearRing( *seq ); - - if ( shell ) - { -@@ -155,7 +156,7 @@ - holes = 0L; - } - } -- output = f->createPolygon( shell, holes ); -+ output = f->createPolygon( shell, (std::vector<geom::LinearRing * >*)holes ); - } - - break; diff --git a/gis/osgEarth/osgEarth.SlackBuild b/gis/osgEarth/osgEarth.SlackBuild index cf201daf4e..ede79953f1 100644 --- a/gis/osgEarth/osgEarth.SlackBuild +++ b/gis/osgEarth/osgEarth.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for osgEarth # Copyright 2012 Alexander Bruy <alexander.bruy@gmail.com> -# Copyright 2018-2019 Christoph Willing, Brisbane Australia +# Copyright 2018-2023 Christoph Willing, Brisbane Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=osgEarth SRCNAM=osgearth -VERSION=${VERSION:-2.10.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -62,8 +72,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -71,16 +81,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/geos-3_8-support.patch - mkdir -p build cd build cmake .. \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lX11" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DDYNAMIC_OSGEARTH=ON + -DCMAKE_BUILD_TYPE=Release make make install DESTDIR=$PKG @@ -90,11 +97,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a tests LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/osgEarth/osgEarth.info b/gis/osgEarth/osgEarth.info index d87bb83193..e46300338f 100644 --- a/gis/osgEarth/osgEarth.info +++ b/gis/osgEarth/osgEarth.info @@ -1,10 +1,10 @@ PRGNAM="osgEarth" -VERSION="2.10.2" +VERSION="3.5" HOMEPAGE="http://osgearth.org/" -DOWNLOAD="https://github.com/gwaldron/osgearth/archive/osgearth-2.10.2/osgearth-osgearth-2.10.2.tar.gz" -MD5SUM="24f01afedb2eeac8154bf64772b7cbc7" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/osgEarth/osgearth-3.5.tar.gz" +MD5SUM="58de6c17ac7643a3ba30d978dc6f0e1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="OpenSceneGraph gdal" +REQUIRES="fmt gdal OpenSceneGraph protobuf3 rocksdb spdlog" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/gis/osm-gps-map/README b/gis/osm-gps-map/README index 497ece375d..1604ee71b0 100644 --- a/gis/osm-gps-map/README +++ b/gis/osm-gps-map/README @@ -1,7 +1,7 @@ osm-gps-map is a Gtk mapping widget (with Python bindings) that, given -GPS co-ordinates, draws a GPS track and points of interest on a moving map -display. +GPS co-ordinates, draws a GPS track and points of interest on a moving +map display. osm-gps-map downloads map data from a number of websites, including -openstreetmap.org, openaerialmap.org and others, and can be used to build -desktop mapping or geolocation applications. +openstreetmap.org, openaerialmap.org and others, and can be used to +build desktop mapping or geolocation applications. diff --git a/gis/osm-gps-map/osm-gps-map.SlackBuild b/gis/osm-gps-map/osm-gps-map.SlackBuild index 8868ed1562..f72ec86c92 100644 --- a/gis/osm-gps-map/osm-gps-map.SlackBuild +++ b/gis/osm-gps-map/osm-gps-map.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for osm-gps-map @@ -22,26 +22,36 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=osm-gps-map VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -94,8 +104,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/osm-gps-map/osm-gps-map.info b/gis/osm-gps-map/osm-gps-map.info index 9e05521623..85c6cf8ff7 100644 --- a/gis/osm-gps-map/osm-gps-map.info +++ b/gis/osm-gps-map/osm-gps-map.info @@ -1,7 +1,7 @@ PRGNAM="osm-gps-map" VERSION="1.1.0" HOMEPAGE="http://nzjrs.github.io/osm-gps-map/" -DOWNLOAD="https://github.com/nzjrs/osm-gps-map/archive/1.1.0.tar.gz" +DOWNLOAD="https://github.com/nzjrs/osm-gps-map/archive/1.1.0/osm-gps-map-1.1.0.tar.gz" MD5SUM="5e9dc55922a597798ef4411130815212" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/gis/osm2pgrouting/osm2pgrouting.SlackBuild b/gis/osm2pgrouting/osm2pgrouting.SlackBuild index 85f927efd1..82333f1f8c 100644 --- a/gis/osm2pgrouting/osm2pgrouting.SlackBuild +++ b/gis/osm2pgrouting/osm2pgrouting.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for osm2pgrouting -# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=osm2pgrouting -VERSION=${VERSION:-2.3.6} +VERSION=${VERSION:-2.3.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -82,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS.md COPYING NEWS Readme.md \ + AUTHORS.md COPYING NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -90,4 +100,4 @@ mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/osm2pgrouting/osm2pgrouting.info b/gis/osm2pgrouting/osm2pgrouting.info index ec5e008a9e..bdf2423bef 100644 --- a/gis/osm2pgrouting/osm2pgrouting.info +++ b/gis/osm2pgrouting/osm2pgrouting.info @@ -1,8 +1,8 @@ PRGNAM="osm2pgrouting" -VERSION="2.3.6" +VERSION="2.3.8" HOMEPAGE="https://pgrouting.org" -DOWNLOAD="https://github.com/pgRouting/osm2pgrouting/archive/v2.3.6/osm2pgrouting-2.3.6.tar.gz" -MD5SUM="7d5b073f55f551ddfd51d07c7f15b651" +DOWNLOAD="https://github.com/pgRouting/osm2pgrouting/archive/v2.3.8/osm2pgrouting-2.3.8.tar.gz" +MD5SUM="4272cd8ef956765a6ca574cae122ea4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libpqxx pgrouting" diff --git a/gis/osm2pgsql-legacy/README b/gis/osm2pgsql-legacy/README new file mode 100644 index 0000000000..1a1c261707 --- /dev/null +++ b/gis/osm2pgsql-legacy/README @@ -0,0 +1,8 @@ +This is the legacy version of osm2pgsql package. + +osm2pgsql is a utility program that converts OpenStreetMap data to +PostGIS-enabled PostgreSQL databases. + +osm2pgsql 1.9.2 is the latest version with support to 32 bit +architectures. If you have a Slackware64 and want to install a version +earlier than 1.9.2, please refer to osm2pgsql package. diff --git a/gis/osm2pgsql-legacy/osm2pgsql-legacy.SlackBuild b/gis/osm2pgsql-legacy/osm2pgsql-legacy.SlackBuild new file mode 100644 index 0000000000..a284fab5cd --- /dev/null +++ b/gis/osm2pgsql-legacy/osm2pgsql-legacy.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/bash +# Slackware build script for osm2pgsql-legacy + +# Copyright 2013-2021 Benjamin Trigona-Harany +# Copyright 2024 Giancarlo Dessi, Cagliari, IT +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=osm2pgsql-legacy +SRCNAM=osm2pgsql +VERSION=${VERSION:-1.9.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +if [ -d /usr/doc/osm2pgsql-1* ]; then + echo "**********************************************************************" + echo "WARNING: an old installation of osm2pgsql is found in your system!" + echo "osm2pgsql-legacy could conflict with other installations of osm2pgsql." + echo "Please remove any previous packages installed before install this:" + echo "# removepkg osm2pgsql" + echo "**********************************************************************" + exit 1 +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=OFF \ + -DWITH_LUAJIT=ON \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mv $PKG/usr/share/man $PKG/usr +gzip -9 $PKG/usr/man/man?/* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/osm2pgsql-legacy/osm2pgsql-legacy.info b/gis/osm2pgsql-legacy/osm2pgsql-legacy.info new file mode 100644 index 0000000000..6344e8a920 --- /dev/null +++ b/gis/osm2pgsql-legacy/osm2pgsql-legacy.info @@ -0,0 +1,10 @@ +PRGNAM="osm2pgsql-legacy" +VERSION="1.9.2" +HOMEPAGE="https://osm2pgsql.org/" +DOWNLOAD="https://github.com/osm2pgsql-dev/osm2pgsql/archive/1.9.2/osm2pgsql-1.9.2.tar.gz" +MD5SUM="a133dbfdddaa634fdffb807567a62635" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="luajit nlohmann_json postgis" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/geoserver-oracle/slack-desc b/gis/osm2pgsql-legacy/slack-desc index 4bddc4009c..d80c0103c7 100644 --- a/gis/geoserver-oracle/slack-desc +++ b/gis/osm2pgsql-legacy/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -geoserver-oracle: geoserver-oracle (Oracle data store support for GeoServer) -geoserver-oracle: -geoserver-oracle: The Oracle plugin adds support for Oracle data stores to GeoServer. -geoserver-oracle: -geoserver-oracle: -geoserver-oracle: -geoserver-oracle: -geoserver-oracle: -geoserver-oracle: -geoserver-oracle: -geoserver-oracle: +osm2pgsql-legacy: osm2pgsql-legacy (convert OpenStreetMap data to PostGIS) +osm2pgsql-legacy: +osm2pgsql-legacy: osm2pgsql is a utility program that converts OpenStreetMap data to +osm2pgsql-legacy: PostGIS-enabled PostgreSQL databases. +osm2pgsql-legacy: This package supports also 32 bit architectures +osm2pgsql-legacy: +osm2pgsql-legacy: +osm2pgsql-legacy: Homepage: https://osm2pgsql.org/ +osm2pgsql-legacy: +osm2pgsql-legacy: +osm2pgsql-legacy: diff --git a/gis/osm2pgsql/README b/gis/osm2pgsql/README index c83188f770..4fa8d0224f 100644 --- a/gis/osm2pgsql/README +++ b/gis/osm2pgsql/README @@ -1,2 +1,5 @@ osm2pgsql is a utility program that converts OpenStreetMap data to PostGIS-enabled PostgreSQL databases. + +Since version 1.10.0 osm2pgsql needs a 64 bit architecture. For 32 bit +architectures you have to install osm2pgsql-legacy. diff --git a/gis/osm2pgsql/osm2pgsql.SlackBuild b/gis/osm2pgsql/osm2pgsql.SlackBuild index 32d1f51d52..3131240f2d 100644 --- a/gis/osm2pgsql/osm2pgsql.SlackBuild +++ b/gis/osm2pgsql/osm2pgsql.SlackBuild @@ -1,7 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for osm2pgsql -# Copyright 2013-2019 Benjamin Trigona-Harany +# Copyright 2013-2021 Benjamin Trigona-Harany +# Copyright 2024 Giancarlo Dessi, Cagliari, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=osm2pgsql -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -34,27 +38,35 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then +ARCH64="no" +if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + ARCH64="yes" else - SLKCFLAGS="-O2" + SLKCFLAGS="" LIBDIRSUFFIX="" fi set -e +if [ $ARCH64 = "no" ]; then + echo "*****************************************" + echo "THIS PACKAGE DOES NOT SUPPORT YOUR SYSTEM" + echo "YOU NEED osm2pgsql-legacy package" + echo "*****************************************" + exit 1 +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -74,7 +86,6 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_TESTING=OFF \ -DBUILD_TESTS=OFF \ -DWITH_LUAJIT=ON \ -DCMAKE_BUILD_TYPE=Release .. @@ -90,7 +101,7 @@ gzip -9 $PKG/usr/man/man?/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog README.md \ + AUTHORS COPYING README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -98,4 +109,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/osm2pgsql/osm2pgsql.info b/gis/osm2pgsql/osm2pgsql.info index e9f63ecd58..c6c549619f 100644 --- a/gis/osm2pgsql/osm2pgsql.info +++ b/gis/osm2pgsql/osm2pgsql.info @@ -1,10 +1,10 @@ PRGNAM="osm2pgsql" -VERSION="1.2.1" -HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql" -DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/1.2.1/osm2pgsql-1.2.1.tar.gz" -MD5SUM="e2902cda5f41cf9cfa71459d28f24e85" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="luajit postgis" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +VERSION="1.11.0" +HOMEPAGE="https://osm2pgsql.org/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/osm2pgsql-dev/osm2pgsql/archive/1.11.0/osm2pgsql-1.11.0.tar.gz" +MD5SUM_x86_64="20c445875232011522c39c533bfb2f21" +REQUIRES="luajit nlohmann_json postgis" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/osm2pgsql/slack-desc b/gis/osm2pgsql/slack-desc index 2cdacd1cb3..82dc4e1c9f 100644 --- a/gis/osm2pgsql/slack-desc +++ b/gis/osm2pgsql/slack-desc @@ -11,7 +11,7 @@ osm2pgsql: osm2pgsql: osm2pgsql is a utility program that converts OpenStreetMap data to osm2pgsql: PostGIS-enabled PostgreSQL databases. osm2pgsql: -osm2pgsql: Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql +osm2pgsql: Homepage: https://osm2pgsql.org/ osm2pgsql: osm2pgsql: osm2pgsql: diff --git a/gis/ossim/0498f7.patch b/gis/ossim/0498f7.patch deleted file mode 100644 index 7dd026a5bd..0000000000 --- a/gis/ossim/0498f7.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0498f71e811ff3068ba491929c09aa5137ea0cca Mon Sep 17 00:00:00 2001 -From: Garrett Potts <gpotts@radiantblue.com> -Date: Thu, 31 Oct 2019 07:08:03 -0400 -Subject: [PATCH] Added missing headers - ---- - src/init/ossimInit.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/init/ossimInit.cpp b/src/init/ossimInit.cpp -index 9aeec9de..2c2ec2c1 100644 ---- a/src/init/ossimInit.cpp -+++ b/src/init/ossimInit.cpp -@@ -66,7 +66,9 @@ - #include <algorithm> - #include <mutex> - #include <geos_c.h> -- -+#include <cstdio> -+#include <cstdarg> -+#include <cstddef> - using namespace std; - - static ossimTrace traceExec = ossimTrace("ossimInit:exec"); diff --git a/gis/ossim/README b/gis/ossim/README index f46c66389e..a6a973ca26 100644 --- a/gis/ossim/README +++ b/gis/ossim/README @@ -1,6 +1,4 @@ -OSSIM is a powerful suite of geospatial libraries and applications used to -process imagery, maps, terrain and vector data. The software has been under -active development since 1996 and is deployed across a number of private, -federal and civilian agencies. - -Optional dependencies: hdf5. +OSSIM is a powerful suite of geospatial libraries and applications +used to process imagery, maps, terrain and vector data. The software +has been under active development since 1996 and is deployed across a +number of private, federal and civilian agencies. diff --git a/gis/ossim/c0d975.patch b/gis/ossim/c0d975.patch deleted file mode 100644 index 31423b557a..0000000000 --- a/gis/ossim/c0d975.patch +++ /dev/null @@ -1,127 +0,0 @@ -From c0d97536f9ac967941b6ca48a6a7a4dde44f4ee3 Mon Sep 17 00:00:00 2001 -From: Garrett Potts <gpotts@radiantblue.com> -Date: Thu, 31 Oct 2019 07:42:32 -0400 -Subject: [PATCH] Fixed a core dump - ---- - src/base/ossimPolyArea2d.cpp | 10 ++++--- - src/init/ossimInit.cpp | 52 +++--------------------------------- - 2 files changed, 9 insertions(+), 53 deletions(-) - -diff --git a/src/base/ossimPolyArea2d.cpp b/src/base/ossimPolyArea2d.cpp -index 572d59de..3212b74a 100644 ---- a/src/base/ossimPolyArea2d.cpp -+++ b/src/base/ossimPolyArea2d.cpp -@@ -100,6 +100,7 @@ class ossimPolyArea2dPrivate - void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing, - const std::vector<ossimPolygon> &interiorRings) - { -+ - deleteGeometry(); - - if (exteriorRing.getNumberOfVertices() < 1) -@@ -107,14 +108,15 @@ void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing, - GEOSGeometryPtr shell = 0; - std::vector<GEOSGeometryPtr> holes; - const std::vector<ossimDpt> &pts = exteriorRing.getVertexList(); -- int idx = 0; -- int n = (int)pts.size(); -+ ossim_int32 idx = 0; -+ ossim_int32 n = (int)pts.size(); - - bool firstAndLastSame = ((pts[0].x == pts[n - 1].x) && (pts[0].y == pts[n - 1].y)); - if (n > 0) - { - GEOSCoordSequence *shellSeq = GEOSCoordSeq_create( -- exteriorRing.getNumberOfVertices() + ((firstAndLastSame) ? 0 : 1), 2); -+ n + ((firstAndLastSame) ? 0 : 1), 2); -+ - //fill the exterior ring - for (idx = 0; idx < n; idx++) - { -@@ -123,7 +125,7 @@ void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing, - //if the original polygon didn't have the first and last point the same, make it so - if (!firstAndLastSame) - { -- GEOSCoordSeq_setXY(shellSeq, idx, pts[0].x, pts[0].y); -+ GEOSCoordSeq_setXY(shellSeq, n, pts[0].x, pts[0].y); - } - shell = GEOSGeom_createLinearRing(shellSeq); - //fill the interior rings -diff --git a/src/init/ossimInit.cpp b/src/init/ossimInit.cpp -index 2c2ec2c1..787a49d9 100644 ---- a/src/init/ossimInit.cpp -+++ b/src/init/ossimInit.cpp -@@ -195,6 +195,8 @@ void ossimInit::initialize(ossimArgumentParser& parser) - } - return; - } -+ initGEOS(geosNoticeFunction, geosErrorFunction); -+ - theInstance->parseEnvOptions(parser); - theInstance->parseNotifyOption(parser); - theInstance->parsePrefsOptions(parser); -@@ -253,7 +255,7 @@ void ossimInit::initialize() - } - return; - } -- -+ - int argc = 1; - char* argv[1]; - -@@ -261,54 +263,6 @@ void ossimInit::initialize() - argv[0][0] = '\0'; - initialize(argc, argv); - delete [] argv[0]; -- --#if 0 -- static std::mutex m; -- std::lock_guard<std::mutex> lock(m); -- if(theInitializedFlag) -- { -- if (traceDebug()) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "DEBUG ossimInit::initialize(): Already initialized, returning......" << std::endl; -- } -- return; -- } -- -- theInstance->theAppName = ""; -- theInstance->thePreferences = ossimPreferences::instance(); -- theInstance->initializeDefaultFactories(); -- -- if ( theElevEnabledFlag ) -- { -- theInstance->initializeElevation(); -- } -- -- theInstance->initializeLogFile(); -- -- //--- -- // To do: -- // We need a mechanism to register factories to the "front" or the -- // "back" of factory list so that plugins can override things. For -- // now we will initialize the plugins last... -- //--- -- if(thePluginLoaderEnabledFlag) -- { -- theInstance->initializePlugins(); -- } -- -- if (traceDebug()) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossim preferences file: " -- << theInstance->thePreferences->getPreferencesFilename() -- << "\nVersion: " << version() -- << "\nossimInit::initialize() leaving..." -- << std::endl; -- } -- -- theInitializedFlag = true; --#endif - } - - void ossimInit::finalize() diff --git a/gis/ossim/c45639.patch b/gis/ossim/c45639.patch deleted file mode 100644 index 10c11aef52..0000000000 --- a/gis/ossim/c45639.patch +++ /dev/null @@ -1,1646 +0,0 @@ -From c456397821cf369af4d9ff1fb60a5dfd1bcefc24 Mon Sep 17 00:00:00 2001 -From: Garrett Potts <gpotts@radiantblue.com> -Date: Wed, 30 Oct 2019 20:43:06 -0400 -Subject: [PATCH] Added new interfaces to support the geos_c api - ---- - include/ossim/base/ossimPolyArea2d.h | 171 ++-- - src/base/ossimPolyArea2d.cpp | 1084 +++++++++++--------------- - src/imaging/ossimImageGeometry.cpp | 2 +- - src/init/ossimInit.cpp | 51 +- - 4 files changed, 570 insertions(+), 738 deletions(-) - -diff --git a/include/ossim/base/ossimPolyArea2d.h b/include/ossim/base/ossimPolyArea2d.h -index ffb1d611..75db23fd 100644 ---- a/include/ossim/base/ossimPolyArea2d.h -+++ b/include/ossim/base/ossimPolyArea2d.h -@@ -5,10 +5,8 @@ - // Author: Garrett Potts - //******************************************************************* - //$Id: ossimPolyArea2d.h 23608 2015-10-28 13:51:35Z gpotts $ -- - #ifndef ossimPolyArea2d_HEADER - #define ossimPolyArea2d_HEADER 1 -- - #include <ossim/base/ossimDpt.h> - #include <ossim/base/ossimGpt.h> - #include <ossim/base/ossimKeywordlist.h> -@@ -16,137 +14,76 @@ - #include <ossim/base/ossimReferenced.h> - #include <vector> - --class ossimDrect; --class ossimIrect; --class OssimPolyArea2dPrivate; -+class ossimPolyArea2dPrivate; - --namespace geos --{ -- namespace geom -- { -- class Geometry; -- } --} -- --class OSSIM_DLL ossimPolyArea2d : public ossimReferenced -+class OSSIM_DLL ossimPolyArea2d - { - public: -- friend class OssimPolyArea2dPrivate; -- friend OSSIM_DLL std::ostream& operator <<(std::ostream& out, const ossimPolyArea2d& data); -- -+ friend OSSIM_DLL std::ostream &operator<<(std::ostream &out, const ossimPolyArea2d &data); -+ friend class ossimPolyArea2dPrivate; - ossimPolyArea2d(); -- ossimPolyArea2d(const std::vector<ossimGpt>& polygon); -- ossimPolyArea2d(const std::vector<ossimDpt>& polygon); -- ossimPolyArea2d(const ossimPolygon& shell, const std::vector<ossimPolygon>& holes); -- -- ossimPolyArea2d(const ossimDpt& p1, -- const ossimDpt& p2, -- const ossimDpt& p3, -- const ossimDpt& p4); -- ossimPolyArea2d(const ossimPolyArea2d& rhs); -- -- ossimPolyArea2d(const ossimIrect& rect); -- ossimPolyArea2d(const ossimDrect& rect); -- ossimPolyArea2d(const ossimPolygon& polygon); -+ ossimPolyArea2d(const std::vector<ossimGpt> &polygon); -+ ossimPolyArea2d(const std::vector<ossimDpt> &polygon); -+ ossimPolyArea2d(const ossimPolygon &shell, const std::vector<ossimPolygon> &holes); -+ -+ ossimPolyArea2d(const ossimDpt &p1, -+ const ossimDpt &p2, -+ const ossimDpt &p3, -+ const ossimDpt &p4); -+ ossimPolyArea2d(const ossimPolyArea2d &rhs); -+ -+ ossimPolyArea2d(const ossimIrect &rect); -+ ossimPolyArea2d(const ossimDrect &rect); -+ ossimPolyArea2d(const ossimPolygon &polygon); - ~ossimPolyArea2d(); -- -+ - void clear() - { - clearPolygons(); - } -- const ossimPolyArea2d& operator =(const ossimPolyArea2d& rhs); -- const ossimPolyArea2d& operator =(const ossimPolygon& rhs); -- const ossimPolyArea2d& operator =(const ossimIrect& rect); -- const ossimPolyArea2d& operator =(const ossimDrect& rect); -- const ossimPolyArea2d& operator =(const std::vector<ossimGpt>& polygon); -- const ossimPolyArea2d& operator =(const std::vector<ossimDpt>& polygon); -- const ossimPolyArea2d& operator &=(const ossimPolyArea2d& rhs); -- ossimPolyArea2d operator &(const ossimPolyArea2d& rhs)const; -- ossimPolyArea2d operator +(const ossimPolyArea2d& rhs)const; -- const ossimPolyArea2d& operator +=(const ossimPolyArea2d& rhs); -- ossimPolyArea2d operator -(const ossimPolyArea2d& rhs)const; -- const ossimPolyArea2d& operator -=(const ossimPolyArea2d& rhs); -- -- bool intersects(const ossimPolyArea2d& rhs)const; -- -- void add(const ossimPolyArea2d& rhs); -- bool getVisiblePolygons(std::vector<ossimPolygon>& polyList)const; -- bool getPolygonHoles(std::vector<ossimPolygon>& polyList)const; -- -- /** -- * @brief Gets all of the polygons stored with their holes embedded. This -- * may be useful if an operation was performed on the original ossimPolyArea2d -- * that caused multiple polygons to be created internally. -- * -- * For example, if a rectangle is intersected with a U shape, the two top -- * portions of the U would be their own separate polygon. It's also possible -- * for these polygons to contain their own holes. This function will return -- * the two top polygons as separate ossimPolyArea2d objects (with any of -- * their holes embedded inside them). -- * -- * -------------------------------- -- * | | -- * | | -- * | ........ ......... | -- * | . . . . | -- * -.------.-----------.-------.--- -- * . . . . -- * . ............. . -- * . . -- * ............................ -- * -- * @param polylist an empty vector of ossimPolyArea2d that will be filled -- * @return returns true if it successfully places polygons in the input vector -- */ -- bool getCompletePolygons(std::vector<ossimPolyArea2d>& polyList)const; -- -- bool isEmpty()const; -- bool isValid(bool displayValidationError = false)const; -- bool isPointWithin(const ossimDpt& point)const; -- bool isPointWithin(double x, double y)const; -- void getBoundingRect(ossimDrect& rect); -- -+ const ossimPolyArea2d &operator=(const ossimPolyArea2d &rhs); -+ const ossimPolyArea2d &operator=(const ossimPolygon &rhs); -+ const ossimPolyArea2d &operator=(const ossimIrect &rect); -+ const ossimPolyArea2d &operator=(const ossimDrect &rect); -+ const ossimPolyArea2d &operator=(const std::vector<ossimGpt> &polygon); -+ const ossimPolyArea2d &operator=(const std::vector<ossimDpt> &polygon); -+ const ossimPolyArea2d &operator&=(const ossimPolyArea2d &rhs); -+ ossimPolyArea2d operator&(const ossimPolyArea2d &rhs) const; -+ ossimPolyArea2d operator+(const ossimPolyArea2d &rhs) const; -+ const ossimPolyArea2d &operator+=(const ossimPolyArea2d &rhs); -+ ossimPolyArea2d operator-(const ossimPolyArea2d &rhs) const; -+ const ossimPolyArea2d &operator-=(const ossimPolyArea2d &rhs); -+ -+ ossim_float64 getArea()const; -+ bool isEmpty() const; -+ void makeValid(); -+ bool isValid(bool displayValidationError = false) const; -+ bool isPointWithin(const ossimDpt &point) const; -+ bool isPointWithin(double x, double y) const; -+ void getBoundingRect(ossimDrect &rect) const; -+ -+ bool intersects(const ossimPolyArea2d &rhs) const; -+ void add(const ossimPolyArea2d &rhs); -+ bool getVisiblePolygons(std::vector<ossimPolygon> &polyList) const; -+ bool getPolygonHoles(std::vector<ossimPolygon> &polyList) const; -+ -+ ossimPolyArea2d &toMultiPolygon(); -+ - /** - * Returns the Well Known Text string - */ -- std::string toString()const; -+ std::string toString() const; -+ bool setFromWkt(const std::string &s); - -- /** -- * @brief Buffers the ossimPolyArea2d shape and returns a copy. This method -- * does not alter polygon. -- * -- * @param distance is the distance to buffer the shape by. Positive values -- * will expand the shape, and negative values will shrink the shape. -- * @return A shape that is a buffered (expanded/contracted) version of this -- * shape -- */ -- ossimPolyArea2d getBufferedShape(double distance=FLT_EPSILON) const; -- -- ossimPolyArea2d& setToBufferedShape(double distance=FLT_EPSILON); -+ bool saveState(ossimKeywordlist &kwl, -+ const char *prefix = 0) const; -+ bool loadState(const ossimKeywordlist &kwl, -+ const char *prefix = 0); - -- ossimPolyArea2d& toMultiPolygon(); -- bool saveState(ossimKeywordlist& kwl, -- const char* prefix=0)const; -- bool loadState(const ossimKeywordlist& kwl, -- const char* prefix=0); -- - protected: -- -+ ossimPolyArea2dPrivate *m_privateData; -+ - void clearPolygons(); -- void recurseVisibleGeometries(ossimPolygon::Vector& polyList, -- const geos::geom::Geometry* geom) const; -- -- void recurseHoles(ossimPolygon::Vector& polyList, -- const geos::geom::Geometry* geom) const; -- -- /** -- * @brief Recurses over the Geometry object to load all complete polygons -- * (a shell and any internal holes) into the ossimPolyArea2d. -- */ -- void recurseCompleteGeometries(std::vector<ossimPolyArea2d>& polyList, -- const geos::geom::Geometry* geom) const; -- -- OssimPolyArea2dPrivate* m_privateData; - }; - - #endif /* #ifndef ossimPolyArea2d_HEADER */ -diff --git a/src/base/ossimPolyArea2d.cpp b/src/base/ossimPolyArea2d.cpp -index fac88637..572d59de 100644 ---- a/src/base/ossimPolyArea2d.cpp -+++ b/src/base/ossimPolyArea2d.cpp -@@ -3,153 +3,167 @@ - // - // $Id: ossimPolyArea2d.cpp 23623 2015-11-13 18:24:28Z gpotts $ - //--- -- - #include <ossim/base/ossimPolyArea2d.h> --#include <ossim/base/ossimDrect.h> --#include <ossim/base/ossimIrect.h> -+#include <ossim/base/ossimReferenced.h> -+#include <ossim/base/ossimPolygon.h> -+#include <ossim/base/ossimNotifyContext.h> -+#include <ossim/base/ossimKeywordlist.h> - #include <ossim/base/ossimKeywordNames.h> --#include <ossim/base/ossimNotify.h> --#include <ossim/base/ossimRefPtr.h> --#include <ossim/base/ossimString.h> --#include <geos/geom/Coordinate.h> --#include <geos/geom/CoordinateArraySequence.h> --#include <geos/geom/GeometryFactory.h> --#include <geos/geom/LinearRing.h> --#include <geos/opBuffer.h> --#include <geos/geom/Point.h> --#include <geos/geom/Polygon.h> --#include <geos/geom/MultiPolygon.h> --#include <geos/geom/PrecisionModel.h> --#include <geos/io/WKTReader.h> --#include <geos/io/WKTWriter.h> --#include <geos/util/GEOSException.h> --#include <geos/operation/valid/IsValidOp.h> --#include <geos/opBuffer.h> --#include <cstdlib> --#include <exception> --#include <memory> - #include <vector> --#include <mutex> -- --using namespace std; -+#include <cstdio> -+#include <cstdarg> -+#include <geos_c.h> - --class MyGeomFactory : public geos::geom::GeometryFactory -+class ossimPolyArea2dPrivate - { - public: -- MyGeomFactory(): -- geos::geom::GeometryFactory(new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING), -- -1) -+ typedef GEOSGeometry *GEOSGeometryPtr; -+ typedef const GEOSGeometry *ConstGEOSGeometryPtr; -+ ossimPolyArea2dPrivate() : m_geometry(GEOSGeom_createEmptyPolygon()) {} -+ virtual ~ossimPolyArea2dPrivate() { deleteGeometry(); } -+ void deleteGeometry() - { -+ if (m_geometry) -+ GEOSGeom_destroy(m_geometry); -+ m_geometry = 0; -+ } - -+ void setGeometry(GEOSGeometryPtr geom) -+ { -+ if(geom != m_geometry) -+ { -+ deleteGeometry(); -+ m_geometry = geom; -+ } - } --}; --class ossimGeometryFactoryWrapper : public ossimReferenced --{ --public: -- ossimGeometryFactoryWrapper() -- : m_geomFactory(0) -+ void setGeometry(const ossimPolygon &polygon, const std::vector<ossimPolygon> &holes = std::vector<ossimPolygon>()); -+ -+ void ringToPoints(const ConstGEOSGeometryPtr geom, std::vector<ossimDpt> &points) const; -+ void recurseVisibleGeometries(ossimPolygon::Vector &polyList) const - { -- //geos::geom::PrecisionModel *pm = -- // new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING); -- m_geomFactory = new MyGeomFactory();//new geos::geom::GeometryFactory(pm, -1); -+ recurseVisibleGeometries(m_geometry, polyList); - } -- virtual ~ossimGeometryFactoryWrapper(){if(m_geomFactory) delete m_geomFactory;m_geomFactory=0;} -- -- MyGeomFactory* m_geomFactory; --}; - --class OssimPolyArea2dPrivate --{ --public: -- typedef geos::geom::Geometry* GeometryPtr; -- typedef const geos::geom::Geometry* ConstGeometryPtr; -- -- OssimPolyArea2dPrivate(GeometryPtr geom=0); -- ~OssimPolyArea2dPrivate(); -- -- void deleteGeometry() { if(m_geometry) { delete m_geometry; m_geometry = 0; }} -- void setGeometry(const ossimPolygon& polygon, const vector<ossimPolygon>& holes = vector<ossimPolygon>()); -- void setGeometry(GeometryPtr geom){deleteGeometry();m_geometry=geom;} -- geos::geom::GeometryFactory* geomFactory(){{return m_globalFactory.valid()?m_globalFactory->m_geomFactory:0;}} -- GeometryPtr m_geometry; -- static ossimRefPtr<ossimGeometryFactoryWrapper> m_globalFactory; --}; -+ void recurseVisibleGeometries(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const; - --ossimRefPtr<ossimGeometryFactoryWrapper> OssimPolyArea2dPrivate::m_globalFactory; -+ void getVisiblePolygons(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const; - --OssimPolyArea2dPrivate::OssimPolyArea2dPrivate(GeometryPtr geom) --:m_geometry(geom) --{ -- static std::mutex globalFactoryMutex; -- -+ bool getVisiblePolygons(ossimPolygon::Vector &polygons) const; -+ -+ void getHoles(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const; -+ bool getPolygonHoles(ossimPolygon::Vector &polygons) const; -+ bool getPolygonHoles(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const; -+ void recurseGeometryHoles(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const; -+ void getBoundingRect(ossimDrect &bounds) const - { -- std::lock_guard<std::mutex> lock(globalFactoryMutex); -- if(!m_globalFactory.valid()) -+ bounds.makeNan(); -+ if (!isEmpty()) - { -- m_globalFactory = new ossimGeometryFactoryWrapper(); -- } -+ GEOSGeometry *geom = GEOSEnvelope(m_geometry); -+ -+ if (geom) -+ { -+ ossimPolygon::Vector polys; -+ getVisiblePolygons(geom, polys); -+ for (ossim_int32 idx = 0; idx < polys.size(); ++idx) -+ { -+ if (bounds.isNan()) -+ { -+ polys[idx].getBoundingRect(bounds); -+ } -+ else -+ { -+ ossimDrect tempRect; -+ polys[idx].getBoundingRect(tempRect); -+ bounds = bounds.combine(tempRect); -+ } -+ } -+ GEOSGeom_destroy(geom); -+ geom = 0; -+ } -+ } - } --} -+ std::string toString() const; -+ bool setFromWkt(const std::string &s); - --OssimPolyArea2dPrivate::~OssimPolyArea2dPrivate() --{ -- deleteGeometry(); --} -+ bool isEmpty() const; -+ bool isValid(bool displayValidationError = false) const; -+ bool isPointWithin(const ossimDpt &pt) const; -+ GEOSGeometryPtr m_geometry; -+}; - --void OssimPolyArea2dPrivate::setGeometry( -- const ossimPolygon& exteriorRing, const vector<ossimPolygon>& interiorRings) -+void ossimPolyArea2dPrivate::setGeometry(const ossimPolygon &exteriorRing, -+ const std::vector<ossimPolygon> &interiorRings) - { - deleteGeometry(); -- -- geos::geom::CoordinateArraySequence *cas = new geos::geom::CoordinateArraySequence(); -- -- const std::vector<ossimDpt>& pts = exteriorRing.getVertexList(); - -+ if (exteriorRing.getNumberOfVertices() < 1) -+ return; -+ GEOSGeometryPtr shell = 0; -+ std::vector<GEOSGeometryPtr> holes; -+ const std::vector<ossimDpt> &pts = exteriorRing.getVertexList(); - int idx = 0; - int n = (int)pts.size(); -- -- if(n > 0) -+ -+ bool firstAndLastSame = ((pts[0].x == pts[n - 1].x) && (pts[0].y == pts[n - 1].y)); -+ if (n > 0) - { -+ GEOSCoordSequence *shellSeq = GEOSCoordSeq_create( -+ exteriorRing.getNumberOfVertices() + ((firstAndLastSame) ? 0 : 1), 2); - //fill the exterior ring - for (idx = 0; idx < n; idx++) - { -- cas->add(geos::geom::Coordinate(pts[idx].x, pts[idx].y)); -+ GEOSCoordSeq_setXY(shellSeq, idx, pts[idx].x, pts[idx].y); - } -- - //if the original polygon didn't have the first and last point the same, make it so -- if((pts[0].x != pts[n-1].x) || (pts[0].y!=pts[n-1].y)) -+ if (!firstAndLastSame) - { -- cas->add(geos::geom::Coordinate(pts[0].x, pts[0].y)); -+ GEOSCoordSeq_setXY(shellSeq, idx, pts[0].x, pts[0].y); - } -- -+ shell = GEOSGeom_createLinearRing(shellSeq); - //fill the interior rings -- vector<geos::geom::Geometry*> *holes = new vector<geos::geom::Geometry*>(); -- for (ossim_uint32 interiorRingIdx = 0; interiorRingIdx < interiorRings.size(); ++interiorRingIdx) -+ if (!interiorRings.empty()) - { -- geos::geom::CoordinateArraySequence *interiorCas = -- new geos::geom::CoordinateArraySequence(); -- const std::vector<ossimDpt>& vertexPts = interiorRings[interiorRingIdx].getVertexList(); -- for(ossim_uint32 vertexIndex=0; vertexIndex < vertexPts.size(); ++vertexIndex) -- { -- interiorCas->add(geos::geom::Coordinate(vertexPts[vertexIndex].x, -- vertexPts[vertexIndex].y)); -- } -- -- //if the original polygon didn't have the first and last point the same, make it so -- if((vertexPts[0].x != vertexPts[vertexPts.size()-1].x) || -- (vertexPts[0].y!=vertexPts[vertexPts.size()-1].y)) -+ for (ossim_uint32 interiorRingIdx = 0; interiorRingIdx < interiorRings.size(); ++interiorRingIdx) - { -- interiorCas->add(geos::geom::Coordinate(vertexPts[0].x, vertexPts[0].y)); -+ if (interiorRings[interiorRingIdx].getNumberOfVertices() > 0) -+ { -+ const std::vector<ossimDpt> &vertexPts = interiorRings[interiorRingIdx].getVertexList(); -+ firstAndLastSame = ((vertexPts[0].x == vertexPts[n - 1].x) && (vertexPts[0].y == vertexPts[n - 1].y)); -+ -+ GEOSCoordSequence *ring = GEOSCoordSeq_create( -+ vertexPts.size() + ((firstAndLastSame) ? 0 : 1), 2); -+ for (ossim_uint32 vertexIndex = 0; vertexIndex < vertexPts.size(); ++vertexIndex) -+ { -+ GEOSCoordSeq_setXY(ring, vertexIndex, vertexPts[vertexIndex].x, vertexPts[vertexIndex].y); -+ } -+ -+ //if the original polygon didn't have the first and last point the same, make it so -+ if (!firstAndLastSame) -+ { -+ GEOSCoordSeq_setXY(ring, vertexPts.size(), vertexPts[0].x, vertexPts[0].y); -+ } -+ GEOSGeometryPtr hole = GEOSGeom_createLinearRing(ring); -+ holes.push_back(hole); -+ } - } -- -- geos::geom::LinearRing *hole = geomFactory()->createLinearRing(interiorCas); -- holes->push_back(hole); - } -- -- geos::geom::LinearRing* shell = geomFactory()->createLinearRing(cas); -- if ( shell ) -+ -+ if (shell) - { -- m_geometry = geomFactory()->createPolygon(shell, holes); -+ if (holes.size()) -+ { -+ m_geometry = GEOSGeom_createPolygon(shell, &holes.front(), holes.size()); -+ } -+ else -+ { -+ m_geometry = GEOSGeom_createPolygon(shell, 0, 0); -+ } - } - else - { -@@ -158,708 +172,540 @@ void OssimPolyArea2dPrivate::setGeometry( - } - } - --void ossimPolyArea2d::recurseVisibleGeometries( -- std::vector<ossimPolygon>& polyList, const geos::geom::Geometry* geom) const -+void ossimPolyArea2dPrivate::ringToPoints(const ConstGEOSGeometryPtr geom, std::vector<ossimDpt> &points) const - { -- int nGeoms = (int)geom->getNumGeometries(); -- -- if(nGeoms < 2 ) -+ double x, y; -+ if (!geom) -+ return; -+ ossim_int32 nPoints = GEOSGetNumCoordinates(geom); -+ if (nPoints > 0) - { -- const geos::geom::Polygon* poly = dynamic_cast<const geos::geom::Polygon*> (geom); -- -- if (poly) -+ const GEOSCoordSequence *seq = GEOSGeom_getCoordSeq(geom); -+ ossim_int32 i = 0; -+ for (i = 0; i < nPoints; i++) - { -- const geos::geom::LineString* lineString = dynamic_cast<const geos::geom::LineString*> (poly->getExteriorRing()); -- if (lineString) -- { -- int currentPolyIdx = (int)polyList.size(); -- int nPoints = (int)lineString->getNumPoints(); -- int idx = 0; -- -- polyList.push_back(ossimPolygon()); -- -- for (idx=0; idx<nPoints; idx++) -- { -- std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx)); -- polyList[currentPolyIdx].addPoint(point->getX(), point->getY()); -- } -- } -+ GEOSCoordSeq_getX(seq, i, &x); -+ GEOSCoordSeq_getY(seq, i, &y); -+ points.push_back(ossimDpt(x, y)); - } - } -- else -+} -+ -+void ossimPolyArea2dPrivate::getHoles(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const -+{ -+ int geomType = GEOSGeomTypeId(geom); -+ std::vector<ossimDpt> points; -+ switch (geomType) - { -- for (int idx=0; idx < nGeoms; ++idx) -- { -- recurseVisibleGeometries(polyList, geom->getGeometryN(idx)); -- } -+ case GEOS_LINESTRING: -+ case GEOS_LINEARRING: -+ { -+ ringToPoints(geom, points); -+ polygons.push_back(ossimPolygon(points)); -+ break; -+ } - } - } - --void ossimPolyArea2d::recurseHoles(std::vector<ossimPolygon>& polyList, -- const geos::geom::Geometry* geom) const -+void ossimPolyArea2dPrivate::getVisiblePolygons(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const - { -- int nGeoms = (int)geom->getNumGeometries(); -- -- if(nGeoms < 2 ) -+ int geomType = GEOSGeomTypeId(geom); -+ std::vector<ossimDpt> points; -+ -+ switch (geomType) - { -- const geos::geom::Polygon* poly = dynamic_cast<const geos::geom::Polygon*> (geom); -+ case GEOS_LINESTRING: -+ case GEOS_LINEARRING: -+ { -+ ringToPoints(geom, points); -+ polygons.push_back(ossimPolygon(points)); -+ break; -+ } -+ case GEOS_POLYGON: -+ { -+ ConstGEOSGeometryPtr geom2 = GEOSGetExteriorRing(geom); -+ ringToPoints(geom2, points); -+ polygons.push_back(ossimPolygon(points)); - -- if (poly) -+ break; -+ } -+ } -+} -+void ossimPolyArea2dPrivate::recurseVisibleGeometries(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const -+{ -+ ossim_int32 nGeoms = GEOSGetNumGeometries(geom); -+ ConstGEOSGeometryPtr geomPtr = 0; -+ if (nGeoms < 2) -+ { -+ geomPtr = GEOSGetGeometryN(geom, 0); -+ if (geomPtr) - { -- ossim_uint32 nInteriorRings = (ossim_uint32)poly->getNumInteriorRing(); -- ossim_uint32 idx = 0; -- -- for(idx = 0; idx < nInteriorRings; ++idx) -- { -- const geos::geom::LineString* lineString = poly->getInteriorRingN(idx); -- if (lineString) -- { -- int currentPolyIdx = (int)polyList.size(); -- int nPoints = (int)lineString->getNumPoints(); -- int idx = 0; -- -- polyList.push_back(ossimPolygon()); -- -- for (idx=0; idx<nPoints; idx++) -- { -- std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx)); -- polyList[currentPolyIdx].addPoint(point->getX(), point->getY()); -- } -- } -- } -+ getVisiblePolygons(geomPtr, polygons); - } - } - else - { -- int idx = 0; -- -- for (idx=0; idx < nGeoms; idx++) -+ for (int idx = 0; idx < nGeoms; ++idx) - { -- recurseHoles(polyList, geom->getGeometryN(idx)); -+ geomPtr = GEOSGetGeometryN(geom, idx); -+ recurseVisibleGeometries(geomPtr, polygons); - } - } - } - --void ossimPolyArea2d::recurseCompleteGeometries(std::vector<ossimPolyArea2d>& polyList, -- const geos::geom::Geometry* geom) const -+void ossimPolyArea2dPrivate::recurseGeometryHoles(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const - { -- int nGeoms = (int)geom->getNumGeometries(); -- if(nGeoms < 2 ) -+ ossim_int32 nGeoms = GEOSGetNumGeometries(geom); -+ ConstGEOSGeometryPtr geomPtr = 0; -+ if (nGeoms < 2) - { -- const geos::geom::Polygon* poly = dynamic_cast<const geos::geom::Polygon*> (geom); -+ ossim_int32 nInteriorRings = GEOSGetNumInteriorRings(geom); -+ ossim_int32 idx = 0; - -- if (poly) -+ for (idx = 0; idx < nInteriorRings; ++idx) - { -- //get exterior shell for the geometry -- ossimPolygon shell; -- const geos::geom::LineString* lineString = -- dynamic_cast<const geos::geom::LineString*> (poly->getExteriorRing()); -- if (lineString) -- { -- int nPoints = (int)lineString->getNumPoints(); -- for (int idx = 0; idx<nPoints; idx++) -- { -- std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx)); -- shell.addPoint(point->getX(), point->getY()); -- } -- } -- -- // Get interior rings for the geometry. -- std::size_t nInteriorRings = poly->getNumInteriorRing(); -- vector<ossimPolygon> holes(nInteriorRings); -- for(std::size_t holeIdx = 0; holeIdx < nInteriorRings; ++holeIdx) -- { -- const geos::geom::LineString* lineString = poly->getInteriorRingN(holeIdx); -- if (lineString) -- { -- std::size_t nPoints = lineString->getNumPoints(); -- for (std::size_t idx = 0; idx<nPoints; ++idx) -- { -- std::unique_ptr<const geos::geom::Point> point(lineString->getPointN(idx)); -- holes[holeIdx].addPoint(point->getX(), point->getY()); -- } -- } -- } -- polyList.push_back(ossimPolyArea2d(shell, holes)); -+ const GEOSGeometry *ringGeom = GEOSGetInteriorRingN(geom, idx); -+ getHoles(ringGeom, polygons); - } - } - else - { -- int idx = 0; -- -- for (idx=0; idx < nGeoms; idx++) -+ for (int idx = 0; idx < nGeoms; ++idx) - { -- recurseCompleteGeometries(polyList, geom->getGeometryN(idx)); -+ geomPtr = GEOSGetGeometryN(geom, idx); -+ recurseGeometryHoles(geomPtr, polygons); - } - } - } - --std::ostream& operator <<(std::ostream& out, const ossimPolyArea2d& rhs) -+bool ossimPolyArea2dPrivate::getVisiblePolygons(ossimPolygon::Vector &polygons) const - { -- if(rhs.m_privateData->m_geometry) -+ bool foundPolys = false; -+ if (m_geometry) - { -- out << rhs.m_privateData->m_geometry->toString(); -+ ossim_uint32 sizeBefore = (ossim_uint32)polygons.size(); -+ recurseVisibleGeometries(m_geometry, polygons); -+ foundPolys = (sizeBefore != polygons.size()); - } -- return out; --} - --ossimPolyArea2d::ossimPolyArea2d() -- :m_privateData(new OssimPolyArea2dPrivate) --{ -+ return foundPolys; - } -- --ossimPolyArea2d::ossimPolyArea2d(const vector<ossimGpt>& polygon) -- :m_privateData(new OssimPolyArea2dPrivate) -+bool ossimPolyArea2dPrivate::getPolygonHoles(ossimPolygon::Vector &polygons) const - { -- (*this) = polygon; -+ return getPolygonHoles(m_geometry, polygons); - } - --ossimPolyArea2d::ossimPolyArea2d(const vector<ossimDpt>& polygon) -- :m_privateData(new OssimPolyArea2dPrivate) -+bool ossimPolyArea2dPrivate::getPolygonHoles(ConstGEOSGeometryPtr geom, -+ ossimPolygon::Vector &polygons) const - { -- (*this) = polygon; --} -+ bool foundPolys = false; -+ if (m_geometry) -+ { -+ ossim_uint32 sizeBefore = (ossim_uint32)polygons.size(); -+ recurseGeometryHoles(m_geometry, polygons); -+ foundPolys = (sizeBefore != polygons.size()); -+ } - --ossimPolyArea2d::ossimPolyArea2d(const ossimIrect& rect) -- :m_privateData(new OssimPolyArea2dPrivate) --{ -- (*this) = rect; -+ return foundPolys; - } - --ossimPolyArea2d::ossimPolyArea2d(const ossimDrect& rect) -- :m_privateData(new OssimPolyArea2dPrivate) -+std::string ossimPolyArea2dPrivate::toString() const - { -- (*this) = rect; --} -+ std::string result; - --ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon& polygon) -- :m_privateData(new OssimPolyArea2dPrivate) --{ -- (*this) = polygon; --} -+ if (m_geometry) -+ { -+ GEOSWKTWriter *wktWriter = GEOSWKTWriter_create(); -+ GEOSWKTWriter_setRoundingPrecision(wktWriter, 20); -+ char *wkt_c = GEOSWKTWriter_write(wktWriter, m_geometry); - --ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon& exteriorRing, const vector<ossimPolygon>& interiorRings) -- :m_privateData(new OssimPolyArea2dPrivate) --{ -- m_privateData->setGeometry(exteriorRing, interiorRings); --} -+ result = wkt_c; -+ GEOSWKTWriter_destroy(wktWriter); - --ossimPolyArea2d::ossimPolyArea2d(const ossimPolyArea2d& rhs) -- :m_privateData(new OssimPolyArea2dPrivate) --{ -- *this = rhs; --} -+ GEOSFree(wkt_c); -+ } - --ossimPolyArea2d::ossimPolyArea2d(const ossimDpt& p1, -- const ossimDpt& p2, -- const ossimDpt& p3, -- const ossimDpt& p4) -- : -- m_privateData(new OssimPolyArea2dPrivate) -+ return result; -+} -+bool ossimPolyArea2dPrivate::setFromWkt(const std::string &s) - { -- ossimPolygon temp(p1,p2,p3,p4); -- *this = temp; -+ bool result = false; -+ -+ GEOSWKTReader *reader = GEOSWKTReader_create(); -+ GEOSGeometry *geom = GEOSWKTReader_read(reader, s.c_str()); -+ result = (geom != 0); -+ setGeometry(geom); -+ -+ GEOSWKTReader_destroy(reader); -+ -+ return result; - } - --ossimPolyArea2d::~ossimPolyArea2d() -+ -+bool ossimPolyArea2dPrivate::isEmpty() const - { -- if(m_privateData) -+ bool result = true; -+ if (m_geometry) - { -- delete m_privateData; -- m_privateData = 0; -+ result = (GEOSisEmpty(m_geometry) == 1); - } -+ -+ return result; - } - --const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimPolyArea2d& rhs) --{ -- if(this != &rhs) -+bool ossimPolyArea2dPrivate::isValid(bool displayValidationError) const -+{ -+ bool result = false; -+ -+ if (!displayValidationError) - { -- if(rhs.m_privateData->m_geometry) -+ result = GEOSisValid(m_geometry) == 1; -+ } -+ else -+ { -+ char *reason = GEOSisValidReason(m_geometry); -+ if (reason) - { -- m_privateData->setGeometry(rhs.m_privateData->m_geometry->clone()); -+ ossimNotify(ossimNotifyLevel_INFO) -+ << "ossimPolyArea2dPrivate::isValid: " << reason << "\n"; -+ -+ GEOSFree(reason); -+ reason = 0; - } - } -- return *this; -+ -+ return result; -+} -+bool ossimPolyArea2dPrivate::isPointWithin(const ossimDpt &pt) const -+{ -+ bool result = false; -+ -+ if (!isEmpty()) -+ { -+ GEOSCoordSequence *pointSeq = GEOSCoordSeq_create(1, 2); -+ GEOSCoordSeq_setXY(pointSeq, 0, pt.x, pt.y); -+ GEOSGeometry *geom = GEOSGeom_createPoint(pointSeq); -+ result = (GEOSWithin(geom, m_geometry) == 1); -+ -+ GEOSGeom_destroy(geom); -+ } -+ -+ return result; -+} -+ -+ -+ossimPolyArea2d::ossimPolyArea2d() -+ : m_privateData(new ossimPolyArea2dPrivate()) -+{ - } - --const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimPolygon& polygon) -+ossimPolyArea2d::ossimPolyArea2d(const std::vector<ossimGpt> &polygon) -+ : m_privateData(new ossimPolyArea2dPrivate()) - { - m_privateData->setGeometry(polygon); -+} - -- return *this; -+ossimPolyArea2d::ossimPolyArea2d(const std::vector<ossimDpt> &polygon) -+ : m_privateData(new ossimPolyArea2dPrivate()) -+{ -+ m_privateData->setGeometry(polygon); - } - --const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimIrect& rect) -+ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon &shell, const std::vector<ossimPolygon> &holes) -+ : m_privateData(new ossimPolyArea2dPrivate()) - { -- return (*this = ossimPolygon(rect)); -+ m_privateData->setGeometry(shell, holes); - } - --const ossimPolyArea2d& ossimPolyArea2d::operator =(const ossimDrect& rect) -+ossimPolyArea2d::ossimPolyArea2d(const ossimDpt &p1, -+ const ossimDpt &p2, -+ const ossimDpt &p3, -+ const ossimDpt &p4) -+ : m_privateData(new ossimPolyArea2dPrivate()) - { -- return (*this = ossimPolygon(rect)); -+ m_privateData->setGeometry(ossimPolygon(p1, p2, p3, p4)); - } - --const ossimPolyArea2d& ossimPolyArea2d::operator =(const vector<ossimGpt>& polygon) -+ossimPolyArea2d::ossimPolyArea2d(const ossimPolyArea2d &rhs) -+ : m_privateData(new ossimPolyArea2dPrivate()) - { -- std::vector<ossimDpt> pts; -- int idx = 0; -- int n = (int)polygon.size(); -- for(idx = 0; idx < n;++idx) -- { -- pts.push_back(polygon[idx]); -- } -- -- return (*this = ossimPolygon(pts)); -+ m_privateData->deleteGeometry(); -+ m_privateData->m_geometry = GEOSGeom_clone(rhs.m_privateData->m_geometry); - } - --const ossimPolyArea2d& ossimPolyArea2d::operator =(const vector<ossimDpt>& polygon) -+ossimPolyArea2d::ossimPolyArea2d(const ossimIrect &rect) -+ : m_privateData(new ossimPolyArea2dPrivate()) - { -- return (*this = ossimPolygon(polygon)); -+ m_privateData->setGeometry(ossimPolygon(rect)); - } - --bool ossimPolyArea2d::intersects(const ossimPolyArea2d& rhs)const -+ossimPolyArea2d::ossimPolyArea2d(const ossimDrect &rect) -+ : m_privateData(new ossimPolyArea2dPrivate()) - { -- bool result = false; -+ m_privateData->setGeometry(ossimPolygon(rect)); -+} - -- if(m_privateData->m_geometry&&rhs.m_privateData->m_geometry) -+ossimPolyArea2d::ossimPolyArea2d(const ossimPolygon &polygon) -+ : m_privateData(new ossimPolyArea2dPrivate()) -+{ -+ m_privateData->setGeometry(polygon); -+} -+ -+ossimPolyArea2d::~ossimPolyArea2d() -+{ -+ if (m_privateData) - { -- result = m_privateData->m_geometry->intersects(rhs.m_privateData->m_geometry); -+ delete m_privateData; - } -+ m_privateData = 0; -+} - -- return result; -+void ossimPolyArea2d::clearPolygons() -+{ -+ m_privateData->setGeometry(GEOSGeom_createEmptyPolygon()); - } - --ossimPolyArea2d ossimPolyArea2d::operator &(const ossimPolyArea2d& rhs)const -+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimPolyArea2d &rhs) - { -- if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry) -+ if (&rhs != this) - { -- ossimPolyArea2d result; -- try // GEOS code throws exceptions... -- { -- result.m_privateData->setGeometry(m_privateData->m_geometry->intersection( -- rhs.m_privateData->m_geometry)); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator& Caught exception: " << e.what() << std::endl; -- result.clearPolygons(); -- } -- catch( ... ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator& Caught exception!" << std::endl; -- result.clearPolygons(); -- } -- return result; -+ m_privateData->deleteGeometry(); -+ m_privateData->m_geometry = GEOSGeom_clone(rhs.m_privateData->m_geometry); - } -+ - return *this; - } - --ossimPolyArea2d ossimPolyArea2d::operator +(const ossimPolyArea2d& rhs)const -+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimPolygon &rhs) - { -- if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry) -- { -- ossimPolyArea2d result; -- try // GEOS code throws exceptions... -- { -- result.m_privateData->setGeometry(m_privateData->m_geometry->Union( -- rhs.m_privateData->m_geometry)); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator+ Caught exception: " << e.what() << std::endl; -- result.clearPolygons(); -- } -- catch( ... ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator+ Caught exception!" << std::endl; -- result.clearPolygons(); -- } -- return result; -- } -+ m_privateData->setGeometry(rhs); -+ - return *this; - } --ossimPolyArea2d ossimPolyArea2d::operator -(const ossimPolyArea2d& rhs)const -+ -+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimIrect &rect) - { -- if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry) -- { -- ossimPolyArea2d result; -- try // GEOS code throws exceptions... -- { -- result.m_privateData->setGeometry(m_privateData->m_geometry->difference( -- rhs.m_privateData->m_geometry)); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator- Caught exception: " << e.what() << std::endl; -- result.clearPolygons(); -- } -- catch( ... ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator- Caught exception!" << std::endl; -- result.clearPolygons(); -- } -- return result; -- } -+ m_privateData->setGeometry(ossimPolygon(rect)); -+ - return *this; - } - --const ossimPolyArea2d& ossimPolyArea2d::operator &=(const ossimPolyArea2d& rhs) -+const ossimPolyArea2d &ossimPolyArea2d::operator=(const ossimDrect &rect) - { -- if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry) -- { -- try // GEOS code throws exceptions... -- { -- m_privateData->setGeometry(m_privateData->m_geometry->intersection( -- rhs.m_privateData->m_geometry)); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator&= Caught exception: " << e.what() << std::endl; -- this->clearPolygons(); -- } -- catch( ... ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator&= Caught exception!" << std::endl; -- this->clearPolygons(); -- } -- } -+ m_privateData->setGeometry(ossimPolygon(rect)); -+ - return *this; - } - --const ossimPolyArea2d& ossimPolyArea2d::operator +=(const ossimPolyArea2d& rhs) -+const ossimPolyArea2d &ossimPolyArea2d::operator=(const std::vector<ossimGpt> &polygon) - { -- if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry) -- { -- try // GEOS code throws exceptions... -- { -- m_privateData->setGeometry(m_privateData->m_geometry->Union( -- rhs.m_privateData->m_geometry)); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator+= Caught exception: " << e.what() << std::endl; -- this->clearPolygons(); -- } -- catch( ... ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator+= Caught exception!" << std::endl; -- this->clearPolygons(); -- } -- } -+ m_privateData->setGeometry(ossimPolygon(polygon)); -+ - return *this; - } - --const ossimPolyArea2d& ossimPolyArea2d::operator -=(const ossimPolyArea2d& rhs) -+const ossimPolyArea2d &ossimPolyArea2d::operator=(const std::vector<ossimDpt> &polygon) - { -- if((this!=&rhs) && m_privateData->m_geometry && rhs.m_privateData->m_geometry) -- { -- try // GEOS code throws exceptions... -- { -- m_privateData->setGeometry(m_privateData->m_geometry->difference( -- rhs.m_privateData->m_geometry)); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator-= Caught exception: " << e.what() << std::endl; -- this->clearPolygons(); -- } -- catch( ... ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::operator-= Caught exception!" << std::endl; -- this->clearPolygons(); -- } -- } -+ m_privateData->setGeometry(ossimPolygon(polygon)); -+ - return *this; - } - --void ossimPolyArea2d::add(const ossimPolyArea2d& rhs) -+const ossimPolyArea2d &ossimPolyArea2d::operator&=(const ossimPolyArea2d &rhs) - { -- if(isEmpty()) -- { -- *this=rhs; -- } -- else -- { -- geos::geom::Geometry* geom = m_privateData->m_geometry->Union(rhs.m_privateData->m_geometry); -- if(geom) m_privateData->setGeometry(geom); -- } -+ GEOSGeometry *geom = GEOSIntersection(m_privateData->m_geometry, rhs.m_privateData->m_geometry); -+ m_privateData->setGeometry(geom); -+ -+ return *this; - } - --void ossimPolyArea2d::clearPolygons() -+ossimPolyArea2d ossimPolyArea2d::operator&(const ossimPolyArea2d &rhs) const - { -- m_privateData->deleteGeometry(); --#if 0 -- clearEngine(); --#endif -+ ossimPolyArea2d result(*this); -+ -+ result &= rhs; -+ -+ return result; - } - --bool ossimPolyArea2d::getVisiblePolygons(vector<ossimPolygon>& polyList)const -+ossimPolyArea2d ossimPolyArea2d::operator+(const ossimPolyArea2d &rhs) const - { -- bool foundPolys = false; -- if(m_privateData->m_geometry) -- { -- ossim_uint32 sizeBefore = (ossim_uint32)polyList.size(); -- recurseVisibleGeometries(polyList, m_privateData->m_geometry); -- foundPolys = (sizeBefore != polyList.size()); -- } -+ ossimPolyArea2d result(*this); - -- return foundPolys; -+ result += rhs; -+ -+ return result; - } - --bool ossimPolyArea2d::getPolygonHoles(vector<ossimPolygon>& polyList)const -+const ossimPolyArea2d &ossimPolyArea2d::operator+=(const ossimPolyArea2d &rhs) - { -- bool foundPolys = false; -- if(m_privateData->m_geometry) -- { -- ossim_uint32 sizeBefore = (ossim_uint32)polyList.size(); -- recurseHoles(polyList, m_privateData->m_geometry); -- foundPolys = (sizeBefore != polyList.size()); -- } -+ GEOSGeometry *geom = GEOSUnion(m_privateData->m_geometry, rhs.m_privateData->m_geometry); - -- return foundPolys; -+ m_privateData->setGeometry(geom); -+ -+ return *this; - } - --bool ossimPolyArea2d::getCompletePolygons(vector<ossimPolyArea2d>& polyList)const -+ossimPolyArea2d ossimPolyArea2d::operator-(const ossimPolyArea2d &rhs) const - { -- bool foundPolys = false; -- if(m_privateData->m_geometry){ -- ossim_uint32 sizeBefore = (ossim_uint32)polyList.size(); -- recurseCompleteGeometries(polyList, m_privateData->m_geometry); -- foundPolys = (sizeBefore != polyList.size()); -- } -- return foundPolys; -+ ossimPolyArea2d result(*this); -+ -+ result -= rhs; -+ -+ return result; - } - --bool ossimPolyArea2d::isEmpty()const -+const ossimPolyArea2d &ossimPolyArea2d::operator-=(const ossimPolyArea2d &rhs) - { -- bool result = true; -- if (m_privateData&&m_privateData->m_geometry) -- { -- result = m_privateData->m_geometry->isEmpty(); -- } -+ GEOSGeometry *geom = GEOSDifference(m_privateData->m_geometry, rhs.m_privateData->m_geometry); - -- return result; -+ m_privateData->setGeometry(geom); -+ -+ return *this; - } - --bool ossimPolyArea2d::isValid(bool displayValidationError)const -+ossim_float64 ossimPolyArea2d::getArea()const - { -- bool result = false; -+ double result = 0.0; - -- if(m_privateData&&m_privateData->m_geometry) -+ if(!isEmpty()) - { -- if(displayValidationError) -- { -- geos::operation::valid::IsValidOp validityCheck(m_privateData->m_geometry); -- geos::operation::valid::TopologyValidationError* -- topologyValidationError(validityCheck.getValidationError()); -- // if(topologyValidationError == nullptr) -- if(topologyValidationError == 0) -- { -- result = true; -- } -- else -- { -- ossimNotify(ossimNotifyLevel_INFO) -- << "ossimPolyArea2d::isValid: " << topologyValidationError->toString() << std::endl; -- } -- } -- else -- { -- result = m_privateData->m_geometry->isValid(); -- } -+ GEOSArea(m_privateData->m_geometry, &result); - } -- -+ - return result; - } - --bool ossimPolyArea2d::isPointWithin(const ossimDpt& point)const -+bool ossimPolyArea2d::isEmpty() const - { -- return isPointWithin(point.x, point.y); -+ return m_privateData->isEmpty(); - } - --bool ossimPolyArea2d::isPointWithin(double x, double y)const -+bool ossimPolyArea2d::isValid(bool displayValidationError) const - { -- bool result = false; -- -- if(!isEmpty()) -- { -- geos::geom::Coordinate c(x,y); -- geos::geom::Geometry* geom = m_privateData->geomFactory()->createPoint(c); -- -- result = m_privateData->m_geometry->intersects(geom); -- -- delete geom; -- } -+ return m_privateData->isValid(displayValidationError); -+} - -- return result; -+bool ossimPolyArea2d::isPointWithin(const ossimDpt &point) const -+{ -+ return m_privateData->isPointWithin(point); - } - --void ossimPolyArea2d::getBoundingRect(ossimDrect& rect) -+bool ossimPolyArea2d::isPointWithin(double x, double y) const - { -- rect.makeNan(); -+ return isPointWithin(ossimDpt(x, y)); -+} - -- if(!isEmpty()) -- { -- const geos::geom::Envelope* envelope = m_privateData->m_geometry->getEnvelopeInternal(); -+void ossimPolyArea2d::getBoundingRect(ossimDrect &rect) const -+{ -+ m_privateData->getBoundingRect(rect); -+} - -- rect = ossimDrect(envelope->getMinX(), envelope->getMinY(), envelope->getMaxX(), envelope->getMaxY()); -- } -+bool ossimPolyArea2d::intersects(const ossimPolyArea2d &rhs) const -+{ -+ return (GEOSIntersects(m_privateData->m_geometry, -+ rhs.m_privateData->m_geometry) == 1); - } - --std::string ossimPolyArea2d::toString()const -+void ossimPolyArea2d::makeValid() - { -- std::string result = ""; -+ ossimPolyArea2dPrivate::GEOSGeometryPtr geom = GEOSMakeValid(m_privateData->m_geometry); -+ if(geom) m_privateData->setGeometry(geom); -+} - -- if(m_privateData->m_geometry) -- { -- result = m_privateData->m_geometry->toString(); -- } - -- return result; -+void ossimPolyArea2d::add(const ossimPolyArea2d &rhs) -+{ -+ *this += rhs; - } - --ossimPolyArea2d ossimPolyArea2d::getBufferedShape(double distance) const{ -- ossimPolyArea2d result; -- try{ -- geos::operation::buffer::BufferOp buffer_operation(m_privateData->m_geometry); -- result.m_privateData->setGeometry( buffer_operation.getResultGeometry(distance)); -- }catch( const std::exception& e ){ -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::getBufferedShape Caught exception: " << e.what() << std::endl; -- result.clearPolygons(); -- }catch( ... ){ -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::getBufferedShape Caught exception!" << std::endl; -- result.clearPolygons(); -- } -- return result; --} --ossimPolyArea2d& ossimPolyArea2d::setToBufferedShape(double distance) --{ -- try{ -- geos::operation::buffer::BufferOp buffer_operation(m_privateData->m_geometry); -- m_privateData->setGeometry( buffer_operation.getResultGeometry(distance)); -- }catch( const std::exception& e ){ -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::getBufferedShape Caught exception: " << e.what() << std::endl; -- }catch( ... ){ -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::getBufferedShape Caught exception!" << std::endl; -- } -- return *this; -+bool ossimPolyArea2d::getVisiblePolygons(std::vector<ossimPolygon> &polyList) const -+{ -+ m_privateData->getVisiblePolygons(polyList); -+ -+ return (polyList.size() > 0); - } - --ossimPolyArea2d& ossimPolyArea2d::toMultiPolygon() -+bool ossimPolyArea2d::getPolygonHoles(std::vector<ossimPolygon> &polyList) const - { -+ m_privateData->getPolygonHoles(polyList); - -+ return (polyList.size() > 0); -+} - -- try{ -- if(m_privateData->m_geometry) -- { -- switch(m_privateData->m_geometry->getGeometryTypeId()) -- { -- case geos::geom::GEOS_POLYGON: -- { -- std::vector<geos::geom::Geometry*> values; -- values.push_back(m_privateData->m_geometry->clone()); -- -- m_privateData->setGeometry(m_privateData->m_geometry->getFactory()->createMultiPolygon(values)); -- break; -- } -- case geos::geom::GEOS_MULTIPOLYGON: -- { -- // intentionally left blank -- break; -- } -- default: -- { -- // might need an error at a later date -- ossimNotify(ossimNotifyLevel_WARN) -- << "ossimPolyArea2d::toMultiPolygon Geometry type can not be converted to a multi polygon: " <<m_privateData->m_geometry->getGeometryType()<< std::endl; -+ossimPolyArea2d &ossimPolyArea2d::toMultiPolygon() -+{ -+ int geomType = GEOSGeomTypeId(m_privateData->m_geometry); - -- break; -- } -- } -- } -- } -- catch(const std::exception& e) -- { -- ossimNotify(ossimNotifyLevel_WARN) -- << "ossimPolyArea2d::toMultiPolygon Caught exception: " << e.what() << std::endl; -- } -- catch(...) -+ if (geomType != GEOS_MULTIPOLYGON) - { -- ossimNotify(ossimNotifyLevel_WARN) -- << "ossimPolyArea2d::toMultiPolygon Caught exception!" << std::endl; -+ std::vector<GEOSGeometry *> geoms(1); -+ geoms[0] = GEOSGeom_clone(m_privateData->m_geometry); -+ GEOSGeometry *result = GEOSGeom_createCollection(GEOS_MULTIPOLYGON, -+ &geoms.front(), 1); -+ m_privateData->setGeometry(result); - } - - return *this; - } - --bool ossimPolyArea2d::saveState(ossimKeywordlist& kwl, -- const char* prefix)const -+std::string ossimPolyArea2d::toString() const -+{ -+ return m_privateData->toString(); -+} -+ -+bool ossimPolyArea2d::setFromWkt(const std::string &s) -+{ -+ return m_privateData->setFromWkt(s); -+} -+ -+bool ossimPolyArea2d::saveState(ossimKeywordlist &kwl, -+ const char *prefix) const - { - kwl.add(prefix, - ossimKeywordNames::TYPE_KW, - "ossimPolyArea2d", - true); - -- if(!isEmpty()) -+ if (!isEmpty()) - { -- geos::io::WKTWriter writer; - - kwl.add(prefix, - "wkt", -- writer.write(m_privateData->m_geometry).c_str(), -+ toString().c_str(), - true); - } -- // else -- // { -- // -- // } -- - return true; - } - --bool ossimPolyArea2d::loadState(const ossimKeywordlist& kwl, -- const char* prefix) -+bool ossimPolyArea2d::loadState(const ossimKeywordlist &kwl, -+ const char *prefix) - { -- if(m_privateData) -+ bool result = true; -+ -+ if (m_privateData) - { - ossimString wkt = kwl.find(prefix, "wkt"); - -- if(!wkt.empty()) -+ if (!wkt.empty()) - { -- geos::io::WKTReader reader(m_privateData->geomFactory()); -- try -- { -- m_privateData->setGeometry(reader.read(wkt.c_str())); -- } -- catch( const std::exception& e ) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::loadState Caught exception: " << e.what() << std::endl; -- this->clearPolygons(); -- } -- catch(...) -- { -- ossimNotify(ossimNotifyLevel_DEBUG) -- << "ossimPolyArea2d::loadState Caught exception!" << std::endl; -- this->clearPolygons(); -- } -+ result = setFromWkt(wkt.string()); - } - } -- return true; -+ -+ return result; -+} -+ -+std::ostream &operator<<(std::ostream &out, const ossimPolyArea2d &rhs) -+{ -+ if (!rhs.isEmpty()) -+ { -+ out << rhs.toString(); -+ } -+ -+ return out; - } -diff --git a/src/imaging/ossimImageGeometry.cpp b/src/imaging/ossimImageGeometry.cpp -index f7b054a8..148aeea4 100644 ---- a/src/imaging/ossimImageGeometry.cpp -+++ b/src/imaging/ossimImageGeometry.cpp -@@ -1240,7 +1240,7 @@ void ossimImageGeometry::calculatePolyBounds(ossimPolyArea2d& result, ossim_uint - } - result.add(ossimPolygon(gPoints)); - } -- if(!result.isValid()) result.setToBufferedShape(); -+ if(!result.isValid()) result.makeValid(); - } - - -diff --git a/src/init/ossimInit.cpp b/src/init/ossimInit.cpp -index 19b28113..9aeec9de 100644 ---- a/src/init/ossimInit.cpp -+++ b/src/init/ossimInit.cpp -@@ -65,12 +65,59 @@ - - #include <algorithm> - #include <mutex> -+#include <geos_c.h> - - using namespace std; - - static ossimTrace traceExec = ossimTrace("ossimInit:exec"); - static ossimTrace traceDebug = ossimTrace("ossimInit:debug"); - -+extern "C" -+{ -+ void geosNoticeFunction(const char *fmt, ...); -+ void geosErrorFunction(const char *fmt, ...); -+} -+ -+ossimString geosErrorV(const char *fmt, va_list args) -+{ -+ char temp[2024]; -+ if (fmt) -+ { -+ vsprintf(temp, fmt, args); -+ } -+ else -+ { -+ sprintf(temp, "%s", ""); -+ } -+ -+ return temp; -+} -+ -+void geosNoticeFunction(const char *fmt, ...) -+{ -+ // NOTE: This code has an infinite loop in it!!! (drb) -+ //std::lock_guard<std::mutex> lock(theMutex); -+ // theMutex.lock(); -+ va_list args; -+ -+ va_start(args, fmt); -+ ossimString result = geosErrorV(fmt, args); -+ va_end(args); -+ // theMutex.unlock(); -+ ossimNotify(ossimNotifyLevel_WARN) << result << "\n"; -+} -+ -+void geosErrorFunction(const char *fmt, ...) -+{ -+ va_list args; -+ -+ va_start(args, fmt); -+ ossimString result = geosErrorV(fmt, args); -+ va_end(args); -+ // theMutex.unlock(); -+ ossimNotify(ossimNotifyLevel_WARN) << result << "\n"; -+} -+ - ossimInit* ossimInit::theInstance = 0; - - ossimInit::~ossimInit() -@@ -122,6 +169,8 @@ void ossimInit::initialize(int& argc, char** argv) - { - static std::mutex m; - std::lock_guard<std::mutex> lock(m); -+ initGEOS(geosNoticeFunction, geosErrorFunction); -+ - if( !theInitializedFlag ) - { - ossimArgumentParser argumentParser(&argc, argv); -@@ -262,7 +311,7 @@ void ossimInit::initialize() - - void ossimInit::finalize() - { -- -+ finishGEOS(); - } - /*!**************************************************************************** - * Prints to stdout the list of command line options that this object parses. diff --git a/gis/ossim/ossim.SlackBuild b/gis/ossim/ossim.SlackBuild index 61475da33a..298be790bd 100644 --- a/gis/ossim/ossim.SlackBuild +++ b/gis/ossim/ossim.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for ossim -# Copyright 2018-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2018-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,11 +24,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=ossim -RELNAM=Neptune -VERSION=${VERSION:-2.10.0} +VERSION=${VERSION:-2.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -38,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -62,9 +71,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$RELNAM-$VERSION -tar xvf $CWD/$PRGNAM-$RELNAM-$VERSION.tar.gz -cd $PRGNAM-$RELNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -73,23 +82,20 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" CMakeLists.txt -patch -p1 < $CWD/c45639.patch -patch -p1 < $CWD/c0d975.patch -patch -p1 < $CWD/0498f7.patch mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_LIBRARY_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \ - -DINSTALL_ARCHIVE_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \ + -DINSTALL_LIBRARY_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DINSTALL_ARCHIVE_DIR=/usr/lib${LIBDIRSUFFIX} \ -DBUILD_OSSIM_TESTS=OFF \ -DBUILD_OSSIM_APPS=ON \ -DBUILD_OSSIM_FREETYPE_SUPPORT=ON \ -DBUILD_OSSIM_GUI=ON \ - -DBUILD_OSSIM_HDF5_SUPPORT=ON \ + -DBUILD_OSSIM_HDF5_SUPPORT=OFF \ -DBUILD_OSSIM_ID_SUPPORT=ON \ -DBUILD_OSSIM_PLANET=ON \ -DBUILD_OSSIM_WMS=ON \ @@ -113,4 +119,4 @@ mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/ossim/ossim.info b/gis/ossim/ossim.info index 76489c6579..1b6df8a8b5 100644 --- a/gis/ossim/ossim.info +++ b/gis/ossim/ossim.info @@ -1,8 +1,8 @@ PRGNAM="ossim" -VERSION="2.10.0" +VERSION="2.12.0" HOMEPAGE="https://trac.osgeo.org/ossim/" -DOWNLOAD="https://github.com/ossimlabs/ossim/archive/Neptune-2.10.0/ossim-Neptune-2.10.0.tar.gz" -MD5SUM="a78f148936ae35a32da5fdb15c1362f5" +DOWNLOAD="https://github.com/ossimlabs/ossim/archive/2.12.0/ossim-2.12.0.tar.gz" +MD5SUM="6b5930d3eca47555f4031480f8dc8847" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="geos jsoncpp libgeotiff" diff --git a/gis/pdal/README b/gis/pdal/README index 7f086c1e22..95f8695aa2 100644 --- a/gis/pdal/README +++ b/gis/pdal/README @@ -1,9 +1,40 @@ -PDAL is a BSD licensed library for translating and manipulating point cloud -data of various formats. It is a library that is analogous to the GDAL raster -library. PDAL is focussed on reading, writing, and translating point cloud data -from the ever-growing constellation of data formats that are being developed -for working with multi-dimensional emitted-pulse scanning systems. While PDAL -is not explicitly limited to working with LiDAR data formats, its initial +PDAL is a BSD licensed library for translating and manipulating +point cloud data of various formats. It is a library that is +analogous to the GDAL raster library. PDAL is focussed on reading, +writing, and translating point cloud data from the ever-growing +constellation of data formats that are being developed for working +with multi-dimensional emitted-pulse scanning systems. While PDAL is +not explicitly limited to working with LiDAR data formats, its initial rollout is focused in that area. -Optional dependencies: jsoncpp, laszip, hdf5, OpenSceneGraph. +PDAL includes several plugins needed for some extended features or to +write/read data in specific formats. The build of these plugins +requires optional dependencies included in Slackware 15.0 or available +as packages from Slackbuilds.org. Other plugins need third parts +dependencies that are not available here. + +If their dependencies (autodetected) are installed, the script enables +by default the build of the supported plugins. You can disable each of +them by passing to the slackwbuild its environment variable set as +"no" (for example E57=no ./pdal.SlackBuild). + +Plugins enabled by default if their dependencies are installed (see +README.SBo to know what feature they extend): + +- E57: requires xerces-c +- OSG: requires OpenSceneGraph +- DRACO: requires libdraco + +HDF, ICEBRIDGE do not require optional deps + +Other optional dependencies (autodetected) that improve the +functionality of PDAL are jsoncpp and laszip. The installation of +laszip is strongly recommended. + +PDAL can include also the Matlab plugin, that allows to write data to +a .mat file. Since the standard MATLAB is a proprietary software, the +build of this plugin is disabled by default. If you need this plugin +launch the script with MATLAB=yes ./pdal.SlackBuild + +Warning: the build of these plugin does not support free platforms +compatible or alternative to MATLAB, like Octave or Scilab. diff --git a/gis/pdal/README.SBo b/gis/pdal/README.SBo new file mode 100644 index 0000000000..b4680db5a2 --- /dev/null +++ b/gis/pdal/README.SBo @@ -0,0 +1,7 @@ +Features added by following plugins + +- E57: read and write data to and from e57 format +- HDF: read data in the HDF format +- ICEBRIDGE: read data in the Icebridge format +- OSG: read and write OpenSceneGraph objects +- DRACO: compress/decompress 3D meshes and point clouds diff --git a/gis/pdal/pdal.SlackBuild b/gis/pdal/pdal.SlackBuild index 3e2e4d3736..dfb181ed11 100644 --- a/gis/pdal/pdal.SlackBuild +++ b/gis/pdal/pdal.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for pdal -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +23,40 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pdal SRCNAM=PDAL -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +# ************************************************************************* + +# Build of these plugin is enabled by default since they require netcdf and hdf5 +BUILDICEBRIDGE="-DBUILD_PLUGIN_ICEBRIDGE=ON" ; \ + [ "${ICEBRIDGE:-yes}" = "no" ] && BUILDICEBRIDGE="" +BUILDHDF="-DBUILD_PLUGIN_HDF=ON" ; \ + [ "${HDF:-yes}" = "no" ] && BUILDHDF="" + +# Build of these is enabled by default if their additional optional deps are installed +if [ "${OSG:-yes}" = "yes" ]; then + BUILDOSG="" ; [ -x /usr/bin/osgversion ] && BUILDOSG="-DBUILD_PLUGIN_OPENSCENEGRAPH=ON" +fi +if [ "${E57:-yes}" = "yes" ]; then + BUILDE57="" ; [ -d /usr/include/xercesc ] && BUILDE57="-DBUILD_PLUGIN_E57=ON" +fi +if [ "${DRACO:-yes}" = "yes" ]; then + BUILDDRACO="" ; [ -x /usr/bin/draco_decoder-1.5.* ] && BUILDDRACO="-DBUILD_PLUGIN_DRACO=ON" +fi + +# ************************************************************************* + +# Users that have a standard installation of proprietary MatLAB would enable +# the build of Matlab plugin. This is disabled by default +BUILDMATLAB="" ; [ "${MATLAB:-no}" = "yes" ] && \ + BUILDMATLAB="-DBUILD_PLUGIN_MATLAB=ON" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +66,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -81,15 +115,30 @@ cd build -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ - -DBUILD_PLUGIN_SQLITE=ON \ - -DBUILD_PLUGIN_DELAUNAY=ON \ -DWITH_COMPLETION=ON \ + -DWITH_BACKTRACE=OFF \ + -DWITH_TESTS=FALSE \ + $BUILDICEBRIDGE \ + $BUILDE57 \ + $BUILDDRACO \ + $BUILDOSG \ + $BUILDHDF \ + $BUILDMATLAB \ .. + make make install DESTDIR=$PKG cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Remove empty directories and fix permissions (issues found by sbopkglint) +rmdir $PKG/usr/include/pdal/filters/private/csf +rmdir $PKG/usr/include/pdal/filters/private/miniball +chmod 644 $PKG/usr/include/pdal/*.hpp +chmod 644 $PKG/usr/include/pdal/*/*.hpp +chmod 644 $PKG/usr/include/pdal/*/*/*.hpp +chmod 644 $PKG/usr/include/pdal/*/*/*/*.hpp mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ @@ -101,4 +150,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/pdal/pdal.info b/gis/pdal/pdal.info index 7754f2a2a0..64b125f2de 100644 --- a/gis/pdal/pdal.info +++ b/gis/pdal/pdal.info @@ -1,10 +1,10 @@ PRGNAM="pdal" -VERSION="2.0.1" -HOMEPAGE="http://pointcloud.org" -DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.0.1/PDAL-2.0.1.tar.gz" -MD5SUM="787168236b556031e6eeed6ba4dc83a3" +VERSION="2.7.1" +HOMEPAGE="https://pdal.io" +DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.7.1/PDAL-2.7.1.tar.gz" +MD5SUM="a524026179dec11482d0f4670e0f68e0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal libgeotiff postgresql" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="gdal libgeotiff netcdf postgresql" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/pdal/slack-desc b/gis/pdal/slack-desc index 10cf3600ca..56c1cf23d8 100644 --- a/gis/pdal/slack-desc +++ b/gis/pdal/slack-desc @@ -11,7 +11,7 @@ pdal: pdal: PDAL is a BSD licensed library for translating and manipulating point pdal: cloud data of various formats. pdal: -pdal: Homepage: http://pointcloud.org +pdal: Homepage: https://pdal.io pdal: pdal: pdal: diff --git a/gis/pgrouting/README b/gis/pgrouting/README index 2c23f7965b..8fa6d63917 100644 --- a/gis/pgrouting/README +++ b/gis/pgrouting/README @@ -1,5 +1,5 @@ -pgRouting extends the PostGIS / PostgreSQL geospatial database to provide -geospatial routing functionality. +pgRouting extends the PostGIS / PostgreSQL geospatial database to +provide geospatial routing functionality. The following algorithms are compiled: * All Pairs Shortest Path, Johnson's Algorithm diff --git a/gis/pgrouting/pgrouting.SlackBuild b/gis/pgrouting/pgrouting.SlackBuild index fb107ea466..81c926b9fd 100644 --- a/gis/pgrouting/pgrouting.SlackBuild +++ b/gis/pgrouting/pgrouting.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for pgRouting -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2024 Giancarlo Dessi, Cagliari, IT +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,10 +25,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pgrouting -VERSION=${VERSION:-2.6.3} +VERSION=${VERSION:-3.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +41,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -71,6 +79,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Prevent cmake warnings in current +if [ -d /usr/share/cmake-3.28 ]; then + CMAKE_POLICY="-DCMAKE_POLICY_DEFAULT_CMP0148=OLD " + sed -i ./CMakeLists.txt -e "s/VERSION 3.2 FATAL_ERROR/VERSION 3.5 FATAL_ERROR/g" +else + CMAKE_POLICY="" +fi + mkdir -p build cd build cmake \ @@ -78,7 +94,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_DOC=${WITH_DOC:-OFF} \ - .. + $CMAKE_POLICY \ + -DCMAKE_BUILD_TYPE=Release .. make all doc make install DESTDIR=$PKG @@ -100,4 +117,4 @@ mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/pgrouting/pgrouting.info b/gis/pgrouting/pgrouting.info index 9c405c787a..90acfc5ecf 100644 --- a/gis/pgrouting/pgrouting.info +++ b/gis/pgrouting/pgrouting.info @@ -1,10 +1,10 @@ PRGNAM="pgrouting" -VERSION="2.6.3" +VERSION="3.6.2" HOMEPAGE="https://pgrouting.org" -DOWNLOAD="https://github.com/pgRouting/pgrouting/archive/v2.6.3/pgrouting-2.6.3.tar.gz" -MD5SUM="16f8537a553d2953ef50726764dd7d66" +DOWNLOAD="https://github.com/pgRouting/pgrouting/archive/v3.6.2/pgrouting-3.6.2.tar.gz" +MD5SUM="96336316353a7244976a97d59f4c9061" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="CGAL postgis" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="postgis" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/pgsql-ogr-fdw/README b/gis/pgsql-ogr-fdw/README index cf5eb43796..7230b2ae9b 100644 --- a/gis/pgsql-ogr-fdw/README +++ b/gis/pgsql-ogr-fdw/README @@ -1,2 +1,2 @@ -pgsql-ogr-fdw is a foreign data wrapper for OGR that allows arbitrary OGR -vector data stores to be accessed as PostgreSQL tables. +pgsql-ogr-fdw is a foreign data wrapper for OGR that allows arbitrary +OGR vector data stores to be accessed as PostgreSQL tables. diff --git a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild index dc552b593d..9ea5f30b04 100644 --- a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild +++ b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for pgsql-ogr-fdw -# Copyright 2015-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2015-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,10 +24,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pgsql-ogr-fdw -VERSION=${VERSION:-1.0.9} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -91,4 +101,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info index 3e3d41b8bb..d510b6662b 100644 --- a/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info +++ b/gis/pgsql-ogr-fdw/pgsql-ogr-fdw.info @@ -1,8 +1,8 @@ PRGNAM="pgsql-ogr-fdw" -VERSION="1.0.9" +VERSION="1.1.1" HOMEPAGE="https://github.com/pramsey/pgsql-ogr-fdw" -DOWNLOAD="https://github.com/pramsey/pgsql-ogr-fdw/archive/v1.0.9/pgsql-ogr-fdw-1.0.9.tar.gz" -MD5SUM="0f553c756153a46f13100b0aaec152cc" +DOWNLOAD="https://github.com/pramsey/pgsql-ogr-fdw/archive/v1.1.1/pgsql-ogr-fdw-1.1.1.tar.gz" +MD5SUM="6bf61db1b4f3a5e33c98cc6618c20bd6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="postgis" diff --git a/gis/pktools/README b/gis/pktools/README index 1aa9d4642f..ed86d16551 100644 --- a/gis/pktools/README +++ b/gis/pktools/README @@ -1,9 +1,6 @@ -pktools is a suite of utilities written in C++ for image processing with a -focus on remote sensing applications. It relies on the Geospatial Data -Abstraction Library and OGR. - -Optional dependencies +pktools is a suite of utilities written in C++ for image processing +with a focus on remote sensing applications. It relies on the +Geospatial Data Abstraction Library and OGR. If the fann SlackBuild is installed, support can be added by passing -FANN=ON. If the libLAS SlackBuild is installed, support can be added by -passing LIBLAS=ON. +FANN=ON. diff --git a/gis/pktools/pktools.SlackBuild b/gis/pktools/pktools.SlackBuild index ca31debb15..98edbb7593 100644 --- a/gis/pktools/pktools.SlackBuild +++ b/gis/pktools/pktools.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for pktools -# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,11 +24,14 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pktools SRCNAM=$(echo $PRGNAM | tr "[a-z]" "[A-Z]") VERSION=${VERSION:-2.6.7.6} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -73,7 +83,6 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; WITH_FANN=${FANN:-OFF} -WITH_LIBLAS=${LIBLAS:-OFF} mkdir -p build cd build @@ -85,7 +94,6 @@ cd build -DINSTALL_LIBRARY_DIR=lib${LIBDIRSUFFIX} \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_WITH_FANN=$WITH_FANN \ - -DBUILD_WITH_LIBLAS=$WITH_LIBLAS \ .. make @@ -109,4 +117,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/pointcloud/README b/gis/pointcloud/README index eef3cbf2a2..4790cf0e7a 100644 --- a/gis/pointcloud/README +++ b/gis/pointcloud/README @@ -1,6 +1,6 @@ -The PostgreSQL Pointcloud extension allows LiDAR point cloud data to be stored -in the database. +The PostgreSQL Pointcloud extension allows LiDAR point cloud data to +be stored in the database. The SlackBuild will install two PostgreSQL extensions: pointcloud and -pointcloud_postgis. To use the pointcloud_postgis extension, postgis must be -installed. +pointcloud_postgis. To use the pointcloud_postgis extension, postgis +must be installed. diff --git a/gis/pointcloud/pointcloud.SlackBuild b/gis/pointcloud/pointcloud.SlackBuild index f74b10186f..8735234308 100644 --- a/gis/pointcloud/pointcloud.SlackBuild +++ b/gis/pointcloud/pointcloud.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for pointcloud -# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pointcloud -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -92,4 +102,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/pointcloud/pointcloud.info b/gis/pointcloud/pointcloud.info index 9a495b8e7b..d0014093db 100644 --- a/gis/pointcloud/pointcloud.info +++ b/gis/pointcloud/pointcloud.info @@ -1,8 +1,8 @@ PRGNAM="pointcloud" -VERSION="1.2.0" -HOMEPAGE="https://github.com/pramsey/pointcloud" -DOWNLOAD="https://github.com/pramsey/pointcloud/archive/v1.2.0/pointcloud-1.2.0.tar.gz" -MD5SUM="ad7241cd53f69d8fd2b3850fba28c39e" +VERSION="1.2.1" +HOMEPAGE="https://pgpointcloud.github.io/pointcloud/" +DOWNLOAD="https://github.com/pgpointcloud/pointcloud/archive/v1.2.1/pointcloud-1.2.1.tar.gz" +MD5SUM="902e6028dbf12271e6d3909471065d9d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="postgresql" diff --git a/gis/polyline/README b/gis/polyline/README index ec484299f6..f8e3d139e4 100644 --- a/gis/polyline/README +++ b/gis/polyline/README @@ -1,2 +1,2 @@ -polyline is a Python implementation of Google's Encoded Polyline Algorithm -Format built with Python 2 and 3 support in mind. +polyline is a Python implementation of Google's Encoded Polyline +Algorithm Format built with Python 2 and 3 support in mind. diff --git a/gis/polyline/polyline.SlackBuild b/gis/polyline/polyline.SlackBuild index 5b2f18b774..36a28afa6f 100644 --- a/gis/polyline/polyline.SlackBuild +++ b/gis/polyline/polyline.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for polyline -# Copyright 2015-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2015-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=polyline VERSION=${VERSION:-1.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -69,7 +79,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -82,4 +91,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/polyline/polyline.info b/gis/polyline/polyline.info index df153f546a..52a27af76b 100644 --- a/gis/polyline/polyline.info +++ b/gis/polyline/polyline.info @@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/p/polyline/polyline-1.4 MD5SUM="b97c57378605c4a856c437569f95a0cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="six python3-six" +REQUIRES="" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/postgis/README b/gis/postgis/README index 67c3bac5b7..a493cb969d 100644 --- a/gis/postgis/README +++ b/gis/postgis/README @@ -1,12 +1,10 @@ -PostGIS adds support for geographic objects to the PostgreSQL object-relational -database. In effect, PostGIS "spatially enables" the PostgreSQL server, -allowing it to be used as a backend spatial database for geographic information -systems (GIS). +PostGIS adds support for geographic objects to the PostgreSQL +object-relational database. In effect, PostGIS "spatially enables" +the PostgreSQL server, allowing it to be used as a backend spatial +database for geographic information systems (GIS). SFCGAL is an optional dependency for advanced 3D support. -protobuf-c is an optional dependency for MapBox vector tile support. - To disable the GTK-based graphical interface for shp2pgsql, set GUI=no. To include the shp2pgsql plugin for pgAdmin set PGADMIN=yes. diff --git a/gis/opencpn/doinst.sh b/gis/postgis/doinst.sh index 3d2e9538d1..65c7e2eeb9 100644 --- a/gis/opencpn/doinst.sh +++ b/gis/postgis/doinst.sh @@ -2,7 +2,6 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi - if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 diff --git a/gis/postgis/postgis.SlackBuild b/gis/postgis/postgis.SlackBuild index df3507fea2..6c14107eda 100644 --- a/gis/postgis/postgis.SlackBuild +++ b/gis/postgis/postgis.SlackBuild @@ -1,9 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for PostGIS # Copyright 2009 Peter Sarkoci <sarkoci@math.sk> -# Maintained 2013-2019 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +24,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=postgis -VERSION=${VERSION:-3.0.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-3.4.2} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +40,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -76,15 +84,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +pgbindir=$(pg_config --bindir) + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --build=$ARCH \ --prefix=/usr \ + --bindir=$pgbindir \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --datarootdir=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --without-protobuf \ $SHP2PGSQL_GUI \ --build=$ARCH-slackware-linux @@ -99,7 +111,6 @@ if [ "$PGADMIN" = "yes" ] ; then fi mkdir -p $PKG/usr/bin -pgbindir=$(pg_config --bindir) cd $PKG/$pgbindir for f in *; do base=`basename $f` @@ -112,14 +123,19 @@ mkdir -p $PKG/usr/man/man1 cp -a doc/man/* $PKG/usr/man/man1 gzip -9 $PKG/usr/man/man1/*.1 +mv $PKG/usr/icons $PKG/usr/share +mv $PKG/usr/applications $PKG/usr/share + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING CREDITS ChangeLog NEWS README.postgis TODO \ + COPYING CREDITS ChangeLog NEWS README.postgis TODO LICENSE.TXT \ $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/doc/postgresql* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/postgis/postgis.info b/gis/postgis/postgis.info index d577e5e6a2..8651201812 100644 --- a/gis/postgis/postgis.info +++ b/gis/postgis/postgis.info @@ -1,10 +1,10 @@ PRGNAM="postgis" -VERSION="3.0.0" +VERSION="3.4.2" HOMEPAGE="http://postgis.org" -DOWNLOAD="http://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz" -MD5SUM="725019e3a67ac52ccef4d00031cb0c77" +DOWNLOAD="https://download.osgeo.org/postgis/source/postgis-3.4.2.tar.gz" +MD5SUM="632abda8b4267af437db6cde1bc9d9dc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gdal postgresql" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/proj-data/README b/gis/proj-data/README new file mode 100644 index 0000000000..4214b49d32 --- /dev/null +++ b/gis/proj-data/README @@ -0,0 +1,2 @@ +proj-data contains shift grids for horizontal and vertical coordinate +transformations for use with the proj package. diff --git a/gis/geoserver-javascript/geoserver-javascript.SlackBuild b/gis/proj-data/proj-data.SlackBuild index 2be6f6a44c..4179581b3c 100644 --- a/gis/geoserver-javascript/geoserver-javascript.SlackBuild +++ b/gis/proj-data/proj-data.SlackBuild @@ -1,9 +1,8 @@ -#!/bin/sh +#!/bin/bash -# SlackBuild script for geoserver-javascript - -# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# All rights reserved. +# Slackware build script for proj-data +# Copyright 2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2024 Gregory J. L. Tourte <artourter@gmail.com> # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -22,14 +21,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=geoserver-javascript -VERSION=${VERSION:-2.7} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=proj-data +VERSION=${VERSION:-1.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} - +PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -38,27 +46,17 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -mkdir $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/geoserver-$VERSION-SNAPSHOT-javascript-plugin.zip - -# remove SNAPSHOT versions of .jar files duplicated in dependencies -rm gt-geojson-13-SNAPSHOT.jar -rm gt-process-13-SNAPSHOT.jar -rm gt-process-feature-13-SNAPSHOT.jar -rm gt-process-geometry-13-SNAPSHOT.jar -rm gt-process-raster-13-SNAPSHOT.jar -mkdir -p $PKG/usr/share/geoserver/WEB-INF/lib -cp -a *.jar $PKG/usr/share/geoserver/WEB-INF/lib +mkdir -p $PKG/usr/share/proj +tar -C $PKG/usr/share/proj -x -v -f $CWD/$PRGNAM-$VERSION.tar.gz +chown -R root:root $PKG/usr/share/proj mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/proj/README.DATA $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir $PKG/install +mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/proj-data/proj-data.info b/gis/proj-data/proj-data.info new file mode 100644 index 0000000000..63d3a7c4e8 --- /dev/null +++ b/gis/proj-data/proj-data.info @@ -0,0 +1,10 @@ +PRGNAM="proj-data" +VERSION="1.17" +HOMEPAGE="https://www.osgeo.org/projects/proj/" +DOWNLOAD="https://github.com/OSGeo/PROJ-data/releases/download/1.17.0/proj-data-1.17.tar.gz" +MD5SUM="d68d676603d84ac332427a39ca9d6a0e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="proj" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/geogig-py/slack-desc b/gis/proj-data/slack-desc index fd147070cb..c62281090f 100644 --- a/gis/geogig-py/slack-desc +++ b/gis/proj-data/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -geogig-py: geogig-py (Python library for GeoGig) -geogig-py: -geogig-py: geogig-py is a Python library to use GeoGig designed to provide access -geogig-py: to all GeoGig functionality, so it can be used to script tasks or as -geogig-py: the base library for a GeoGig client. -geogig-py: -geogig-py: -geogig-py: -geogig-py: -geogig-py: -geogig-py: +proj-data: proj-data (proj datum grids) +proj-data: +proj-data: proj-data contains shift grids for horizontal and vertical +proj-data: coordinate transformations for use with the proj package. +proj-data: +proj-data: +proj-data: +proj-data: +proj-data: +proj-data: +proj-data: diff --git a/gis/proj/README b/gis/proj/README index 7af2be3c54..7ea5f0548d 100644 --- a/gis/proj/README +++ b/gis/proj/README @@ -1,6 +1,10 @@ -PROJ is a generic coordinate transformation software, that transforms +proj is a generic coordinate transformation software, that transforms coordinates from one coordinate reference system (CRS) to another. This includes cartographic projections as well as geodetic transformations. -This SlackBuild also includes the datum grid files for PROJ (excluding the -regional resource packages). +For datum grids, install the proj-data package. Without this package, +proj can fetch required grids from the internet as needed. + +By default, the script does not build nor run the tests. You can use the +option TESTBUILD=YES to build and run the tests before the make install +part. diff --git a/gis/proj/proj.SlackBuild b/gis/proj/proj.SlackBuild index 0187f8bc50..8baaa49113 100644 --- a/gis/proj/proj.SlackBuild +++ b/gis/proj/proj.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for proj -# Written by Kyle Guinn <elyk03@gmail.com> -# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Originally written by Kyle Guinn <elyk03@gmail.com> +# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2024 Gregory J. L. Tourte <artourter@gmail.com> # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -21,11 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=proj -VERSION=${VERSION:-6.3.0} -DGVERSION=${DGVERSION:-1.8} +VERSION=${VERSION:-9.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -56,6 +66,11 @@ fi set -e +TESTBUILDFLAGS='' +if [[ ${TESTBUILD:='NO'} == 'NO' ]]; then + TESTBUILDFLAGS='-DBUILD_TESTING=OFF' +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -64,37 +79,31 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -unzip -n -d $PKG/usr/share/$PRGNAM $CWD/$PRGNAM-datumgrid-$DGVERSION.zip -chmod o+rX $PKG/usr/share/$PRGNAM/* +mkdir -p build +( cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=man \ + -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \ + -DCMAKE_BUILD_TYPE=Release \ + $TESTBUILDFLAGS \ + .. + make + [[ $TESTBUILD == "YES" ]] && make test + make install/strip DESTDIR=$PKG +) find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + AUTHORS CITATION COPYING ChangeLog NEWS README README.md\ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -102,4 +111,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/proj/proj.info b/gis/proj/proj.info index 37ee024f8a..e416208b14 100644 --- a/gis/proj/proj.info +++ b/gis/proj/proj.info @@ -1,12 +1,10 @@ PRGNAM="proj" -VERSION="6.3.0" -HOMEPAGE="http://trac.osgeo.org/proj/" -DOWNLOAD="http://download.osgeo.org/proj/proj-6.3.0.tar.gz \ - http://download.osgeo.org/proj/proj-datumgrid-1.8.zip" -MD5SUM="09243feb4f243a2bdd455035a2007384 \ - a64b68863336f361065c7051acc5a991" +VERSION="9.4.0" +HOMEPAGE="https://www.osgeo.org/projects/proj/" +DOWNLOAD="https://github.com/OSGeo/PROJ/releases/download/9.4.0/proj-9.4.0.tar.gz" +MD5SUM="c33fd24cf4e3a3048c330b1b07e86b4f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/pyproj/README b/gis/pyproj/README deleted file mode 100644 index b86dd367a6..0000000000 --- a/gis/pyproj/README +++ /dev/null @@ -1,16 +0,0 @@ -Performs cartographic transformations and geodetic computations. - -The Proj class can convert from geographic (longitude,latitude) to native map -projection (x,y) coordinates and vice versa, or from one map projection -coordinate system directly to another. - -The Geod class can perform forward and inverse geodetic, or Great Circle, -computations. The forward computation involves determining latitude, longitude -and back azimuth of a terminus point given the latitude and longitude of an -initial point, plus azimuth and distance. The inverse computation involves -determining the forward and back azimuths and distance given the latitudes and -longitudes of an initial and terminus point. - -Input coordinates can be given as python arrays, lists/tuples, scalars or -numpy/Numeric/numarray arrays. Optimized for objects that support the Python -buffer protocol (regular python and numpy array objects). diff --git a/gis/pyproj/pyproj.info b/gis/pyproj/pyproj.info deleted file mode 100644 index 750f299774..0000000000 --- a/gis/pyproj/pyproj.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pyproj" -VERSION="2.4.2" -HOMEPAGE="https://github.com/jswhit/pyproj" -DOWNLOAD="https://github.com/jswhit/pyproj/archive/v2.4.2rel/pyproj-2.4.2rel.tar.gz" -MD5SUM="39517c7bb7c505a69fe0cc30b0dc9445" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="proj python3-Cython" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/pyshp/README b/gis/pyshp/README deleted file mode 100644 index 47bdcfc2cc..0000000000 --- a/gis/pyshp/README +++ /dev/null @@ -1,4 +0,0 @@ -The pyshp library reads and writes ESRI Shapefiles in pure Python. You can read -and write shp, shx, and dbf files with all types of geometry. Everything in the -public ESRI shapefile specification is implemented. This library is compatible -with Python versions 2.4 to 3.x. diff --git a/gis/pyshp/pyshp.info b/gis/pyshp/pyshp.info deleted file mode 100644 index 80feb41b48..0000000000 --- a/gis/pyshp/pyshp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pyshp" -VERSION="2.1.0" -HOMEPAGE="https://github.com/GeospatialPython/pyshp" -DOWNLOAD="https://github.com/GeospatialPython/pyshp/archive/2.1.0/pyshp-2.1.0.tar.gz" -MD5SUM="c4ecdcaf6d4b50377821419cbe331687" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/pyshp/slack-desc b/gis/pyshp/slack-desc deleted file mode 100644 index a3ac9c6b9e..0000000000 --- a/gis/pyshp/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pyshp: pyshp (Python shapefile manipulation library) -pyshp: -pyshp: This library reads and writes ESRI Shapefiles in pure Python. You can -pyshp: read and write shp, shx, and dbf files with all types of geometry. -pyshp: Everything in the public ESRI shapefile specification is implemented. -pyshp: This library is compatible with Python versions 2.4 to 3.x. -pyshp: -pyshp: -pyshp: -pyshp: -pyshp: diff --git a/gis/python-mapnik/python-mapnik.SlackBuild b/gis/python-mapnik/python-mapnik.SlackBuild index 8191c5a01e..2110a030cf 100644 --- a/gis/python-mapnik/python-mapnik.SlackBuild +++ b/gis/python-mapnik/python-mapnik.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # SlackBuild for python-mapnik # @@ -21,10 +21,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220312 bkw: Modified by SlackBuilds.org: VERSION must be constant, +# and match VERSION in the .info file. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=python-mapnik -VERSION=${VERSION:-3.0.16} +GITREV=${GITREV:-7da019cf9eb12af8f8aa88b7d75789dfcd1e901b} +VERSION=${VERSION:-git7da019c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -34,7 +41,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -58,9 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$GITREV +tar xvf $CWD/$PRGNAM-$GITREV.tar.gz +cd $PRGNAM-$GITREV chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,8 +79,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python2 setup.py install --root=$PKG -#python3 setup.py install --root=$PKG # only works on -current, where boost has libboost_python3x.so +BOOST_PYTHON_LIB="boost_python$(python -c 'import sys; print("{}{}".format(sys.version_info.major, sys.version_info.minor))')" +export BOOST_PYTHON_LIB +export BOOST_THREAD_LIB="boost_thread" +export BOOST_SYSTEM_LIB="boost_system" +python setup.py install --root=$PKG + +BOOST_PYTHON_LIB="boost_python$(python3 -c 'import sys; print("{}{}".format(sys.version_info.major, sys.version_info.minor))')" +export BOOST_PYTHON_LIB +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -84,4 +102,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python-mapnik/python-mapnik.info b/gis/python-mapnik/python-mapnik.info index 17dffb195e..24c2ce6bae 100644 --- a/gis/python-mapnik/python-mapnik.info +++ b/gis/python-mapnik/python-mapnik.info @@ -1,8 +1,8 @@ PRGNAM="python-mapnik" -VERSION="3.0.16" +VERSION="git7da019c" HOMEPAGE="https://mapnik.org" -DOWNLOAD="https://github.com/mapnik/python-mapnik/archive/v3.0.16/python-mapnik-3.0.16.tar.gz" -MD5SUM="1a23274f810812791af163d3806792a2" +DOWNLOAD="https://github.com/mapnik/python-mapnik/archive/7da019cf9eb12af8f8aa88b7d75789dfcd1e901b/python-mapnik-7da019cf9eb12af8f8aa88b7d75789dfcd1e901b.tar.gz" +MD5SUM="88fa158fec168c4a54f5b1010849af85" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mapnik" diff --git a/gis/python-pygeos/README b/gis/python-pygeos/README index b53462215d..72b58085fc 100644 --- a/gis/python-pygeos/README +++ b/gis/python-pygeos/README @@ -1,4 +1,4 @@ -PyGEOS is a C/Python library with vectorized geometry functions. The geometry -operations are done in the open-source geometry library GEOS. PyGEOS wraps -these operations in NumPy ufuncs providing a performance improvement when -operating on arrays of geometries. +PyGEOS is a C/Python library with vectorized geometry functions. The +geometry operations are done in the open-source geometry library +GEOS. PyGEOS wraps these operations in NumPy ufuncs providing a +performance improvement when operating on arrays of geometries. diff --git a/gis/python-pygeos/python-pygeos.SlackBuild b/gis/python-pygeos/python-pygeos.SlackBuild index 1e3a0d4db8..03323d75e4 100644 --- a/gis/python-pygeos/python-pygeos.SlackBuild +++ b/gis/python-pygeos/python-pygeos.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for python-pygeos -# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2023 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=python-pygeos -VERSION=${VERSION:-0.5} +VERSION=${VERSION:-0.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} SRCNAM=pygeos @@ -37,7 +41,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -86,4 +97,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python-pygeos/python-pygeos.info b/gis/python-pygeos/python-pygeos.info index 04fabb6247..6a5191b9e7 100644 --- a/gis/python-pygeos/python-pygeos.info +++ b/gis/python-pygeos/python-pygeos.info @@ -1,10 +1,10 @@ PRGNAM="python-pygeos" -VERSION="0.5" +VERSION="0.14" HOMEPAGE="https://pygeos.readthedocs.io" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pygeos/pygeos-0.5.tar.gz" -MD5SUM="f08653606a94b0dea17b7b253bc2f454" +DOWNLOAD="https://pypi.python.org/packages/source/p/pygeos/pygeos-0.14.tar.gz" +MD5SUM="85450969759e2a9601fe18bf82fddcee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="geos numpy3" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="geos python3-numpy" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/python3-basemap/python3-basemap.SlackBuild b/gis/python3-basemap/python3-basemap.SlackBuild index 084a3e4703..565e20285b 100644 --- a/gis/python3-basemap/python3-basemap.SlackBuild +++ b/gis/python3-basemap/python3-basemap.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for python3-basemap @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=python3-basemap SRCNAM=basemap -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -60,9 +70,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-${VERSION}rel -tar xvf $CWD/$SRCNAM-${VERSION}rel.tar.gz -cd $SRCNAM-${VERSION}rel +rm -rf $SRCNAM-${VERSION} +tar xvf $CWD/$SRCNAM-${VERSION}.tar.gz +cd $SRCNAM-${VERSION} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -70,17 +80,30 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +cd packages/${SRCNAM} +# regenerate cythonized sources +# thanks arch linux maintainers +cythonize --force src/_geoslib.pyx +python3 setup.py install --root=$PKG +cd ${TMP}/${SRCNAM}-${VERSION} + +cd packages/${SRCNAM}_data +python3 setup.py install --root=$PKG +cd ${TMP}/${SRCNAM}-${VERSION} + +cd packages/${SRCNAM}_data_hires python3 setup.py install --root=$PKG +cd ${TMP}/${SRCNAM}-${VERSION} find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE* README.md Changelog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md CHANGELOG.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-basemap/python3-basemap.info b/gis/python3-basemap/python3-basemap.info index 256c6f70f8..1d1be2c8d0 100644 --- a/gis/python3-basemap/python3-basemap.info +++ b/gis/python3-basemap/python3-basemap.info @@ -1,10 +1,10 @@ PRGNAM="python3-basemap" -VERSION="1.2.1" +VERSION="1.4.1" HOMEPAGE="https://github.com/matplotlib/basemap" -DOWNLOAD="https://github.com/matplotlib/basemap/archive/v1.2.1rel/basemap-1.2.1rel.tar.gz" -MD5SUM="b3c4c1292b36abac27050eb67ada914e" +DOWNLOAD="https://github.com/matplotlib/basemap/archive/v1.4.1/basemap-1.4.1.tar.gz" +MD5SUM="e286126fda9c545b5420f29f404b9c6c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="geos pyproj pyshp python3-matplotlib" +REQUIRES="geos python3-pyproj python3-pyshp python3-matplotlib" MAINTAINER="Cristiano Urban" EMAIL="cristiano.urban.slack@gmail.com" diff --git a/gis/cartopy/README b/gis/python3-cartopy/README index 3e1086f905..584d84e8e6 100644 --- a/gis/cartopy/README +++ b/gis/python3-cartopy/README @@ -1,11 +1,11 @@ -Cartopy is a Python package designed to make drawing maps for data analysis an -visualisation as easy as possible. +Cartopy is a Python package designed to make drawing maps for data +analysis an visualisation as easy as possible. Some of the key features of cartopy are: * object oriented projection definitions * point, line, polygon and image transformations between projections -* integration to expose advanced mapping in matplotlib with a simple and - intuitive interface -* powerful vector data handling by integrating shapefile reading with Shapely - capabilities +* integration to expose advanced mapping in matplotlib with a simple + and intuitive interface +* powerful vector data handling by integrating shapefile reading with + shapely capabilities diff --git a/gis/cartopy/cartopy.SlackBuild b/gis/python3-cartopy/python3-cartopy.SlackBuild index c5ff17247c..42993d5796 100644 --- a/gis/cartopy/cartopy.SlackBuild +++ b/gis/python3-cartopy/python3-cartopy.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for cartopy +# Slackware build script for python3-cartopy -# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2023 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=cartopy -VERSION=${VERSION:-0.17.0} -BUILD=${BUILD:-3} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-cartopy +VERSION=${VERSION:-0.22.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=Cartopy if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -59,27 +72,32 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -o \! -perm 755 -o -exec chmod 755 {} + -o \ + \! -perm /111 -o \! -perm 644 -o -exec chmod 644 {} + + +# Fixing numpy dependency check in pyproject.toml: +# oldest-supported-numpy has a strict check and doesn't support newer version +# so we replace it. The alternative is to add --skip-dependency-check to tbe +# build line but this is not deemed optimal. +sed -i 's/oldest-supported-numpy/numpy>=1.19.3/' pyproject.toml + +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages/ -CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \ - python2 setup.py install --root=$PKG -CFLAGS="$SLKCFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \ - python3 setup.py install --root=$PKG +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGES CONTRIBUTING.md COPYING COPYING.LESSER README.md \ + CHANGES COPYING COPYING.LESSER README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -87,4 +105,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-cartopy/python3-cartopy.info b/gis/python3-cartopy/python3-cartopy.info new file mode 100644 index 0000000000..19dbf3eaed --- /dev/null +++ b/gis/python3-cartopy/python3-cartopy.info @@ -0,0 +1,10 @@ +PRGNAM="python3-cartopy" +VERSION="0.22.0" +HOMEPAGE="https://scitools.org.uk/cartopy/" +DOWNLOAD="https://files.pythonhosted.org/packages/source/C/Cartopy/Cartopy-0.22.0.tar.gz" +MD5SUM="1a96bec92d02a0f9c95fa6364cb0767d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="gdal python3-matplotlib python3-pyproj python3-pyshp python3-scipy python3-shapely python3-setuptools-scm-opt" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/python3-cartopy/slack-desc b/gis/python3-cartopy/slack-desc new file mode 100644 index 0000000000..467935f9bc --- /dev/null +++ b/gis/python3-cartopy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-cartopy: python3-cartopy (cartographic tools for Python) +python3-cartopy: +python3-cartopy: Cartopy is a Python package designed to make drawing maps for data +python3-cartopy: analysis and visualisation as easy as possible. +python3-cartopy: +python3-cartopy: +python3-cartopy: +python3-cartopy: +python3-cartopy: +python3-cartopy: +python3-cartopy: diff --git a/gis/python3-cftime/README b/gis/python3-cftime/README new file mode 100644 index 0000000000..80a804fee4 --- /dev/null +++ b/gis/python3-cftime/README @@ -0,0 +1,4 @@ +python3-cftime + +Python library for decoding time units and variable values in a netCDF +file conforming to the Climate and Forecasting (CF) netCDF conventions. diff --git a/gis/basemap/basemap.SlackBuild b/gis/python3-cftime/python3-cftime.SlackBuild index b61a4f4cc1..91ccad5961 100644 --- a/gis/basemap/basemap.SlackBuild +++ b/gis/python3-cftime/python3-cftime.SlackBuild @@ -1,9 +1,8 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for basemap +# Slackware build script for python3-cftime -# Originally written by Dimitris Zlatanidis <d.zlatanidis@gmail.com> -# Copyright (c) 2019 Cristiano Urban, Gonars, Italy +# Copyright 2022-2023 - Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +22,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=basemap -VERSION=${VERSION:-1.2.1} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-cftime +VERSION=${VERSION:-1.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=cftime +SRCVER=${VERSION}rel if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,51 +41,44 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-${VERSION}rel -tar xvf $CWD/$PRGNAM-${VERSION}rel.tar.gz -cd $PRGNAM-${VERSION}rel +rm -rf $SRCNAM-$SRCVER +tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz +cd $SRCNAM-$SRCVER chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +sed -i 's/oldest-supported-numpy/numpy>=1.19.3/' pyproject.toml -python setup.py install --root=$PKG +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE* README.md Changelog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + Changelog LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-cftime/python3-cftime.info b/gis/python3-cftime/python3-cftime.info new file mode 100644 index 0000000000..6f074ce474 --- /dev/null +++ b/gis/python3-cftime/python3-cftime.info @@ -0,0 +1,10 @@ +PRGNAM="python3-cftime" +VERSION="1.6.3" +HOMEPAGE="https://unidata.github.io/cftime/" +DOWNLOAD="https://github.com/Unidata/cftime/archive/v1.6.3rel/cftime-1.6.3rel.tar.gz" +MD5SUM="2e77ad0b187fbdcd48fd1f39eecfa04a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3-numpy" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/spatialite_gui/slack-desc b/gis/python3-cftime/slack-desc index 5c1f13c491..993e08f765 100644 --- a/gis/spatialite_gui/slack-desc +++ b/gis/python3-cftime/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -spatialite_gui: spatialite_gui (GUI for SpatiaLite) -spatialite_gui: -spatialite_gui: spatialite-gui is an open source Graphical User Interface (GUI) tool -spatialite_gui: supporting SpatiaLite -spatialite_gui: -spatialite_gui: Project home: https://www.gaia-gis.it/fossil/libgaiagraphics/index -spatialite_gui: -spatialite_gui: -spatialite_gui: -spatialite_gui: -spatialite_gui: +python3-cftime: python3-cftime (Time-handling functionality from netcdf4) +python3-cftime: +python3-cftime: Python library for decoding time units and variable values in a netCDF +python3-cftime: file conforming to the Climate and Forecasting (CF) netCDF +python3-cftime: conventions. +python3-cftime: +python3-cftime: +python3-cftime: +python3-cftime: +python3-cftime: +python3-cftime: diff --git a/gis/python3-netcdf4-python/README b/gis/python3-netcdf4-python/README new file mode 100644 index 0000000000..1905489969 --- /dev/null +++ b/gis/python3-netcdf4-python/README @@ -0,0 +1,17 @@ +python3-netcdf4 is a Python3 interface to the netCDF C library. + +netCDF version 4 has many features not found in earlier versions of the +library and is implemented on top of HDF5. This module can read and +write files in both the new netCDF 4 and the old netCDF 3 format, and +can create files that are readable by HDF5 clients. The API modelled +after Scientific.IO.NetCDF, and should be familiar to users of that +module. + +Most new features of netCDF 4 are implemented, such as multiple +unlimited dimensions, groups and data compression. All the new numeric +data types (such as 64 bit and unsigned integer types) are implemented. +Compound (struct), variable length (vlen) and enumerated (enum) data +types are supported, but not the opaque data type. Mixtures of compound, +vlen and enum data types (such as compound types containing enums, or +vlens containing compound types) are not supported. + diff --git a/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild b/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild new file mode 100644 index 0000000000..1e9dffc224 --- /dev/null +++ b/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/bash + +# Slackware build script for python3-netcdf4-python + +# Copyright 2022-2023 - Gregory J. L. Tourte <artourter@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-netcdf4-python +VERSION=${VERSION:-1.6.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=netcdf4-python +SRCVER=${VERSION}rel + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$SRCVER +tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz +cd $SRCNAM-$SRCVER +chown -R root:root . +find -L . \ + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +# Fixing numpy dependency check in pyproject.toml: +# oldest-supported-numpy has a strict check and doesn't support newer version +# so we replace it. The alternative is to add --skip-dependency-check to tbe +# build line but this is not deemed optimal. +sed -i 's/oldest-supported-numpy/numpy>=1.19.3/' pyproject.toml + +# Requires newer version of setuptools than available in -stable. Has not +# effect on -current +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/man/man1/ +for manfile in man/*.1; do + gzip -c $manfile > $PKG/usr/man/man1/$(basename $manfile).gz +done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + Changelog LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-netcdf4-python/python3-netcdf4-python.info b/gis/python3-netcdf4-python/python3-netcdf4-python.info new file mode 100644 index 0000000000..7cf893659f --- /dev/null +++ b/gis/python3-netcdf4-python/python3-netcdf4-python.info @@ -0,0 +1,10 @@ +PRGNAM="python3-netcdf4-python" +VERSION="1.6.5" +HOMEPAGE="http://unidata.github.io/netcdf4-python/" +DOWNLOAD="https://github.com/Unidata/netcdf4-python/archive/v1.6.5rel/netcdf4-python-1.6.5rel.tar.gz" +MD5SUM="c3ebdf74ae184f2bd9ecbbc3f16801fe" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="netcdf python3-cftime python3-setuptools-opt" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/python3-netcdf4-python/slack-desc b/gis/python3-netcdf4-python/slack-desc new file mode 100644 index 0000000000..44d3f0c1dd --- /dev/null +++ b/gis/python3-netcdf4-python/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-netcdf4-python: python3-netcdf4-python (Python3 interface for netCDF) +python3-netcdf4-python: +python3-netcdf4-python: netcdf4-python is a Python/numpy interface to the netCDF C library. +python3-netcdf4-python: +python3-netcdf4-python: netCDF version 4 has many features not found in earlier versions of +python3-netcdf4-python: the library and is implemented on top of HDF5. This module can read +python3-netcdf4-python: and write files in both the new netCDF 4 and the old netCDF 3 format, +python3-netcdf4-python: and can create files that are readable by HDF5 clients. The API +python3-netcdf4-python: modelled after Scientific.IO.NetCDF, and should be familiar to users +python3-netcdf4-python: of that module. +python3-netcdf4-python: diff --git a/gis/python3-pyproj/README b/gis/python3-pyproj/README new file mode 100644 index 0000000000..e9c818dd27 --- /dev/null +++ b/gis/python3-pyproj/README @@ -0,0 +1,17 @@ +Performs cartographic transformations and geodetic computations. + +The Proj class can convert from geographic (longitude,latitude) to +native map projection (x,y) coordinates and vice versa, or from one +map projection coordinate system directly to another. + +The Geod class can perform forward and inverse geodetic, or Great +Circle, computations. The forward computation involves determining +latitude, longitude and back azimuth of a terminus point given +the latitude and longitude of an initial point, plus azimuth and +distance. The inverse computation involves determining the forward and +back azimuths and distance given the latitudes and longitudes of an +initial and terminus point. + +Input coordinates can be given as python arrays, lists/tuples, scalars +or numpy/Numeric/numarray arrays. Optimized for objects that support +the Python buffer protocol (regular python and numpy array objects). diff --git a/gis/pyproj/pyproj.SlackBuild b/gis/python3-pyproj/python3-pyproj.SlackBuild index bc6ef9f0ab..55256a46f3 100644 --- a/gis/pyproj/pyproj.SlackBuild +++ b/gis/python3-pyproj/python3-pyproj.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for pyproj -# Copyright 2013-2019 Benjamin Trigona-Harany +# Copyright 2013-2021 Benjamin Trigona-Harany +# Copyright 2021-2023 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pyproj -VERSION=${VERSION:-2.4.2} -BUILD=${BUILD:-2} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-pyproj +VERSION=${VERSION:-3.6.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=pyproj if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -59,9 +72,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-${VERSION}rel -tar xvf $CWD/$PRGNAM-${VERSION}rel.tar.gz -cd $PRGNAM-${VERSION}rel +rm -rf $SRCNAM-${VERSION} +tar xvf $CWD/$SRCNAM-${VERSION}.tar.gz +cd $SRCNAM-${VERSION} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,7 +82,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -84,4 +101,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-pyproj/python3-pyproj.info b/gis/python3-pyproj/python3-pyproj.info new file mode 100644 index 0000000000..f093177f12 --- /dev/null +++ b/gis/python3-pyproj/python3-pyproj.info @@ -0,0 +1,10 @@ +PRGNAM="python3-pyproj" +VERSION="3.6.0" +HOMEPAGE="https://github.com/pyproj4/pyproj" +DOWNLOAD="https://github.com/pyproj4/pyproj/archive/3.6.0/pyproj-3.6.0.tar.gz" +MD5SUM="dd28c4d2b030431ebde1c96b118f55cd" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="proj python3-setuptools-opt" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/python3-pyproj/slack-desc b/gis/python3-pyproj/slack-desc new file mode 100644 index 0000000000..c0e5d2594e --- /dev/null +++ b/gis/python3-pyproj/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-pyproj: python3-pyproj (Python interface to the PROJ.4 library) +python3-pyproj: +python3-pyproj: pyproj can convert from geographic (longitude,latitude) to native +python3-pyproj: map projection (x,y) coordinates and vice versa, or from one map +python3-pyproj: projection coordinate system directly to another. +python3-pyproj: +python3-pyproj: Homepage: http://code.google.com/p/pyproj/ +python3-pyproj: +python3-pyproj: +python3-pyproj: +python3-pyproj: diff --git a/gis/python3-pyshp/README b/gis/python3-pyshp/README new file mode 100644 index 0000000000..84ca915686 --- /dev/null +++ b/gis/python3-pyshp/README @@ -0,0 +1,18 @@ +The Python Shapefile Library (PyShp) provides read and write support for +the Esri Shapefile format. The Shapefile format is a popular Geographic +Information System vector data format created by Esri. For more +information about this format please read the well-written "ESRI +Shapefile Technical Description - July 1998" located at +http://www.esri.com/library/whitepapers/p dfs/shapefile.pdf . The Esri +document describes the shp and shx file formats. However a third file +format called dbf is also required. This format is documented on the web +as the "XBase File Format Description" and is a simple file-based +database format created in the 1960's. + +Both the Esri and XBase file-formats are very simple in design and +memory efficient which is part of the reason the shapefile format +remains popular despite the numerous ways to store and exchange GIS data +available today. + +Pyshp is compatible with Python 2.7-3.x, however this script only build +the python3 version. diff --git a/gis/Shapely/Shapely.SlackBuild b/gis/python3-pyshp/python3-pyshp.SlackBuild index 5af6caefb4..5878759999 100644 --- a/gis/Shapely/Shapely.SlackBuild +++ b/gis/python3-pyshp/python3-pyshp.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for Shapely +# Slackware build script for pyshp -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2022 Gregory J. L. Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=Shapely -VERSION=${VERSION:-1.6.4} -BUILD=${BUILD:-2} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-pyshp +VERSION=${VERSION:-2.3.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=pyshp if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -59,9 +72,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,10 +82,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# remove unnecessary .pxi file -sed -i "s/data_files\s*=.*/data_files = [],/g" setup.py - -python2 setup.py install --root=$PKG python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -80,7 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGES.txt CREDITS.txt LICENSE.txt README.rst \ + changelog.txt README.md LICENSE.TXT \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -88,4 +97,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-pyshp/python3-pyshp.info b/gis/python3-pyshp/python3-pyshp.info new file mode 100644 index 0000000000..d97d86d34b --- /dev/null +++ b/gis/python3-pyshp/python3-pyshp.info @@ -0,0 +1,10 @@ +PRGNAM="python3-pyshp" +VERSION="2.3.1" +HOMEPAGE="https://github.com/GeospatialPython/pyshp" +DOWNLOAD="https://github.com/GeospatialPython/pyshp/archive/2.3.1/pyshp-2.3.1.tar.gz" +MD5SUM="975ccc60d663b3e6f55b583acf18f05a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/python3-pyshp/slack-desc b/gis/python3-pyshp/slack-desc new file mode 100644 index 0000000000..20a9fad16d --- /dev/null +++ b/gis/python3-pyshp/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-pyshp: python3-pyshp (Python shapefile manipulation library) +python3-pyshp: +python3-pyshp: This library reads and writes Esri Shapefiles in pure Python. You can +python3-pyshp: read and write shp, shx, and dbf files with all types of geometry. +python3-pyshp: Everything in the public Esri shapefile specification is implemented. +python3-pyshp: +python3-pyshp: This library is compatible with Python versions 2.7 to 3.x, but this +python3-pyshp: package only contains the python3 version. +python3-pyshp: +python3-pyshp: +python3-pyshp: diff --git a/gis/Shapely/README b/gis/python3-shapely/README index 99de18871f..99de18871f 100644 --- a/gis/Shapely/README +++ b/gis/python3-shapely/README diff --git a/gis/python3-shapely/python3-shapely.SlackBuild b/gis/python3-shapely/python3-shapely.SlackBuild new file mode 100644 index 0000000000..12a2c42b8b --- /dev/null +++ b/gis/python3-shapely/python3-shapely.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/bash + +# Slackware build script for Shapely + +# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2021-2024 Gregory J. L. Tourte <artourter@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-shapely +VERSION=${VERSION:-2.0.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=shapely + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + 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 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . \ + -perm /111 -o \! -perm 755 -o -exec chmod 755 {} + -a \ + \! -perm /111 -o \! -perm 644 -o -exec chmod 644 {} + + +# Fixing numpy dependency check in pyproject.toml: +# oldest-supported-numpy has a strict check and doesn't support newer version +# so we replace it. The alternative is to add --skip-dependency-check to tbe +# build line but this is not deemed optimal. +sed -i 's/oldest-supported-numpy/numpy>=1.19.3/' pyproject.toml + +# Requires newer version of setuptools than available in -stable. Has not +# effect on -current +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +python3 -m build --no-isolation +python3 -m installer -d "$PKG" dist/*.whl + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGES.txt CREDITS.txt LICENSE.txt README.rst \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-shapely/python3-shapely.info b/gis/python3-shapely/python3-shapely.info new file mode 100644 index 0000000000..d3033b5463 --- /dev/null +++ b/gis/python3-shapely/python3-shapely.info @@ -0,0 +1,10 @@ +PRGNAM="python3-shapely" +VERSION="2.0.3" +HOMEPAGE="https://github.com/shapely/shapely" +DOWNLOAD="https://github.com/shapely/shapely/archive/2.0.3/shapely-2.0.3.tar.gz" +MD5SUM="0baf77e1ec33f9f2ec0aeeb8d2fd5fae" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3-setuptools-opt python3-numpy geos" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/python3-shapely/slack-desc b/gis/python3-shapely/slack-desc new file mode 100644 index 0000000000..779402b414 --- /dev/null +++ b/gis/python3-shapely/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +python3-shapely: python3-shapely (geometric objects, predicates, and operations) +python3-shapely: +python3-shapely: Shapely is a BSD-licensed Python package for manipulation and analysis +python3-shapely: of planar geometric objects. It is based on the widely deployed GEOS +python3-shapely: (the engine of PostGIS) and JTS (from which GEOS is ported) libraries. +python3-shapely: Shapely is not concerned with data formats or coordinate systems, but +python3-shapely: can be readily integrated with packages that are. +python3-shapely: +python3-shapely: Homepage: https://github.com/shapely/shapely +python3-shapely: +python3-shapely: diff --git a/gis/python3-xarray/README b/gis/python3-xarray/README new file mode 100644 index 0000000000..3984ba192b --- /dev/null +++ b/gis/python3-xarray/README @@ -0,0 +1,10 @@ +xarray is an open source project and Python package that aims to +bring the labeled data power of pandas to the physical sciences, by +providing N-dimensional variants of the core pandas data structures. + +The goal is to provide a pandas-like and pandas-compatible toolkit for +analytics on multi-dimensional arrays, rather than the tabular data +for which pandas excels. Our approach adopts the Common Data Model +for self- describing scientific data in widespread use in the Earth +sciences: xarray.Dataset is an in-memory representation of a netCDF +file. diff --git a/gis/python3-xarray/python3-xarray.SlackBuild b/gis/python3-xarray/python3-xarray.SlackBuild new file mode 100644 index 0000000000..92d7f121e6 --- /dev/null +++ b/gis/python3-xarray/python3-xarray.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/bash + +# Slackware build script for python3-xarray + +# Copyright 2018-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2022-2024 Gregory J. L. Tourte <artourter@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=python3-xarray +VERSION=${VERSION:-2024.03.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=xarray + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + 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 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . \ + -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + + +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages/ + +python3 -m build --wheel --no-isolation +python3 -m installer --destdir "$PKG" dist/*.whl + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CITATION.cff CODE_OF_CONDUCT.md CONTRIBUTING.md HOW_TO_RELEASE.md LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/python3-xarray/python3-xarray.info b/gis/python3-xarray/python3-xarray.info new file mode 100644 index 0000000000..5bd43896ba --- /dev/null +++ b/gis/python3-xarray/python3-xarray.info @@ -0,0 +1,10 @@ +PRGNAM="python3-xarray" +VERSION="2024.03.0" +HOMEPAGE="http://xarray.pydata.org" +DOWNLOAD="https://github.com/pydata/xarray/archive/v2024.03.0/xarray-2024.03.0.tar.gz" +MD5SUM="af81c70f069c3adb95acde6ffd7fdac1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3-pandas python3-setuptools-scm-opt" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/gis/CreateCloudMap/slack-desc b/gis/python3-xarray/slack-desc index 07404c420e..80a5ce8750 100644 --- a/gis/CreateCloudMap/slack-desc +++ b/gis/python3-xarray/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -CreateCloudMap: CreateCloudMap (cloud map for xplanet) -CreateCloudMap: -CreateCloudMap: Python script to create a cloud map for xplanet using satellite -CreateCloudMap: images from the Dundee Satellite Receiving Station, Dundee -CreateCloudMap: University, UK. -CreateCloudMap: -CreateCloudMap: Homepage: https://github.com/jmozmoz/cloudmap -CreateCloudMap: -CreateCloudMap: -CreateCloudMap: -CreateCloudMap: +python3-xarray: python3-xarray (N-D labeled arrays and datasets) +python3-xarray: +python3-xarray: xarray is an open source project and Python package that aims to +python3-xarray: bring the labeled data power of pandas to the physical sciences, +python3-xarray: by providing N-dimensional variants of the core pandas data +python3-xarray: structures. +python3-xarray: +python3-xarray: +python3-xarray: +python3-xarray: +python3-xarray: diff --git a/gis/pytrainer/pytrainer.SlackBuild b/gis/pytrainer/pytrainer.SlackBuild index eeceb65401..7165cf0033 100644 --- a/gis/pytrainer/pytrainer.SlackBuild +++ b/gis/pytrainer/pytrainer.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for Pytrainer -# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com> +# Copyright 2014-2024 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=pytrainer -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$(uname -m)" in @@ -35,9 +38,13 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} DOCS="COPYING INSTALL PLUGINS.README README.md" @@ -53,7 +60,7 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION @@ -64,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/pytrainer/pytrainer.info b/gis/pytrainer/pytrainer.info index ef93cc8484..6222f3a15b 100644 --- a/gis/pytrainer/pytrainer.info +++ b/gis/pytrainer/pytrainer.info @@ -1,10 +1,10 @@ PRGNAM="pytrainer" -VERSION="2.0.1" +VERSION="2.2.1" HOMEPAGE="https://github.com/pytrainer/pytrainer" -DOWNLOAD="https://github.com/pytrainer/pytrainer/archive/v2.0.1/pytrainer-2.0.1.tar.gz" -MD5SUM="4f72a99412a40be7e40f5b84c8744472" +DOWNLOAD="https://github.com/pytrainer/pytrainer/archive/v2.2.1/pytrainer-2.2.1.tar.gz" +MD5SUM="2fee7f07868d7185554e2d3e4ba1aeed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lxml sqlalchemy-migrate python-dateutil python-certifi python-requests matplotlib webkit2gtk zenity" +REQUIRES="python3-lxml SQLAlchemy python3-matplotlib webkit2gtk zenity" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/gis/qgis/README b/gis/qgis/README index d8f40f5cb6..72d371f3fa 100644 --- a/gis/qgis/README +++ b/gis/qgis/README @@ -1,20 +1,11 @@ -Quantum GIS (QGIS) is a user friendly Geographic Information System -that lets you view and manipulate spatial data on your computer. It -supports many common spatial data formats (e.g. PostGIS, ShapeFile and -geotiff). +QGIS is a user friendly Geographic Information System that lets you +view and manipulate spatial data on your computer. It supports many +common spatial data formats (e.g. PostGIS, ShapeFile and geotiff). -Optional compile-time dependencies: - - postgresql and postgis: for PostGIS support - - gpsbabel: for the GPS plugin - - grass: for the Grass plugin - - gsl: for georeferencing support - - fcgi: for the QGIS server (see README.server) +The installation of QGIS from sources can result strongly different +depending on the optional/required packages installed and enabled. This +slackbuild is based on basic and some optional settings that require +the dependencies (and related nested deps) reported in the REQUIRES +field of qgis.info. -Optional run-time dependencies: - - OTB - - R - - saga-gis - - TauDEM - -All dependencies must be built with Python 3 support and qtkeychain must be -built after Qt5. +For further information see the README.Slackware file. diff --git a/gis/qgis/README.Slackware b/gis/qgis/README.Slackware new file mode 100644 index 0000000000..0c2fbf044d --- /dev/null +++ b/gis/qgis/README.Slackware @@ -0,0 +1,87 @@ +Table of contents + +1. BUILD-TIME DEPENDENCIES +2. PYTHON BINDINGS AND DEPENDENCIES +3. RUNTIME DEPENDENCIES AND FORMATS +4. ISSUES + +1. BUILD-TIME DEPENDENCIES +Regardless of settings in this slackbuild, a basic installation of QGIS +requires these compile-time dependencies: + - proj + - geos + - libspatialite + - libspatialindex + - gdal + - qwt +The slackbuilds of these are available in this repository. The packages +gdal, proj, and geos are not reported in REQUIRES field of qgis.info +because should be installed as dependencies of others. +Other dependencies must be already installed in your system with a +full installation of Slackware (for example, Qt5, QScintilla, qca, +Python 3, qtkeychain, eccetera). + +Optional dependencies that are enabled as strictly required in this +slackbuild are the following: + - postgis: needed for PostGIS + +Other optional dependencies are enabled by default if found in the +system. These are the following + - gpsbabel: for the GPS plugin + - grass: for the Grass plugin + - pdal: for support to PDAL + - libdraco: for support to Draco plugin + - gsl: for georeferencing support + - fcgi: for the QGIS server functionality + +The build install as optional dependencies - autodetected - also +hdf5 and netcdf. If they are installed, the support of PDAL and/or +Draco can be disabled also by setting to "no" the environment variable + PDAL=no [DRACO=no] ./qgis.SlackBuild + +2. PYTHON BINDINGS AND DEPENDENCIES +The functionality of QGIS is strongly enhanced by a lot of plugins that +can be installed in runtime. Since these plugins are based on Python +modules, the support of Python is enabled by default. This requires +some Python dependencies that are available in a full installation of +Slackware or as slackbuilds in this repository. For a full support of +Python in QGIS you have to install the following packages (as reported +in REQUIRES field of qgis.info): + - OWSLib + - python3-numpy + - python3-psycopg2 + - termcolor +Other python modules are required as nested dependencies. The lack of +some of these modules could not affect the build/runtime of QGIS but +could affect the part or the entire functionality of the Python +support. + +3. RUNTIME DEPENDENCIES AND FORMATS +Optional run-time dependencies are: + - OTB + - R + - saga-gis + - TauDEM + +QGIS supports indirectly several formats that depends on the GDAL +support in build-time (usually autodetected). For example, the support +of the proprietary format ECW is enabled in QGIS if gdal has been build +with this support (this requires the package libecwj2 installed before +build gdal). + +4. ISSUES +Support to OpenCL is enabled by default but the build could fail in +systems with old drivers/graphic cards. If you want to prevent this +pass to the slackbuild the environment variable + + OPENCL=no ./qgis.SlackBuild + +It has reported that QGIS shows runtime warnings about 'osgeo' unless +the Python GDAL library is installed. If you encounter this issue you +can solve by installing via pip the Python GDAL library as simple user +(not root!) as following + $ pip install GDAL + +Other issues not noticed may be encountered depending on various +system settings. If you found any problem please contact the +maintainer. diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index 5f8dba4d9d..249dad3bc6 100644 --- a/gis/qgis/qgis.SlackBuild +++ b/gis/qgis/qgis.SlackBuild @@ -1,9 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for QGIS # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K. -# Copyright 2013-2020 Benjamin Trigona-Harany +# Copyright 2013-2021 Benjamin Trigona-Harany +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +24,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=qgis -VERSION=${VERSION:-3.10.1} +VERSION=${VERSION:-3.36.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +40,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -70,33 +78,56 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +if pkg-config --exists OpenCL; then + OCL="-DUSE_OPENCL=OFF " ; [ "${OPENCL:-yes}" = "yes" ] && OCL="-DUSE_OPENCL=ON " +else + OCL="-DUSE_OPENCL=OFF " +fi + +if pkg-config --exists pdal; then + WITHPDAL="-DWITH_PDAL=OFF "; [ "${PDAL:-yes}" = "yes" ] && WITHPDAL="-DWITH_PDAL=ON " +else + WITHPDAL="-DWITH_PDAL=OFF " +fi + +if pkg-config --exists draco; then + WITHDRACO="-DWITH_DRACO=OFF "; [ "${DRACO:-yes}" = "yes" ] && WITHDRACO="-DWITH_DRACO=ON " +else + WITHDRACO="-DWITH_DRACO=OFF " +fi + if pkg-config --exists grass; then - WITHGRASS="-DGRASS_PREFIX=$(pkg-config --variable=prefix grass)" + WITHGRASS="-DGRASS_PREFIX=$(pkg-config --variable=prefix grass) " else WITHGRASS="" fi -sed -i 's|${SIP_BINARY_PATH}|/usr/bin/python3-sip|' cmake/SIPMacros.cmake +sed -i '43 i IF (NOT PROJ_INCLUDE_DIR)\nFIND_PATH(PROJ_INCLUDE_DIR proj.h\n"$ENV{INCLUDE}"\n"$ENV{LIB_DIR}/include"\n)\nENDIF (NOT PROJ_INCLUDE_DIR)\n' cmake/FindProj.cmake mkdir -p build cd build cmake .. \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -pthread" \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \ -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ -DWITH_QWTPOLAR=TRUE \ - -DWITH_CUSTOM_WIDGETS=TRUE \ + -DWITH_CUSTOM_WIDGETS=FALSE \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ - -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt \ + -DQWT_INCLUDE_DIR=/usr/include/qwt \ -DQSCINTILLA_INCLUDE_DIR=/usr/include/qt5 \ -DENABLE_TESTS=FALSE \ -DWITH_3D=TRUE \ + -Wno-dev \ + $OCL \ + $WITHPDAL \ + $WITHDRACO \ $WITHGRASS + make make install DESTDIR=$PKG cd - @@ -106,12 +137,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -mv $PKG/usr/share/metainfo $PKG/usr/share/appdata +mkdir -p $PKG/usr/share/mime/packages +cp debian/qgis.xml $PKG/usr/share/mime/packages mkdir -p $PKG/usr/doc mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION +rm -f $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL.md cp -a \ - ChangeLog Exception_to_GPL_for_Qt.txt NEWS \ + COPYING ChangeLog Exception_to_GPL_for_Qt.txt NEWS.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -120,4 +153,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info index 3f6b5afda9..c1f196f212 100644 --- a/gis/qgis/qgis.info +++ b/gis/qgis/qgis.info @@ -1,10 +1,10 @@ PRGNAM="qgis" -VERSION="3.10.1" +VERSION="3.36.1" HOMEPAGE="https://qgis.org/" -DOWNLOAD="https://qgis.org/downloads/qgis-3.10.1.tar.bz2" -MD5SUM="113537294910c8ad8ccec58803f989e2" +DOWNLOAD="https://qgis.org/downloads/qgis-3.36.1.tar.bz2" +MD5SUM="991b01d1e8f81d2cb87a85b509cdfad9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="postgis libspatialite libspatialindex numpy3 qwt-qt5 QScintilla-qt5 qtkeychain python3-six qca-qt5 python3-PyYAML python-requests Pygments pytz OWSLib psycopg2 Jinja2" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="libspatialite libspatialindex OWSLib postgis python3-numpy python3-psycopg2 qwt termcolor protobuf3" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/qmapshack/qmapshack.SlackBuild b/gis/qmapshack/qmapshack.SlackBuild index 0fa7de11c3..3262134a32 100644 --- a/gis/qmapshack/qmapshack.SlackBuild +++ b/gis/qmapshack/qmapshack.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for qmapshack -# Copyright 2015 Daniel Stolarski <daniel.stolarski@gmail.com> +# Copyright 2015-2020 Daniel Stolarski <daniel.stolarski@gmail.com> # # This program is free software. It comes without any warranty, to # the extent permitted by applicable law. You can redistribute it @@ -9,10 +9,13 @@ # To Public License, Version 2, as published by Sam Hocevar. See # http://sam.zoy.org/wtfpl/COPYING for more details. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=qmapshack -VERSION=${VERSION:-1.14.0} +VERSION=${VERSION:-1.17.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -22,7 +25,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -46,14 +56,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-V_$VERSION -tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz +rm -rf $PRGNAM-V_${VERSION} +tar xvf $CWD/${PRGNAM}-V_${VERSION}.tar.gz cd ${PRGNAM}-V_${VERSION} - -# Apply patches provided in the source tree -patch -p1 < FindPROJ4.patch -patch -p1 < FindQuaZip5.patch - chown -R root:root . find -L . \ @@ -92,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/qmapshack/qmapshack.info b/gis/qmapshack/qmapshack.info index 3575e9631d..8e6e139656 100644 --- a/gis/qmapshack/qmapshack.info +++ b/gis/qmapshack/qmapshack.info @@ -1,10 +1,10 @@ PRGNAM="qmapshack" -VERSION="1.14.0" +VERSION="1.17.1" HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.14.0/qmapshack-1.14.0.tar.gz" -MD5SUM_x86_64="9218ac75f61fd8144a2587d2e888414b" -REQUIRES="gdal qt5-webkit routino quazip-qt5" +DOWNLOAD_x86_64="https://github.com/Maproom/qmapshack/archive/V_1.17.1/qmapshack-V_1.17.1.tar.gz" +MD5SUM_x86_64="94851207c9e9800f7d2ca0200ce7ecff" +REQUIRES="gdal routino" MAINTAINER="Daniel Stolarski" EMAIL="daniel.stolarski@gmail.com" diff --git a/gis/rasterio/README b/gis/rasterio/README index 87e9c97595..b9559ff4d1 100644 --- a/gis/rasterio/README +++ b/gis/rasterio/README @@ -1,9 +1,11 @@ -Fast and direct geospatial raster I/O for Python programmers who use Numpy. +Fast and direct geospatial raster I/O for Python programmers who use +Numpy. -This package is aimed at developers who want little more than to read raster -images into Numpy arrays or buffers, operate on them in Python (or Cython), and -write the results out to new GeoTIFF files. +This package is aimed at developers who want little more than to read +raster images into Numpy arrays or buffers, operate on them in Python +(or Cython), and write the results out to new GeoTIFF files. -Rasterio employs GDAL under the hood for file I/O and raster formatting. +Rasterio employs GDAL under the hood for file I/O and raster +formatting. Optional dependencies: boto3. diff --git a/gis/rasterio/rasterio.SlackBuild b/gis/rasterio/rasterio.SlackBuild index 68549f7607..1e607ae709 100644 --- a/gis/rasterio/rasterio.SlackBuild +++ b/gis/rasterio/rasterio.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # SlackBuild script for rasterio -# Copyright 2013-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,10 +24,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=rasterio -VERSION=${VERSION:-1.1.2} +VERSION=${VERSION:-1.2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -86,4 +96,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/rasterio/rasterio.info b/gis/rasterio/rasterio.info index 0267d23fee..5d25597e44 100644 --- a/gis/rasterio/rasterio.info +++ b/gis/rasterio/rasterio.info @@ -1,10 +1,10 @@ PRGNAM="rasterio" -VERSION="1.1.2" +VERSION="1.2.6" HOMEPAGE="https://github.com/mapbox/rasterio" -DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.1.2/rasterio-1.1.2.tar.gz" -MD5SUM="f60fe07e4830a7a771be691a9f78eb82" +DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.2.6/rasterio-1.2.6.tar.gz" +MD5SUM="6c8eac345f3268d9edde10820c8cfcef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="affine click-plugins cligj numpy snuggs numpy3 python3-attrs pyparsing" +REQUIRES="affine click-plugins cligj gdal snuggs python3-attrs" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/gis/readosm/readosm.SlackBuild b/gis/readosm/readosm.SlackBuild index c468a767ba..f455417a54 100644 --- a/gis/readosm/readosm.SlackBuild +++ b/gis/readosm/readosm.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for ReadOSM # Copyright 2012-2015 Alexander Bruy <alexander.bruy@gmail.com> @@ -21,26 +21,36 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=readosm VERSION=${VERSION:-1.0.0d} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -89,8 +99,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/routino/README b/gis/routino/README index 71eea0b991..7a5bd9378e 100644 --- a/gis/routino/README +++ b/gis/routino/README @@ -1,4 +1,5 @@ -Routino is an application for finding a route between two points using the -dataset of topographical information collected by http://www.OpenStreetMap.org +Routino is an application for finding a route between two points +using the dataset of topographical information collected by +http://www.OpenStreetMap.org NOTE: only the x86_64 architecture is supported. diff --git a/gis/routino/routino.SlackBuild b/gis/routino/routino.SlackBuild index 50519ef0fc..6219aaa6c3 100644 --- a/gis/routino/routino.SlackBuild +++ b/gis/routino/routino.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for routino @@ -24,10 +24,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=routino VERSION=${VERSION:-3.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -86,4 +96,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/saga-gis/README b/gis/saga-gis/README index 9fba69678b..25b4b6a1ad 100644 --- a/gis/saga-gis/README +++ b/gis/saga-gis/README @@ -1,16 +1,42 @@ -System for Automated Geoscientific Analyses (SAGA) is a Geographic Information -System software with immense capabilities for geodata processing and analysis. +System for Automated Geoscientific Analyses (SAGA) is a Geographic +Information System software with immense capabilities for geodata +processing and analysis. -SAGA supports the implementation of new functions with an effective API. -Functions are organised as modules in framework independent Module Libraries -and can be accessed via SAGA's Graphical User Interface or various scripting -environments (shell scripts, Python, R and so on). +SAGA supports the implementation of new functions with an effective +API. Functions are organised as modules in framework independent +Module Libraries and can be accessed via SAGA's Graphical User +Interface or various scripting environments (shell scripts, Python, +R and so on). -SAGA can use these optional dependencies: libharu, postgresql and qhull. SAGA -currently does not build when vigra is installed. +SAGA can use these optional autodetected dependencies enabled if they +are found in the system: +libharu, OpenMP, OpenCV, qhull, vigra, pdal, postgresql/postgis, +libLAS, proj, hdf5. Previous issues given with OpenCV version 4 or +greater and vigra seem solved in last versions of SAGA. -To enable opencv, set OPENCV=ON. By default OpenCV is disabled since SAGA does -not build when OpenCV version 4 or greater is installed. - -If SAGA fails to run after an upgrade, uninstall old versions of SAGA before -compilation. +WARNINGS: +1) Unlike earlier versions of SAGA, the build of last versions + requires wxGTK3 => 3.1 that is not available in Slackbuilds.org at + the moment. If you want to build this version of SAGA you have to + 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. diff --git a/gis/saga-gis/doinst.sh b/gis/saga-gis/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/gis/saga-gis/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild index 29ef4478af..e02d2da421 100644 --- a/gis/saga-gis/saga-gis.SlackBuild +++ b/gis/saga-gis/saga-gis.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for saga-gis -# Copyright 2014-2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT +# Copyright 2014-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=saga-gis -VERSION=${VERSION:-7.3.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-9.3.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} SRCNAM=saga @@ -37,34 +41,60 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$SRCNAM +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} # issues with -O2 causing build failures if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="" - LIBDIRSUFFIX="" fi set -e +# unixODBC is needed in 32 bit systems instead of libiodbc released +# with Slackware 15.0. The slackbuild stops if unixODBC is not installed +if [[ "$ARCH" = "i586" || "$ARCH" = "i686" ]] ; then + if ! [ -f /usr/lib/libodbc.so ] ; then + echo ""; + echo ""; + echo ""; + echo "******************** WARNING *********************"; + echo " This script cannot be executed in 32 bit systems "; + echo " with iODBC as default ODBC library installed. "; + echo " The current process will be stopped. "; + echo " Please install the unixODBC package from the "; + echo " slackbuild available in the SBo repository. "; + echo "**************************************************"; + exit 1; + fi +fi + +if [ -d /usr/share/cmake-3.29 ]; then + # This prevents some cmake warnings in current + CMAKE_POLICY="-DCMAKE_POLICY_DEFAULT_CMP0153=OLD " +else + CMAKE_POLICY="" +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +cd $SRCNAM-$VERSION/saga-gis + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -72,43 +102,39 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -if [ "$OPENCV" != "ON" ] ; then - sed -i "s/CVFOUND=1/true/g" configure -fi - -sed -i "s/isinf/std::isinf/g" src/saga_core/saga_gui/wksp_map_layer.cpp - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -PYTHON=python3 \ -./configure \ - --build=$ARCH \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-python \ - --disable-odbc \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + $CMAKE_POLICY \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# DCMAKE_INSTALL_MANDIR is not applied by the process we move files manually from /usr/share +mv $PKG/usr/share/man $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mv $PKG/usr/share/metainfo $PKG/usr/share/appdata +# fix some bad perms in doc files that have to install +chmod 644 readme.md src/*.txt + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a readme.md src/gpl.txt src/lgpl.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info index c8eecee857..62dd9d644b 100644 --- a/gis/saga-gis/saga-gis.info +++ b/gis/saga-gis/saga-gis.info @@ -1,10 +1,10 @@ PRGNAM="saga-gis" -VERSION="7.3.0" +VERSION="9.3.2" HOMEPAGE="http://www.saga-gis.org" -DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.3.0/saga-7.3.0.tar.gz" -MD5SUM="2383eb43f12da743c5ac52ecc8dfd302" +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_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal python3 wxGTK3" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" +REQUIRES="wxWidgets" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/spatialite-tools/0001-fix-autotools.patch.gz b/gis/spatialite-tools/0001-fix-autotools.patch.gz Binary files differnew file mode 100644 index 0000000000..68d1284410 --- /dev/null +++ b/gis/spatialite-tools/0001-fix-autotools.patch.gz diff --git a/gis/spatialite-tools/README b/gis/spatialite-tools/README index c64fbee3da..088cb7e79b 100644 --- a/gis/spatialite-tools/README +++ b/gis/spatialite-tools/README @@ -8,10 +8,10 @@ spatialite-tools is a collection of open source Command Line Interface * exif_loader: an import tool for EXIF or EXIF-GPS (JPEG) pictures * spatialite_osm_raw: a tool importing OSM files (raw format tables, strictly corresponding to XML input) - * spatialite_osm_filter: a tool allowing to re-export spatially selected - OSM files form a raw-format DB + * spatialite_osm_filter: a tool allowing to re-export spatially + selected OSM files form a raw-format DB * spatialite_osm_map: a tool importing map layers from an OSM file * spatialite_osm_net: a tool creating a road network from an OSM file - * spatialite_network: a tool creating a VirtualNetwork (supporting shortest - path / routing SQL queries) + * spatialite_network: a tool creating a VirtualNetwork (supporting + shortest path / routing SQL queries) * spatialite_gml: a tool importing GML files diff --git a/gis/spatialite-tools/spatialite-tools.SlackBuild b/gis/spatialite-tools/spatialite-tools.SlackBuild index 6bc47164fe..461c1aba75 100644 --- a/gis/spatialite-tools/spatialite-tools.SlackBuild +++ b/gis/spatialite-tools/spatialite-tools.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for spatialite-tools # Copyright 2012-2015 Alexander Bruy <alexander.bruy@gmail.com> @@ -21,26 +21,36 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=spatialite-tools -VERSION=${VERSION:-4.2.0} +VERSION=${VERSION:-4.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -61,6 +71,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +zcat $CWD/0001-fix-autotools.patch.gz | patch -p1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-ldl" \ @@ -93,4 +106,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/spatialite-tools/spatialite-tools.info b/gis/spatialite-tools/spatialite-tools.info index df2eceed66..2aa5373e0f 100644 --- a/gis/spatialite-tools/spatialite-tools.info +++ b/gis/spatialite-tools/spatialite-tools.info @@ -1,8 +1,8 @@ PRGNAM="spatialite-tools" -VERSION="4.2.0" +VERSION="4.3.0" HOMEPAGE="https://www.gaia-gis.it/fossil/spatialite-tools/index" -DOWNLOAD="http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.2.0.tar.gz" -MD5SUM="e00aeccec0cc8bf1e6fc725b1eabd2d2" +DOWNLOAD="http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.3.0.tar.gz" +MD5SUM="83cb7b1f6c6b20fe5475586f1fb77088" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libspatialite readosm" diff --git a/gis/spatialite_gui/README b/gis/spatialite_gui/README deleted file mode 100644 index 811e6c53a1..0000000000 --- a/gis/spatialite_gui/README +++ /dev/null @@ -1,2 +0,0 @@ -spatialite-gui is an open source Graphical User Interface (GUI) tool supporting -SpatiaLite. diff --git a/gis/spatialite_gui/spatialite_gui.info b/gis/spatialite_gui/spatialite_gui.info deleted file mode 100644 index 02b1dff5a2..0000000000 --- a/gis/spatialite_gui/spatialite_gui.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="spatialite_gui" -VERSION="1.7.1" -HOMEPAGE="https://www.gaia-gis.it/fossil/spatialite_gui/index" -DOWNLOAD="http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-1.7.1.tar.gz" -MD5SUM="c917f40810607784528b4db58cd36efb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libspatialite freexl libgaiagraphics wxPython" -MAINTAINER="Alexander Bruy" -EMAIL="alexander.bruy@gmail.com" diff --git a/gis/survex/README b/gis/survex/README new file mode 100644 index 0000000000..f1a3ea5a5f --- /dev/null +++ b/gis/survex/README @@ -0,0 +1,11 @@ +Survex is a Free and Open Source software package to assist surveying +and mapping cave systems. + +By default this slackbuild installs a sample dataset into the +installation directory tree. If you do not need this passe to the +script the environment variable SAMPLE=no as following: + +SAMPLE=no ./survex.SlackBuild + +Note: the Graphical Interface User is launched by the command aven or +the Desktop entry "Aven Cave Surveying Tool". diff --git a/gis/survex/doinst.sh b/gis/survex/doinst.sh new file mode 100644 index 0000000000..aea0f894eb --- /dev/null +++ b/gis/survex/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/gis/pyproj/slack-desc b/gis/survex/slack-desc index b7fe3654f8..712f6021ec 100644 --- a/gis/pyproj/slack-desc +++ b/gis/survex/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -pyproj: pyproj (Python interface to the PROJ.4 library) -pyproj: -pyproj: pyproj can convert from geographic (longitude,latitude) to native -pyproj: map projection (x,y) coordinates and vice versa, or from one map -pyproj: projection coordinate system directly to another. -pyproj: -pyproj: Homepage: http://code.google.com/p/pyproj/ -pyproj: -pyproj: -pyproj: -pyproj: +survex: survex (software package for mapping caves) +survex: +survex: Survex is a Free and Open Source software package to assist +survex: surveying and mapping cave systems. +survex: +survex: +survex: +survex: +survex: Home page: https://survex.com +survex: +survex: diff --git a/gis/CreateCloudMap/CreateCloudMap.SlackBuild b/gis/survex/survex.SlackBuild index a9c7a9ac2f..942934e8a2 100644 --- a/gis/CreateCloudMap/CreateCloudMap.SlackBuild +++ b/gis/survex/survex.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash -# Slackware build script for CreateCloudMap +# Slackware build script for surved -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2022-2024 Giancarlo Dessì, Cagliari, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=CreateCloudMap -VERSION=${VERSION:-0.9.13} +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=survex +VERSION=${VERSION:-1.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -62,6 +69,9 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +if [ "${SAMPLE:-yes}" = "yes" ]; then + tar xvf $CWD/sample.tar.gz +fi chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,13 +79,42 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +find $PKG -name perllocal.pod \ + -o -name ".packlist" \ + -o -name "*.bs" \ + | xargs rm -f + +if [ "${SAMPLE:-yes}" = "yes" ]; then + mkdir $PKG/usr/share/survex/sample + cp -a loser/* $PKG/usr/share/survex/sample +fi + +mkdir -p $PKG/usr/doc +cp -a $PKG/usr/share/doc/survex $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/doc +cp -a AUTHORS COPYING ChangeLog NEWS OLDNEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -83,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/survex/survex.info b/gis/survex/survex.info new file mode 100644 index 0000000000..190dd5c38f --- /dev/null +++ b/gis/survex/survex.info @@ -0,0 +1,12 @@ +PRGNAM="survex" +VERSION="1.4.7" +HOMEPAGE="https://survex.com" +DOWNLOAD="https://survex.com/software/1.4.7/survex-1.4.7.tar.gz \ + https://survex.com/software/sample.tar.gz" +MD5SUM="fb4b5ba8b0c571ab4ab4d9e634f0f954 \ + 75f0d39e52fefb886b39ea664ef76c80" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="proj wxGTK3" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/tangogps/README b/gis/tangogps/README index a2feaaad64..b44fdedcf8 100644 --- a/gis/tangogps/README +++ b/gis/tangogps/README @@ -1,10 +1,10 @@ -tangogps is an easy to use, fast, and lightweight mapping application -for use with or without GPS. By default, tangoGPS uses map data from -the Openstreetmap project. Additionally, a variety of other repositories -can be easily added. The maps are downloaded and cached for offline use -while you drag or zoom the map. Furthermore, you can conveniently pre-cache -areas with tangoGPS. +tangogps is an easy to use, fast, and lightweight mapping application +for use with or without GPS. By default, tangoGPS uses map data +from the Openstreetmap project. Additionally, a variety of other +repositories can be easily added. The maps are downloaded and cached +for offline use while you drag or zoom the map. Furthermore, you can +conveniently pre-cache areas with tangoGPS. -If connected to a GPS, your current position and track are shown on the map, -and you can log positional data for further processing, e.g. for geocoding -photos or uploading streets to Openstreetmap. +If connected to a GPS, your current position and track are shown +on the map, and you can log positional data for further processing, +e.g. for geocoding photos or uploading streets to Openstreetmap. diff --git a/gis/tangogps/tangogps.SlackBuild b/gis/tangogps/tangogps.SlackBuild index d310c96556..c63df60df3 100644 --- a/gis/tangogps/tangogps.SlackBuild +++ b/gis/tangogps/tangogps.SlackBuild @@ -1,12 +1,15 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for tangogps # Written by <pedro@gepasi.org> # This script is hereby put in the public domain +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=tangogps VERSION=${VERSION:-0.99.4} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -57,7 +67,7 @@ sed -i "s|^#include\ <glib/.*||" src/map_management.c sed -i "s|^#include\ <curl/types\.h>||" \ src/tile_management.c src/util.h src/friends.c -LDFLAGS="-lm" \ +LDFLAGS="-Wl,--allow-multiple-definition,-lm" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -76,4 +86,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/therion/README b/gis/therion/README new file mode 100644 index 0000000000..c7be4893b4 --- /dev/null +++ b/gis/therion/README @@ -0,0 +1,68 @@ +Therion is a complete platform which processes survey data and +generates maps or 3D models of caves. This suite may be useful for +professional or amateur cavers and researchers in geology or +speleology fields. + +The package includes the following components: +- therion: the basic executable program that works as a command-line + compiler and processes input files, which are - including 2D maps - + in text format, to create files with 2D maps or 3D model. 2D maps + can be generated in PDF or SVG formats or other formats handled by + GIS platforms (DXF, ESRI, KML) or Aven (Survex format). 3D models + can be generated in the native format (handled by the component + Loch) or other formats (Compass, 3DMF, VRML, Survex, ecc.) handled + by appropriate viewers. +- xtherion: the executable program that launches the GUI (Graphical + User Interface). Xtherion works as text editor, map editor, and + compiler (instead of therion). This component is not essential: + output files can be generated by therion preparing the input files + with external programs as text or maps editors. +- Loch: a 3D model viewer that supports high-resolution rendering to + file and stereo view using 3D-glasses. This component is not + essential: output 3D models can be displayed with other external + viewers. +- thbook.pdf: the Therion Book, it contains the documentation to use + Therion, generated with pdfTEX during the build process. It will be + installed in /usr/doc/therion-[VERSION]. This component is not + essential: a copy of the book (in basic size format) is also + available in the project homepage. + +The build of the optional components is enabled by default. You can +exclude one or more of them by passing to the script the respective +environment variables: + +- LOCH=no This disables the build of the native 3D viewer Loch. In + this case wxWidgets and VTK are not required. +- GUI=no This disables the build of Xtherion. +- BOOK=no This disables the build of thbook.pdf. + +WARNINGS + +Note that the platform works only with some standards, interpreters or +programs (like METAPOST, TEX, tcl/tk, ImageMagick, ecc.) that are +available in a full installation of Slackware, and some extensions of +these (like LCDF Typetools, Bwidget, and tkImg) that are available in +Slackbuilds.org. Without these dependencies Therion fails during the +package build (almost) or in runtime for some features (e.g. tkImg, +that is not detected by the build process). + +Since version 6.1.7, Therion no longer includes an internal {fmt} +library, so this library is a required dependency. In Slackware 15.0, +this library must be installed by the slackbuild available in +Slackbuilds.org whereas in Slackware current it must be installed +from the package released with the official current. + +Since version 6.1.8, the build of LOCH fails if wxGTK3 is installed +instead of wxWidgets 3.2.2.1, so wxWidgets is strictly required. If +both wxGTK3 and wxWidgets are installed, the build process will use +wxWidgets, so these libraries can coexist. Other libraries based on +wxWidgets (like wxPython3 or wxPython4 for example) are not tested. + +After the installation, a full and extended integrated behavior, +optimized with the custom configuration, requires to set or uncomment +appropriate values in the initialization files in /etc/therion. + +Sample data can be downloaded from the project homepage. They can be +used to practice about Therion. + +See the thbook.pdf for more information. diff --git a/gis/therion/doinst.sh b/gis/therion/doinst.sh new file mode 100644 index 0000000000..00ecebd85c --- /dev/null +++ b/gis/therion/doinst.sh @@ -0,0 +1,29 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/therion/therion.ini.new +config etc/therion/xtherion.ini.new + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/gis/cartopy/slack-desc b/gis/therion/slack-desc index c119c95060..59129ed4b3 100644 --- a/gis/cartopy/slack-desc +++ b/gis/therion/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -cartopy: cartopy (cartographic tools for Python) -cartopy: -cartopy: Cartopy is a Python package designed to make drawing maps for data -cartopy: analysis and visualisation as easy as possible. -cartopy: -cartopy: -cartopy: -cartopy: -cartopy: -cartopy: -cartopy: +therion: therion (Cave surveying software) +therion: +therion: Therion is a complete package which processes survey data and +therion: generates maps or 3D models of caves. +therion: +therion: +therion: +therion: +therion: https://therion.speleo.sk/ +therion: +therion: diff --git a/gis/therion/therion.SlackBuild b/gis/therion/therion.SlackBuild new file mode 100644 index 0000000000..f5290f8530 --- /dev/null +++ b/gis/therion/therion.SlackBuild @@ -0,0 +1,163 @@ +#!/bin/bash + +# Slackware build script for therion + +# Copyright 2023-2024 Giancarlo Dessi, Cagliari, IT +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=therion +VERSION=${VERSION:-6.2.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +# Features enabled by default +BUILDLOCH="" ; [ "${LOCH:-yes}" = "no" ] && BUILDLOCH=" -DBUILD_LOCH=OFF" +BUILDBOOK=" -DTHBOOK_FORMAT=3" ; [ "${BOOK:-yes}" = "no" ] && BUILDBOOK=" -DBUILD_THBOOK=OFF" +BUILDX=""; [ "${GUI:-yes}" = "no" ] && BUILDX=" -DBUILD_XTHERION=OFF" + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake -Wno-dev \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc/therion \ + $BUILDLOCH \ + $BUILDBOOK \ + $BUILDX \ + -DCMAKE_BUILD_TYPE=Release .. + make -j 10 + make install/strip DESTDIR=$PKG +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES COPYING README CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# make installs documentation generated by the build into two directories in /usr/share/doc +# we move this documentation in /usr/doc/therion-x.y.z +if [ "$BOOK" != "no" ] ; then + mv $PKG/usr/share/doc/$PRGNAM/thbook.pdf $PKG/usr/doc/$PRGNAM-$VERSION + rm -rf $PKG/usr/share/doc/$PRGNAM + if [ "$LOCH" == "no" ] ; then + rm -rf $PKG/usr/share + fi +fi +if [ "$LOCH" != "no" ] ; then + mv $PKG/usr/share/doc/therion-viewer $PKG/usr/doc/$PRGNAM-$VERSION + rm -rf $PKG/usr/share/doc +fi + +#Make and install a copy of the application icon in PNG format +mkdir -p $PKG/usr/share/icons/hicolor/32x32/apps +magick $TMP/$PRGNAM-$VERSION/therion.ico $PKG/usr/share/icons/hicolor/32x32/apps/therion.png + +#Create a desktop entry +mkdir -p $PKG/usr/share/applications +cat << EOF > $PKG/usr/share/applications/therion.desktop +[Desktop Entry] +Type=Application +Name=Therion +GenericName=Cave survey software +GenericName[de]=Höhlenstudienprogramm +GenericName[es]=Programa de estudio de las cuevas +GenericName[fr]=Programme d'étude des grottes +GenericName[it]=Programma di studio delle grotte +GenericName[pt]=Programa de estudo de caverna +Comment=Process data from speleological surveys and generate maps and 3D models of caves +Comment[de]=Verarbeiten Sie speläologische Daten und erstellen Sie Höhlenkarten und 3D-Modelle +Comment[es]=Procese datos de estudios espeleológicos y genere mapas y modelos 3D de cuevas +Comment[fr]=Traiter données des relevés spéléologiques et générer cartes et modèles 3D de grottes +Comment[it]=Elabora dati di rilievi speleologici e genera mappe e modelli 3D delle grotte +Comment[pt]=Processar dados de levantamentos espeleológicos e gerar mapas e modelos 3D de cavernas +Exec=xtherion +Icon=/usr/share/icons/hicolor/32x32/apps/therion.png +Terminal=false +Categories=Education;Science;Geology; +StartupNotify=true +MimeType=text/x-th;text/x-th2; + +EOF + +# remove *.ini files, leave only *.ini.new +rm -f $PKG/etc/therion/*.ini + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/therion/therion.info b/gis/therion/therion.info new file mode 100644 index 0000000000..3cbeac70f3 --- /dev/null +++ b/gis/therion/therion.info @@ -0,0 +1,10 @@ +PRGNAM="therion" +VERSION="6.2.1" +HOMEPAGE="https://therion.speleo.sk/" +DOWNLOAD="https://github.com/therion/therion/archive/v6.2.1/therion-6.2.1.tar.gz" +MD5SUM="cb3b9c2472bfeda939661ce7d71e651d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="bwidget Catch2 fmt lcdf-typetools proj tkimg VTK wxWidgets" +MAINTAINER="Giancarlo Dessi" +EMAIL="slack@giand.it" diff --git a/gis/udig/README b/gis/udig/README deleted file mode 100644 index 1ec38dd0d4..0000000000 --- a/gis/udig/README +++ /dev/null @@ -1,11 +0,0 @@ -uDig is an open source desktop and internet GIS application framework. The -project goal is to provide a complete Java solution for desktop GIS data -access, editing and viewing. - -uDig aims to be: -- User friendly, providing a familiar graphical environment for GIS users; -- Desktop located, running as a thick client -- Internet oriented, consuming standard (WMS, WFS, WPS) and de facto (GeoRSS, - KML, tiles) geospatial web services; and, GIS ready, providing the - framework on which complex analytical capabilities can be built, and gradually - subsuming those capabilities into the main application. diff --git a/gis/udig/doinst.sh b/gis/udig/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/gis/udig/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/gis/udig/slack-desc b/gis/udig/slack-desc deleted file mode 100644 index 9e9f96ac9b..0000000000 --- a/gis/udig/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -udig: udig (desktop GIS) -udig: -udig: uDig is an open source desktop GIS application framework that can be -udig: used as a standalone viewer and editor for spatial data. uDig -udig: supports PostGIS, shapefiles and other sources. -udig: -udig: Homepage: http://udig.refractions.net/ -udig: -udig: -udig: -udig: diff --git a/gis/udig/udig.SlackBuild b/gis/udig/udig.SlackBuild deleted file mode 100644 index fbc7033dde..0000000000 --- a/gis/udig/udig.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# -# SlackBuild for uDig -# -# Copyright 2012 Benjamin Trigona-Harany -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=udig -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" - ZIPSUFFIX="x86_64" - GDALDIR="amd64" -else - LIBDIRSUFFIX="" - ZIPSUFFIX="x86" - GDALDIR="i386" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM -cd $TMP -unzip $CWD/$PRGNAM-$VERSION.linux.gtk.$ZIPSUFFIX.zip -cd $PRGNAM -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# the GDAL libs need to be extracted from the JRE directory and placed in the LD_LIBRARY_PATH -# at uDig runtime -mkdir -p $PKG/usr/share/$PRGNAM -cp -a jre/lib/${GDALDIR}/libgdaljni.so{,.1} $PKG/usr/share/$PRGNAM -sed -i '2i\ -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/bin/share/udig -' udig.sh - -mkdir -p $PKG/usr/share/$PRGNAM -cp -a configuration dropins features libcairo-swt.so p2 plugins *.sh udig_internal* $PKG/usr/share/$PRGNAM - -# gdal_data doesn't come with x86 -if [ "$ARCH" = "x86_64" ]; then - cp -a gdal_data $PKG/usr/share/$PRGNAM -fi - -mkdir -p $PKG/usr/bin -ln -s /usr/share/$PRGNAM/$PRGNAM.sh $PKG/usr/bin/$PRGNAM - -mkdir -p $PKG/usr/share/applications -cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop - -mkdir -p $PKG/usr/share/pixmaps/ -cp -a icon.xpm $PKG/usr/share/pixmaps/udig.xpm - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt epl-v10.html notice.html readme/* udig-$VERSION.html $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/gis/udig/udig.desktop b/gis/udig/udig.desktop deleted file mode 100644 index 0919cc2c13..0000000000 --- a/gis/udig/udig.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=uDig -GenericName=Desktop Internet GIS -Comment=Java-based GIS data viewer and editor -Exec=/usr/bin/udig -StartupNotify=true -Icon=udig -Type=Application -Categories=Education;Science;Geoscience;Geography; diff --git a/gis/udig/udig.info b/gis/udig/udig.info deleted file mode 100644 index 81d2104b5b..0000000000 --- a/gis/udig/udig.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="udig" -VERSION="1.4.0" -HOMEPAGE="http://udig.refractions.net" -DOWNLOAD="http://udig.refractions.net/files/downloads/udig-1.4.0.linux.gtk.x86.zip" -MD5SUM="116b7f577ba08b1e2b7d0100588f5259" -DOWNLOAD_x86_64="http://udig.refractions.net/files/downloads/udig-1.4.0.linux.gtk.x86_64.zip" -MD5SUM_x86_64="b401a3fc48b33888dcf894104b4f903e" -REQUIRES="jai-imageio" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" diff --git a/gis/viking/viking.SlackBuild b/gis/viking/viking.SlackBuild index 8ca0b8437e..20cff729d7 100644 --- a/gis/viking/viking.SlackBuild +++ b/gis/viking/viking.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for viking. @@ -24,10 +24,13 @@ # # Maintained by David Spencer <baildon.research@googlemail.com> +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=viking VERSION=${VERSION:-1.6.2} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -84,7 +94,7 @@ if [ ${GEOCACHES:-no} = "yes" ]; then OPT_GEOCACHES="--enable-geocaches" fi -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -117,4 +127,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/viking/viking.info b/gis/viking/viking.info index 5acc1d403a..a1079f69da 100644 --- a/gis/viking/viking.info +++ b/gis/viking/viking.info @@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/viking/viking-1.6.2.tar.bz2" MD5SUM="288cf8c6043ff4d04523595457fd5ed0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gpsd libgexiv2" +REQUIRES="gpsd" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" diff --git a/gis/whitebox-tools/README b/gis/whitebox-tools/README index 40ed36cf0a..73328ae946 100644 --- a/gis/whitebox-tools/README +++ b/gis/whitebox-tools/README @@ -1,19 +1,21 @@ -WhiteboxTools is an advanced geospatial data analysis platform developed by -Prof. John Lindsay at the University of Guelph's Geomorphometry and -Hydrogeomatics Research Group. WhiteboxTools can be used to perform common -geographical information systems (GIS) analysis operations, such as -cost-distance analysis, distance buffering, and raster reclassification. Remote -sensing and image processing tasks include image enhancement (e.g. panchromatic -sharpening, contrast adjustments), image mosaicing, numerous filtering -operations, simple classification (k-means), and common image transformations. -WhiteboxTools also contains advanced tooling for spatial hydrological analysis -(e.g. flow-accumulation, watershed delineation, stream network analysis, sink -removal), terrain analysis (e.g. common terrain indices such as slope, -curvatures, wetness index, hillshading; hypsometric analysis; multi-scale -topographic position analysis), and LiDAR data processing. LiDAR point clouds -can be interrogated (LidarInfo, LidarHistogram), segmented, tiled and joined, -analyized for outliers, interpolated to rasters (DEMs, intensity images), and -ground-points can be classified or filtered. WhiteboxTools is not a -cartographic or spatial data visualization package; instead it is meant to -serve as an analytical backend for other data visualization software, mainly -GIS. +WhiteboxTools is an advanced geospatial data analysis platform +developed by Prof. John Lindsay at the University of Guelph's +Geomorphometry and Hydrogeomatics Research Group. WhiteboxTools can be +used to perform common geographical information systems (GIS) analysis +operations, such as cost-distance analysis, distance buffering, and +raster reclassification. Remote sensing and image processing tasks +include image enhancement (e.g. panchromatic sharpening, contrast +adjustments), image mosaicing, numerous filtering operations, +simple classification (k-means), and common image transformations. +WhiteboxTools also contains advanced tooling for spatial hydrological +analysis (e.g. flow-accumulation, watershed delineation, stream +network analysis, sink removal), terrain analysis (e.g. common terrain +indices such as slope, curvatures, wetness index, hillshading; +hypsometric analysis; multi-scale topographic position analysis), +and LiDAR data processing. LiDAR point clouds can be interrogated +(LidarInfo, LidarHistogram), segmented, tiled and joined, analyized +for outliers, interpolated to rasters (DEMs, intensity images), and +ground-points can be classified or filtered. WhiteboxTools is not +a cartographic or spatial data visualization package; instead it is +meant to serve as an analytical backend for other data visualization +software, mainly GIS. diff --git a/gis/whitebox-tools/whitebox-tools.SlackBuild b/gis/whitebox-tools/whitebox-tools.SlackBuild index 6b75738776..4648b0d44f 100644 --- a/gis/whitebox-tools/whitebox-tools.SlackBuild +++ b/gis/whitebox-tools/whitebox-tools.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for whitebox-tools -# Copyright 2019 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=whitebox-tools BINNAM=`echo $PRGNAM | tr - _` -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -42,7 +45,14 @@ if [ -z "$ARCH" ]; then fi fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -131,6 +141,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +CARGO_HOME=.cargo \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ cargo build --offline --release $CARGOTARGET @@ -144,7 +155,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a -r \ - LICENSE.txt README.md manual/WhiteboxToolsManual.html manual/img \ + LICENSE.txt README.md readme.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -152,4 +163,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/whitebox-tools/whitebox-tools.info b/gis/whitebox-tools/whitebox-tools.info index 46ba28c4a8..7750b688ed 100644 --- a/gis/whitebox-tools/whitebox-tools.info +++ b/gis/whitebox-tools/whitebox-tools.info @@ -1,155 +1,199 @@ PRGNAM="whitebox-tools" -VERSION="1.1.0" +VERSION="1.5.0" HOMEPAGE="https://github.com/jblindsay/whitebox-tools" -DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/v1.1.0/whitebox-tools-1.1.0.tar.gz \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/alga/alga-0.9.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.3.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/build_const/build_const-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2/bzip2-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/c2-chacha/c2-chacha-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.31.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crc/crc-1.8.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/kdtree/kdtree-0.6.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.58.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libflate/libflate-0.1.21.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libm/libm-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lzw/lzw-0.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/matrixmultiply/matrixmultiply-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide_c_api/miniz_oxide_c_api-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/msdos_time/msdos_time-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nalgebra/nalgebra-0.18.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-complex/num-complex-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.39.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/podio/podio-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.27.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.3.23.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.6.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_distr/rand_distr-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_isaac/rand_isaac-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_jitter/rand_jitter-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_os/rand_os-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rawpointer/rawpointer-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.51.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.94.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.94.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.40.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/spin/spin-0.5.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/statrs/statrs-0.9.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.29.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/typenum/typenum-1.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.3.3.crate" -MD5SUM="fa7b12c1f8fc9f2aa0f6b9ac24628e23 \ - 94e5e4da83397101dcac50eba7f31787 \ - 7570fe821ac7fac7fc9aaac09e1df5a2 \ +DOWNLOAD="https://github.com/jblindsay/whitebox-tools/archive/1.5.0/whitebox-tools-1.5.0.tar.gz \ + https://static.crates.io/crates/adler/adler-0.2.3.crate \ + https://static.crates.io/crates/adler32/adler32-1.2.0.crate \ + https://static.crates.io/crates/alga/alga-0.9.3.crate \ + https://static.crates.io/crates/alloc-no-stdlib/alloc-no-stdlib-2.0.1.crate \ + https://static.crates.io/crates/alloc-stdlib/alloc-stdlib-0.2.1.crate \ + https://static.crates.io/crates/approx/approx-0.3.2.crate \ + https://static.crates.io/crates/autocfg/autocfg-0.1.7.crate \ + https://static.crates.io/crates/autocfg/autocfg-1.0.1.crate \ + https://static.crates.io/crates/bitflags/bitflags-1.2.1.crate \ + https://static.crates.io/crates/brotli/brotli-3.3.0.crate \ + https://static.crates.io/crates/brotli-decompressor/brotli-decompressor-2.3.1.crate \ + https://static.crates.io/crates/byteorder/byteorder-1.4.2.crate \ + https://static.crates.io/crates/bzip2/bzip2-0.3.3.crate \ + https://static.crates.io/crates/bzip2-sys/bzip2-sys-0.1.10+1.0.8.crate \ + https://static.crates.io/crates/cc/cc-1.0.66.crate \ + https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \ + https://static.crates.io/crates/chrono/chrono-0.4.19.crate \ + https://static.crates.io/crates/cloudabi/cloudabi-0.0.3.crate \ + https://static.crates.io/crates/const_fn/const_fn-0.4.5.crate \ + https://static.crates.io/crates/crc32fast/crc32fast-1.2.1.crate \ + https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.0.crate \ + https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.0.crate \ + https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.1.crate \ + https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \ + https://static.crates.io/crates/either/either-1.6.1.crate \ + https://static.crates.io/crates/flate2/flate2-1.0.20.crate \ + https://static.crates.io/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \ + https://static.crates.io/crates/generic-array/generic-array-0.12.3.crate \ + https://static.crates.io/crates/getrandom/getrandom-0.1.16.crate \ + https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.18.crate \ + https://static.crates.io/crates/itoa/itoa-0.4.7.crate \ + https://static.crates.io/crates/kdtree/kdtree-0.6.0.crate \ + https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \ + https://static.crates.io/crates/libc/libc-0.2.86.crate \ + https://static.crates.io/crates/libm/libm-0.2.1.crate \ + https://static.crates.io/crates/lzw/lzw-0.10.0.crate \ + https://static.crates.io/crates/matrixmultiply/matrixmultiply-0.2.4.crate \ + https://static.crates.io/crates/memoffset/memoffset-0.6.1.crate \ + https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.3.7.crate \ + https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.4.3.crate \ + https://static.crates.io/crates/msdos_time/msdos_time-0.1.6.crate \ + https://static.crates.io/crates/nalgebra/nalgebra-0.18.1.crate \ + https://static.crates.io/crates/num-complex/num-complex-0.2.4.crate \ + https://static.crates.io/crates/num-integer/num-integer-0.1.44.crate \ + https://static.crates.io/crates/num-rational/num-rational-0.2.4.crate \ + https://static.crates.io/crates/num-traits/num-traits-0.2.14.crate \ + https://static.crates.io/crates/num_cpus/num_cpus-1.13.0.crate \ + https://static.crates.io/crates/pdqselect/pdqselect-0.1.0.crate \ + https://static.crates.io/crates/pest/pest-2.1.3.crate \ + https://static.crates.io/crates/pkg-config/pkg-config-0.3.19.crate \ + https://static.crates.io/crates/podio/podio-0.1.7.crate \ + https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.10.crate \ + https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.24.crate \ + https://static.crates.io/crates/quote/quote-1.0.8.crate \ + https://static.crates.io/crates/rand/rand-0.3.23.crate \ + https://static.crates.io/crates/rand/rand-0.4.6.crate \ + https://static.crates.io/crates/rand/rand-0.6.5.crate \ + https://static.crates.io/crates/rand/rand-0.7.3.crate \ + https://static.crates.io/crates/rand_chacha/rand_chacha-0.1.1.crate \ + https://static.crates.io/crates/rand_chacha/rand_chacha-0.2.2.crate \ + https://static.crates.io/crates/rand_core/rand_core-0.3.1.crate \ + https://static.crates.io/crates/rand_core/rand_core-0.4.2.crate \ + https://static.crates.io/crates/rand_core/rand_core-0.5.1.crate \ + https://static.crates.io/crates/rand_distr/rand_distr-0.2.2.crate \ + https://static.crates.io/crates/rand_hc/rand_hc-0.1.0.crate \ + https://static.crates.io/crates/rand_hc/rand_hc-0.2.0.crate \ + https://static.crates.io/crates/rand_isaac/rand_isaac-0.1.1.crate \ + https://static.crates.io/crates/rand_jitter/rand_jitter-0.1.4.crate \ + https://static.crates.io/crates/rand_os/rand_os-0.1.3.crate \ + https://static.crates.io/crates/rand_pcg/rand_pcg-0.1.2.crate \ + https://static.crates.io/crates/rand_pcg/rand_pcg-0.2.1.crate \ + https://static.crates.io/crates/rand_xorshift/rand_xorshift-0.1.1.crate \ + https://static.crates.io/crates/rawpointer/rawpointer-0.2.1.crate \ + https://static.crates.io/crates/rayon/rayon-1.5.0.crate \ + https://static.crates.io/crates/rayon-core/rayon-core-1.9.0.crate \ + https://static.crates.io/crates/rdrand/rdrand-0.4.0.crate \ + https://static.crates.io/crates/rstar/rstar-0.7.1.crate \ + https://static.crates.io/crates/rustc_version/rustc_version-0.3.3.crate \ + https://static.crates.io/crates/ryu/ryu-1.0.5.crate \ + https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \ + https://static.crates.io/crates/semver/semver-0.11.0.crate \ + https://static.crates.io/crates/semver-parser/semver-parser-0.10.2.crate \ + https://static.crates.io/crates/serde/serde-1.0.123.crate \ + https://static.crates.io/crates/serde_derive/serde_derive-1.0.123.crate \ + https://static.crates.io/crates/serde_json/serde_json-1.0.64.crate \ + https://static.crates.io/crates/statrs/statrs-0.9.0.crate \ + https://static.crates.io/crates/syn/syn-1.0.60.crate \ + https://static.crates.io/crates/time/time-0.1.44.crate \ + https://static.crates.io/crates/typenum/typenum-1.12.0.crate \ + https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.3.crate \ + https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.1.crate \ + https://static.crates.io/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \ + https://static.crates.io/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \ + https://static.crates.io/crates/winapi/winapi-0.3.9.crate \ + https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ + https://static.crates.io/crates/zip/zip-0.3.3.crate" +MD5SUM="58e6a008c05b16aca79fb6a79f4679f6 \ + c9d0c8f38c6686e47c29fe9b409c25c2 \ + d5898ddb1e496ff0ac50b79829311e76 \ + 1f6ec6a2e7b169d66d6db72cac5f413b \ + 0a15f45e4be162bae1d3862c5914ef65 \ + 90cccf8d60bcf15d3a82624791b4c818 \ 711b149cf4767597fc265983750f4da3 \ - 3664ceb4b5c686f1adabe1f57931c425 \ - b06fb4397c2a873a4034136154da23c8 \ - 39ef2c15a85f895d18ca6088a7a6d0bd \ - e5ff029879cdacd29148cd31da1f0564 \ + 898079c1c795b5aa847169137918c7bc \ + c6443ec8d007c729ba5482008d0c864d \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + 4a7c879f56227b39214534910f842c3d \ + 9fa41e9d738f538d8b97c56387b43369 \ + c0c854d9b92b342470c85564612651fb \ e0bf3b40b2d51cb52f40647b368efb50 \ - 43c46e86e471f6a4e7bdaea0d6505c27 \ - 0b69cb58ef22bbc1ccfed55414d57e6e \ - 285a97bd000d85a77550c8bfb5f77022 \ - 0cd2bb93a82da2e4ca526b40ae8b341e \ - ed2b1c5fd000f926c2aedb0c3bd1d199 \ + 5ea2a4ba48acaacc6f161853f2843997 \ + b3ebb5d4433417e998d982d46334a6f4 \ + 74634128440dbc3766bda76fdf0aaa05 \ + 1581b390d17f6e73a43ffc8a7b009e57 \ 1c8b50f8528dd37df7d984e0e4b61bd5 \ - c07d2bd46a0fb313b00d1241e6024527 \ - 3c153e21729b743f5127dec47670de17 \ - 75921f600f249787a5de588658c85ece \ + 9dfc93061fe28cb086419887d4d3f5ee \ + e5b87a7cd8e16e7f46ee58f0e75c026a \ + 8248cc4466ea3a77b9c2666ed4fc7963 \ + e38f9483da311ab0e0811a12201dfa1a \ + 9ae7be25dee514b764ee2f73c2a90791 \ + 9e1f73325eeb9647ee68eeaa4bff975c \ + b4e2b229c362ad0dd313ff631816d5db \ + 7881509413936dc7382f9314f632787e \ 27260b46db6b9ac40318143d70a80ba3 \ 916a6c827f4f0f64b7652bebf67d82e1 \ - 557ae69b35db96e1eecd55f0eb7d882d \ - 7bebca3c6217218fb42f89544d1499db \ + 15d3113e5507c411419fa64f6b9d5349 \ + 2c4bc5c16b345ce4d4bbf977577fab35 \ + 4379362bf1be77d47a45c7223a01eead \ 412752575d11aefd8c262075407f5cc1 \ - 1c9fee8f180b6f3402849983a45bbd6d \ - 0c5dc0c601d5590f3ec6da338abc7892 \ - a8c93f9d6a66e262256d11eb95b4166f \ - fe7ea70517100bd8245a832c8f7b31ca \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 04f84e88732a1057a37b5d01c23eac1d \ + 5b23904f9579d1efd0e914257517eeb5 \ 7d95c53a33d0c550267b89a19899a6fa \ - f5f1c012d3782cc29a313c1f48f16827 \ - fe33a1d480c7fa982798121af1b52560 \ - e14545924532043c93b0b66d373c03f7 \ + 0affb9ab3799eec15c6381eae808dcaa \ + a7a8c0f9d8d00f65fabad79005560dfa \ + db1ea84c5ee1938888b78e4050dd5cfd \ + c291ac2f4465c030c058a7c1bc595783 \ c24b5fe087abe69f7548a9e6c8789d61 \ - 67172dd04f8e86193ebfed2883959fdb \ - 226c780e8380cab74202d872d5f3519a \ - 4092ed5c67c6ff1c6a7bcf463bc40a53 \ - c802dfc397819893a4b50e37aac5fa38 \ - 9fc51e79791f918b643e3802a2e0e88f \ - 7261ce43635fd9c2a009810db04d6901 \ - 38e4f8192b3d45f5858fc1fdd2eff9a0 \ - 4692e7114db87556e0edd3750cdef9ac \ - ed68fecc548f1bd3e6415764c21af10c \ + e7be05acf53dc7d372d012d7ac673073 \ + 25a9c25700c416af66082afbd9187bb7 \ + a8ec1126ef06244ac1e3773981a005f1 \ + 99e024622d98dc28a8a5f37afccaf20a \ + c0e036fd990d0c9cae11b5876a5cb572 \ + c36d452e37c73b1e99f40bae18cddfdb \ + 899e132d3e99c2d79d0784d61ee8895f \ + 37cf6acd1c3259eefeba636e4cc9b365 \ + 448bc61aee07661464d98da7660e9a1d \ + 284d2ece16c067ac0a2dc88361461a78 \ + a4ff7abd41c57dfd24bbd4b50edb848f \ + 0736e4f76f4f8f0a29563b0608ca3974 \ + ddd3199850a8a6a8db642923ed603a99 \ 7c547f7b390ef6b68f99e4055658c0ec \ 9e99a37f8c37bb953732ef46ac2b12a1 \ 793627c8c18012ad77cb3e81fa4c2195 \ - 11a4a43f912049783610c41f869c107c \ + 66d1cb32dce999907409f636f004b884 \ 3ab5a79607a4d260bf61cd99dc82ab05 \ - 4301a2417b2206ecbb76464241ea346e \ + 0a80ed36a125ac3cdfa09f8707055873 \ 8cab41822d03dfa674870315308fa392 \ - 7058895bdca83bbda052d66b087f902e \ - f363654e5432d1763b32038d05178ad2 \ - 8abe0a9674c461578988dfac8449f2e9 \ + 35ddcd36701a1a6711cc3aec85909f41 \ + a0f55fda89c0f97784edb18f4c253a49 \ + caa57442578f90341a6ab7bf94d4fde9 \ 28b1e6d15e1ba8cf3a2e953ce7fcd3de \ b269356e8646f3184a0e8d52a58cee69 \ 74b15f1928431937f14ed91fdc12b542 \ 2255d3d9a603e177985602a7df1c5bbc \ 5acfdc8656212bce8df1bcc43db34c3d \ f9e08a49715c401602243230b28d86f0 \ - d8680dd5ceb14c15b349b0d784d0d80c \ + 7b0715affe44616a992f113ad7ab7d50 \ 7826deb76941fc36c2391951bd65ba47 \ - 001b4b817de9ee1ddff4bb374b58c110 \ + d4a05ab09e96ee8767f7409721bf65b8 \ + e4e9750df83fa662872061952e155d9a \ + 21235a4cec107822e39c144242a95bf1 \ c8d655d206cbe48b84a22544d6fc6d15 \ - 3056ab938614a0a76bd60dff8bb3b519 \ - 93bda82e007e0f4b4d095ca18e44daec \ - 82dfbbc63c5457d12882e389242dc5f6 \ - 0e2785025e684617366cb223fc918776 \ - 6371404de18adcd43f867fdf84df1699 \ - b90179ab2a10cd69bdde848fc4d5249e \ + 57d8084d93aec796d98691e654c5e0f6 \ + 93aeba00993f0ed8c474864e455cf584 \ + a69721c73263cd2040e1a5f120b03a6f \ + b4a0a98a54439a5a37952c8879187ee3 \ + d2cc4e584ed64165fc56d2c9081eb3ee \ + 42408be0352a76b14f1e77a6b8858a77 \ + e16bb0d9c46839fbf5d1a69673b00c4c \ + 6ec70075835fed0250bc4407f32d5928 \ + a48bad155fe3ba9bfb2e7c1920bb0d2d \ 9503719444b058de7c3032aa7dc2b6f8 \ - 6a20f74784be5bc490b3a67e0e3a7367 \ - 3d311d2cedf2d3d7b11b32baf470b178 \ - 8c243967473d6a14ee401073c9c9b83b \ - 5aaf04f9a94a6450e3e4963ddd62b92d \ - 40909511b3d0e2dba891f438715808d0 \ + c72a927acc4cc7695ae9c73c19964a6f \ + c6c50e4feea5f4cc4e1fb3c7e88606a5 \ + 55927226b06f62ccbd2890269d68c2fd \ + 6cae4969689ecc3b4b4c31a9fb9539a6 \ + a51c43692084979295641a7ffba4b297 \ + 6e23e0eee42b1ba9ec61a6db7ec2dc08 \ + a312b55a428f827a91097d1d8497b02b \ + 0498c4a11448bfc35dc7bb2caa64c753 \ db96b50050277bf05a3c68534bbb9586 \ 09de9d01e7331ff3da11f58be8bef0df \ 0ac2781d3a2021cdabd68fb7e38589aa" diff --git a/gis/xplanet/README b/gis/xplanet/README index 641dae6637..5b6e8de9e7 100644 --- a/gis/xplanet/README +++ b/gis/xplanet/README @@ -1,8 +1,8 @@ -Xplanet renders planetary and solar system images. It can be used to create -computer wallpapers or single images. Xplanet can show city names, overlay -cloud maps or display which regions of Earth are day or night. Xplanet can -be used to produce projected maps based on several projections, such as -mollweide, which show the whole earth at once, or mercator, which is -rectangular and is suitable for filling the screen. +Xplanet renders planetary and solar system images. It can be used to +create computer wallpapers or single images. Xplanet can show city +names, overlay cloud maps or display which regions of Earth are day or +night. Xplanet can be used to produce projected maps based on several +projections, such as mollweide, which show the whole earth at once, or +mercator, which is rectangular and is suitable for filling the screen. See /usr/share/xplanet for maps, config files, scripts, and so on. diff --git a/gis/xplanet/xplanet.SlackBuild b/gis/xplanet/xplanet.SlackBuild index 1b1c7599f1..9d7bc4e376 100644 --- a/gis/xplanet/xplanet.SlackBuild +++ b/gis/xplanet/xplanet.SlackBuild @@ -1,13 +1,15 @@ -#!/bin/sh +#!/bin/bash # Written by Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # Based on http://slackbuilds.org/template.SlackBuild +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=xplanet VERSION=${VERSION:-1.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} -CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -20,6 +22,11 @@ if [ -z "$ARCH" ]; then esac fi +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -83,4 +90,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |