diff options
Diffstat (limited to 'academic/grass/grass.SlackBuild')
| -rw-r--r-- | academic/grass/grass.SlackBuild | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/academic/grass/grass.SlackBuild b/academic/grass/grass.SlackBuild index 5e35f15657..fffbf3cbc5 100644 --- a/academic/grass/grass.SlackBuild +++ b/academic/grass/grass.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=grass VERSION=${VERSION:-6.4.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -78,12 +78,11 @@ while [[ "$1" != "" ]]; do in blas | \ lapack | \ - geos | \ sqlite ) WITHLIST[$((withnum++))]="--with-$1" shift ;; - mysql ) + mysql | mariadb ) WITHLIST[$((withnum++))]="--with-mysql" WITHLIST[$((withnum++))]="--with-mysql-includes=/usr/include/mysql" shift @@ -111,12 +110,15 @@ else fi # gcc-4.7 patch from grass svn, see http://trac.osgeo.org/grass/ticket/1533 -sed -i 's/mm.cpp/mm.cc/' $CWD/changeset_r50130.diff patch -p3 < $CWD/changeset_r50130.diff -# ffmpeg-0.8 patch from Gentoo, see https://bugs.gentoo.org/show_bug.cgi?id=392371#c9 -# it's good for ffmpeg-0.10 too ;-) -patch -p1 < $CWD/gentoo392371b.patch +# ffmpeg-0.11 patches, snarfed from Gentoo (thanks!) +patch -p1 < $CWD/grass-6.4.2-configure-slack.patch +patch -p1 < $CWD/grass-6.4.1-libav-0.8.patch +patch -p1 < $CWD/grass-6.4.2-libav-9.patch +patch -p1 < $CWD/grass-6.4.2-ffmpeg-1.patch + +# geos now always enabled: it's an indirect hard dep (via gdal), and makes grass nicer :-) CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -fpermissive" \ LDFLAGS="-ldl -lncurses" \ @@ -131,6 +133,7 @@ LDFLAGS="-ldl -lncurses" \ --with-proj-share=/usr/share/proj \ --with-cairo \ --with-wxwidgets \ + --with-geos \ --enable-largefile \ "${WITHLIST[@]}" \ $BITNESS \ |