4 files changed, 40 insertions, 58 deletions
diff --git a/graphics/darktable/README b/graphics/darktable/README
index 07cbb467007bf..bfaa76605ef04 100644
--- a/graphics/darktable/README
+++ b/graphics/darktable/README
@@ -5,5 +5,8 @@ and enhance them.  This project tries to fill the gap between the many
 excellent existing free raw converters and image management tools (such
 as ufraw or f-spot).
 
-This requires lensfun and GConf.  gnome-keyring is optional (if you want
-to enable it, pass GKEYRING=yes to the script).
+This requires lcms2, lensfun, and GConf.  gnome-keyring and flickcurl
+are optional.
+
+To run darktable, your processor must support SSE2 instructions
+(i.e. Pentium 4 or higher, or Athlon 64 or higher).
diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild
index 286431f476846..23543f1032146 100644
--- a/graphics/darktable/darktable.SlackBuild
+++ b/graphics/darktable/darktable.SlackBuild
@@ -5,13 +5,15 @@
 # This script is dedicated to the public domain
 
 PRGNAM=darktable
-VERSION=${VERSION:-0.7.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+#   SSE2 instructions are *required* at runtime. That's a proper subset of i686, but
+#   hopefully forcing i686 in the package name will alert users of older cpus.
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,10 +24,7 @@ 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
+if [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
@@ -38,12 +37,6 @@ fi
 
 set -e
 
-if [ ${GKEYRING:-no} = "yes" ]; then
-  WITHGKEYRING="--enable-gkeyring"
-else
-  WITHGKEYRING="--disable-gkeyring"
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -57,39 +50,42 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Suppress warning from gconf
-sed -i -e '/gettext_domain/d' darktable.schemas.in
-
-# Patch to build with exiv2-0.21.1
-patch -p1 < $CWD/exiv2-0.21.1.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 \
-  $WITHGKEYRING
-
-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 \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DBINARY_PACKAGE_BUILD=1 \
+    -DDONT_INSTALL_GCONF_SCHEMAS=On \
+    -DCMAKE_BUILD_TYPE=Release ..
+  VERBOSE=1 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
 
+# Install the gconf schema, suppressing warning messages
+mkdir -p $PKG/etc/gconf/schemas
+sed -e '/gettext_domain/d' \
+  < data/darktable.schemas \
+  > $PKG/etc/gconf/schemas/darktable.schemas
+
+# MAN_INSTALL_DIR is currently ignored :-(
+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
 
-# configure --docdir is ignored, so fix the wrongly installed docs
+# Fix the doc location too
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 # Add a few missed docs
-cp -a ChangeLog NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/ChangeLog doc/NEWS doc/TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $VERSION )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info
index 5e3de188fab82..c2e05edd3b31d 100644
--- a/graphics/darktable/darktable.info
+++ b/graphics/darktable/darktable.info
@@ -1,10 +1,10 @@
 PRGNAM="darktable"
-VERSION="0.7.1"
+VERSION="0.8"
 HOMEPAGE="http://darktable.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/darktable/darktable-0.7.1.tar.gz"
-MD5SUM="502372506fd5ee86660eff735a9f681c"
+DOWNLOAD="http://downloads.sourceforge.net/darktable/darktable-0.8.tar.gz"
+MD5SUM="1724601b0d7012a414f5398e5029cb45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/graphics/darktable/exiv2-0.21.1.patch b/graphics/darktable/exiv2-0.21.1.patch
deleted file mode 100644
index 8b85f5b44e88e..0000000000000
--- a/graphics/darktable/exiv2-0.21.1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur darktable-0.7.orig/src/common/exif.cc
-darktable-0.7/src/common/exif.cc
---- darktable-0.7.orig/src/common/exif.cc 2010-11-20 12:35:27.000000000 +0100
-+++ darktable-0.7/src/common/exif.cc 2011-01-03 19:05:34.242131001 +0100
-@@ -29,11 +29,7 @@
- #include "common/imageio.h"
- }
- // #include <libexif/exif-data.h>
--#include <exiv2/xmp.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/canonmn.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <sqlite3.h>
- #include <iostream>
- #include <fstream>