From 588a67b546aaf03bc6cabdbe45fc0e1deeeb2169 Mon Sep 17 00:00:00 2001
From: Nishant Limbachia <nishant@mnspace.net>
Date: Mon, 30 Jan 2012 00:12:45 -0600
Subject: graphics/dcraw: Updated for version 9.12.

Note from rworkman: this commit strips my copyright notice,
and the strippage was done by me, and I'm signing off on it.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 graphics/dcraw/README           |  5 ++++-
 graphics/dcraw/dcraw.SlackBuild | 33 +++++++++++++++++++++++----------
 graphics/dcraw/dcraw.info       |  6 +++---
 3 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'graphics')

diff --git a/graphics/dcraw/README b/graphics/dcraw/README
index 20c1f42ef1..3988eaac5c 100644
--- a/graphics/dcraw/README
+++ b/graphics/dcraw/README
@@ -3,4 +3,7 @@ digital cameras.  DCRaw by itself only provides a command line interface
 for image processing.  DCRaw can also build with a gimp plugin so images
 can be edited/exported with gimp.
 
-Do this to build the gimp rawphoto plugin: RAWPHOTO=yes ./dcraw.SlackBuild
+Run the slackbuild with RAWPHOTO=yes to build the gimp rawphoto plugin
+
+Run the slackbuild with JASPER=yes to build dcraw with jasper support.
+Jasper support is disabled by default, so it is an optional dependency.
diff --git a/graphics/dcraw/dcraw.SlackBuild b/graphics/dcraw/dcraw.SlackBuild
index 2a8a0c8119..f5e8f3c275 100644
--- a/graphics/dcraw/dcraw.SlackBuild
+++ b/graphics/dcraw/dcraw.SlackBuild
@@ -3,8 +3,7 @@
 # Slackware Package Build Script for dcraw
 # Home Page http://cybercom.net/~dcoffin/dcraw
 
-# Copyright (c) 2008-2011, Nishant Limbachia, Hoffman Estates, IL, USA <nishant _AT_ mnspace _DOT_ net>
-# Copyright (c) 2007, Robby Workman <rworkman@slackbuilds.org>
+# Copyright (c) 2008-2012, Nishant Limbachia, Hoffman Estates, IL, USA <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -30,7 +29,7 @@
 # RAWPHOTO=yes ./dcraw.SlackBuild
 
 PRGNAM=dcraw
-VERSION=${VERSION:-9.08}
+VERSION=${VERSION:-9.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,19 +62,32 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# build with rawphoto gimp plugin, default is no
+RAWPHOTO=${RAWPHOTO:-no}
+# build with jasper support, default is no
+JASPER=${JASPER:-no}
+
+if [ "${JASPER}" = "yes" ]; then
+    JASPER_BUILD_FLAG="-ljasper"
+    JASPER_GCC_FLAG="-DJASPER"
+else
+    JASPER_BUILD_FLAG=""
+    JASPER_GCC_FLAG="-DNO_JASPER"
+fi
+
+
 # DCRaw build flags as suggested on the author's page.
-# builds with support for jpeg, png, lcms and tiff
-DCRAW_BUILD_FLAGS="-lm -ljpeg -llcms -lpng -ltiff"
+# builds with support for jpeg, png, lcms and tiff and optionally, jasper
+DCRAW_BUILD_FLAGS="-lm -ljpeg -llcms -lpng -ltiff $JASPER_BUILD_FLAG"
 
 set -e # Exit on most errors
 
-RAWPHOTO=${RAWPHOTO:-no}
-
-rm -fr $TMP/$PRGNAM $PKG
+rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $TMP/$PRGNAM
+mv $TMP/$PRGNAM  $TMP/$PRGNAM-$VERSION
+cd $TMP/$PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -87,7 +99,8 @@ gcc \
   $SLKCFLAGS -Wall -v \
   -o dcraw dcraw.c \
   $DCRAW_BUILD_FLAGS \
-  -DLOCALEDIR=\"/usr/share/locale/\"
+  -DLOCALEDIR=\"/usr/share/locale/\" \
+  $JASPER_GCC_FLAG
 
 install -D -m 0755 dcraw $PKG/usr/bin/dcraw
 strip --strip-unneeded $PKG/usr/bin/dcraw
diff --git a/graphics/dcraw/dcraw.info b/graphics/dcraw/dcraw.info
index 408bd962f6..35fbca9119 100644
--- a/graphics/dcraw/dcraw.info
+++ b/graphics/dcraw/dcraw.info
@@ -1,8 +1,8 @@
 PRGNAM="dcraw"
-VERSION="9.08"
+VERSION="9.12"
 HOMEPAGE="http://cybercom.net/~dcoffin/dcraw/"
-DOWNLOAD="http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.08.tar.gz"
-MD5SUM="eb1d365c27495a513c0768b2f696ba66"
+DOWNLOAD="http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.12.tar.gz"
+MD5SUM="917fee61e1509b935a8b8ff08b067b5f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
-- 
cgit v1.2.3