diff options
Diffstat (limited to 'gis/grass')
| -rw-r--r-- | gis/grass/README | 22 | ||||
| -rw-r--r-- | gis/grass/gdal-3.3.patch | 84 | ||||
| -rw-r--r-- | gis/grass/grass.SlackBuild | 22 | ||||
| -rw-r--r-- | gis/grass/grass.info | 2 |
4 files changed, 112 insertions, 18 deletions
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..2ffb4f5b84 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 @@ -188,9 +200,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Desktop: mkdir -p $PKG/usr/share/applications -cp -a \ - $CWD/$PRGNAM.desktop \ - $PKG/usr/share/applications/$PRGNAM.desktop +install -D -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/share/pixmaps cp -a \ gui/icons/$PRGNAM-64x64.png \ @@ -206,4 +216,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" |