diff options
Diffstat (limited to 'academic/grass/grass.SlackBuild')
| -rw-r--r-- | academic/grass/grass.SlackBuild | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/academic/grass/grass.SlackBuild b/academic/grass/grass.SlackBuild index fffbf3cbc5..86041b6f92 100644 --- a/academic/grass/grass.SlackBuild +++ b/academic/grass/grass.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=grass -VERSION=${VERSION:-6.4.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-6.4.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -92,7 +92,9 @@ while [[ "$1" != "" ]]; do shift ;; ffmpeg ) - FFINCL="/usr/include/libavcodec /usr/include/libavformat /usr/include/libswscale" + FFINCL="/usr/include/libavcodec /usr/include/libavdevice /usr/include/libavfilter \ + /usr/include/libavformat /usr/include/libavutil /usr/include/libpostproc \ + /usr/include/libswresample /usr/include/libswscale" WITHLIST[$((withnum++))]="--with-ffmpeg" WITHLIST[$((withnum++))]="--with-ffmpeg-includes=$FFINCL" shift @@ -109,15 +111,6 @@ else BITNESS="" fi -# gcc-4.7 patch from grass svn, see http://trac.osgeo.org/grass/ticket/1533 -patch -p3 < $CWD/changeset_r50130.diff - -# 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" \ |