From fa8f34de382f52c2d4b0f91b14b2932f363c0027 Mon Sep 17 00:00:00 2001
From: David Spencer
Date: Sun, 26 Jan 2014 22:06:36 +0100
Subject: graphics/darktable: Updated for version 1.4.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 graphics/darktable/README                         |  3 ++-
 graphics/darktable/darktable-0.9.x_libpaths.patch | 24 -----------------------
 graphics/darktable/darktable.SlackBuild           | 14 ++++++-------
 graphics/darktable/darktable.info                 |  6 +++---
 4 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 graphics/darktable/darktable-0.9.x_libpaths.patch

(limited to 'graphics/darktable')

diff --git a/graphics/darktable/README b/graphics/darktable/README
index bce0c3aef2..25a2f3df67 100644
--- a/graphics/darktable/README
+++ b/graphics/darktable/README
@@ -11,7 +11,8 @@ To run darktable, your processor must support SSE2 instructions
 The following are optional dependencies:
 
 GraphicsMagick - for importing a wide range of non-RAW image formats
-openjpeg - for exporting images in JPEG 2000 format
+openjpeg  - for exporting images in JPEG 2000 format
+libwebp   - for exporting images in WebP format
 flickcurl - for exporting images to Flickr
 json-glib - for exporting images to Facebook
 
diff --git a/graphics/darktable/darktable-0.9.x_libpaths.patch b/graphics/darktable/darktable-0.9.x_libpaths.patch
deleted file mode 100644
index 1dfb45da6d..0000000000
--- a/graphics/darktable/darktable-0.9.x_libpaths.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r darktable-0.9.2//cmake/modules/FindGTK2.cmake darktable-0.9.2-patched//cmake/modules/FindGTK2.cmake
---- darktable-0.9.2//cmake/modules/FindGTK2.cmake	2011-08-24 10:20:29.000000000 +0100
-+++ darktable-0.9.2-patched//cmake/modules/FindGTK2.cmake	2011-08-29 21:10:41.758237394 +0100
-@@ -170,8 +170,6 @@
-  /usr/lib/i386-linux-gnu/
-  /usr/lib/x86_64-linux-gnu/
-  # end fix for Ubuntu >= 11.04 (Natty Narwhal)
--        # look in debian/ubuntu multi-arch path (needs cmake >= 2.85~rc2)
--        /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-             /usr/local/lib64
-             /usr/local/lib
-             /usr/lib64
-diff -u -r darktable-0.9.2//cmake/modules/FindGlib.cmake darktable-0.9.2-patched//cmake/modules/FindGlib.cmake
---- darktable-0.9.2//cmake/modules/FindGlib.cmake	2011-08-29 21:55:53.743097178 +0100
-+++ darktable-0.9.2-patched//cmake/modules/FindGlib.cmake	2011-08-29 21:55:09.927007977 +0100
-@@ -21,7 +21,7 @@
- find_path(GlibConfig_INCLUDE_DIR
-   NAMES glibconfig.h
-   PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /usr
--  PATH_SUFFIXES lib/glib-2.0/include ../lib/glib-2.0/include
-+  PATH_SUFFIXES lib${LIB_SUFFIX}/glib-2.0/include ../lib${LIB_SUFFIX}/glib-2.0/include
- )
- 
- # Finally the library itself
diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild
index d33ebe8b0e..1da0463ffe 100644
--- a/graphics/darktable/darktable.SlackBuild
+++ b/graphics/darktable/darktable.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=darktable
-VERSION=${VERSION:-1.2.3}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,13 +63,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Yet another package that doesn't honour lib64:
-patch -p1 < $CWD/darktable-0.9.x_libpaths.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
@@ -79,6 +76,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
+    -DDONT_USE_INTERNAL_LUA=Off \
     -DBINARY_PACKAGE_BUILD=1 \
     -DCMAKE_BUILD_TYPE=Release ..
   VERBOSE=1 make
diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info
index 5d1599f0fa..379bfdc37b 100644
--- a/graphics/darktable/darktable.info
+++ b/graphics/darktable/darktable.info
@@ -1,8 +1,8 @@
 PRGNAM="darktable"
-VERSION="1.2.3"
+VERSION="1.4"
 HOMEPAGE="http://darktable.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/darktable/darktable-1.2.3.tar.xz"
-MD5SUM="7eaa89aa5257b5f61cc7462db08ce164"
+DOWNLOAD="http://downloads.sourceforge.net/darktable/darktable-1.4.tar.xz"
+MD5SUM="896416931ded4579f528cd11edad470c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lensfun %README%"
-- 
cgit v1.2.3