update darktable to 1.0.3

Changes since 1.0:

Usability improvements:
- Filmstrip centers on selected image

Behavioral changes:
- Improved (hierarchical) tag export for flickr and friends

Camera support:
- Improved Sony NEX-7 support
- Initial camera support for Nikon D800 and Sony SLT-A57 (color rendition
  of these cameras might still be suboptimal due to the lack of a proper
  color matrix, and is subject to future change.)
- White balance updates for Canon EOS Rebel T3, Olympus E-5 & Nikon D800

Platform support:
- Fixes for FreeBSD

Various:
- New subtle denoise preset for equalizer
- Various build fixes
- Numerous other fixes

8 files changed, 67 insertions, 68 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index e7096793e8b..8a13141b599 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/04/27 12:31:49 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/05/05 19:18:33 jakllsch Exp $
 
-DISTNAME=	darktable-1.0
-PKGREVISION=	2
+DISTNAME=	darktable-1.0.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darktable/}
 
@@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config bash
 
 CMAKE_ARGS+=	-DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
 CMAKE_ARGS+=	-DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 394e32d6f9c..8ee16c145ad 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.7 2012/03/16 00:35:01 jakllsch Exp $
+$NetBSD: distinfo,v 1.8 2012/05/05 19:18:33 jakllsch Exp $
 
-SHA1 (darktable-1.0.tar.gz) = 3142beea51d5d5ae6f0089a11cf1b342a48a69f7
-RMD160 (darktable-1.0.tar.gz) = ef787b4b3276594e6e1e51272abaa374ea494aeb
-Size (darktable-1.0.tar.gz) = 2535774 bytes
-SHA1 (patch-cmake_modules_FindGTK2.cmake) = de1273594801ab82da31b624845e0b36a77b53b3
-SHA1 (patch-data_CMakeLists.txt) = f40f99c07ccbd3d025e7865cf7647c7b218c7d56
-SHA1 (patch-doc_CMakeLists.txt) = 7b7af1dda752725d5b42ba4395de1cd5390c64fd
-SHA1 (patch-src_CMakeLists.txt) = 51a332f2e66b5f00f37af45b74f994f90da2d03f
-SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 1217d6bf0b14b538d39e9bfe9fa70e2f7bffbfc5
-SHA1 (patch-src_control_jobs_control__jobs.c) = 77bfbc6450d848d720bfabcef66b7a0199c9d67c
-SHA1 (patch-src_develop_blend.c) = 7411edf0903bbed7b4afcb82bc5c650100f23755
-SHA1 (patch-src_rawspeed_RawSpeed_Common.h) = c7dfc4e65ea46e7318d3d5ebdab6dcb5491c1c48
-SHA1 (patch-tools_create__preferences.sh.in) = f66cf9b653156e521a053b499abbde07a30852a3
+SHA1 (darktable-1.0.3.tar.gz) = f03b250be74965745b1a267bdd696b406aa97f7c
+RMD160 (darktable-1.0.3.tar.gz) = 9bb352e868387dc1b7c78476861299e27c09c33c
+Size (darktable-1.0.3.tar.gz) = 2538467 bytes
+SHA1 (patch-cmake_modules_FindGTK2.cmake) = 8ac3230abae3a462428c27b00b92d9167db901ef
+SHA1 (patch-doc_CMakeLists.txt) = 191db21c77208ae176fa64c616913240f9fa269b
+SHA1 (patch-src_CMakeLists.txt) = da62516e65b1c14eec4264fa603d9bdbd2e5d668
+SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 985b5006209dfef8007cea0961581f963ac5b887
+SHA1 (patch-src_common_imageio__rgbe.c) = 71ac4e58bd89310323c25464bda8cb7a46c597cb
+SHA1 (patch-src_control_jobs_control__jobs.c) = 418bc906d7fb54d6c55060bf60f0e24b6b9d1f12
+SHA1 (patch-src_develop_blend.c) = 76df39e900577cbb54ccdd307bce51ee959c65e2
+SHA1 (patch-src_iop_lens.c) = 2c6613c4d46ec13085535e1106c32380e8fac1dc
+SHA1 (patch-src_rawspeed_RawSpeed_Common.h) = 85162b55744ff7c2282a29402c7842fabe9a9c48
diff --git a/graphics/darktable/patches/patch-data_CMakeLists.txt b/graphics/darktable/patches/patch-data_CMakeLists.txt
deleted file mode 100644
index 0638746698b..00000000000
--- a/graphics/darktable/patches/patch-data_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-data_CMakeLists.txt,v 1.1 2012/03/16 00:35:01 jakllsch Exp $
-
---- data/CMakeLists.txt.orig	2012-03-13 21:29:39.000000000 +0000
-+++ data/CMakeLists.txt
-@@ -72,7 +72,7 @@ install(FILES gdb_commands DESTINATION $
-         COMMAND 
-           join -1 1 -2 1 -o 1.2 2.2 ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_keys ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_values | 
-           sed -e 's/ /=/g' > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_in
--          || (echo "*** error: please check if you have coreutils installed! we need grep, sed, nl, and join ***" &1>&2 | false)
-+          || (echo "*** error: please check if you have coreutils installed! we need grep, sed, nl, and join ***" 1>&2 ; false)
-           && grep plugins ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_in > /dev/null && mv ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_in ${CMAKE_CURRENT_BINARY_DIR}/darktablerc
-           # only move over if something is in there at all.
-         
-@@ -84,7 +84,7 @@ install(FILES gdb_commands DESTINATION $
-         COMMAND 
-           join -1 1 -2 1 -o '1.2 2.2' ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_keys ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_values | 
-           sed -e 's/ /=/g' > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_in
--          || (echo "*** error: please check if you have coreutils installed! we need grep, sed, nl, and join ***" &1>&2 | false)
-+          || (echo "*** error: please check if you have coreutils installed! we need grep, sed, nl, and join ***" 1>&2 ; false)
-           && grep plugins ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_in > /dev/null && mv ${CMAKE_CURRENT_BINARY_DIR}/darktablerc_in ${CMAKE_CURRENT_BINARY_DIR}/darktablerc
-           # only move over if something is in there at all.
-         
diff --git a/graphics/darktable/patches/patch-src_CMakeLists.txt b/graphics/darktable/patches/patch-src_CMakeLists.txt
index f198c656a62..eaad35329f0 100644
--- a/graphics/darktable/patches/patch-src_CMakeLists.txt
+++ b/graphics/darktable/patches/patch-src_CMakeLists.txt
@@ -1,18 +1,10 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.5 2012/03/16 00:35:01 jakllsch Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.6 2012/05/05 19:18:33 jakllsch Exp $
 
 Various thing to possibly improve portability.
 
---- src/CMakeLists.txt.orig	2012-03-13 21:29:39.000000000 +0000
+--- src/CMakeLists.txt.orig	2012-04-27 20:25:52.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -235,36 +235,43 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
- 
- if(NOT APPLE)
-   # apple build fails on deprecated warnings..
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-+  #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
- endif(NOT APPLE)
- 
- if(NOT WIN32)
+@@ -242,36 +242,37 @@ if(NOT WIN32)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
  endif(NOT WIN32)
  
@@ -47,15 +39,22 @@ Various thing to possibly improve portability.
 +	endif()
  endif()
  
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse -g")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -g")
 -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
 +set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -ffast-math -fexpensive-optimizations ${MARCH}")
  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse -g")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -g")
 -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -ffast-math -fexpensive-optimizations ${MARCH}")
  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
-   
+-if(CMAKE_COMPILER_IS_GNUCC)
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
+-endif()
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
+-endif()
  
+ #
+ # Generate config.h
diff --git a/graphics/darktable/patches/patch-src_common_imageio__rgbe.c b/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
new file mode 100644
index 00000000000..09936a9967c
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_common_imageio__rgbe.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_imageio__rgbe.c,v 1.1 2012/05/05 19:18:33 jakllsch Exp $
+
+--- src/common/imageio_rgbe.c.orig	2012-04-27 20:25:52.000000000 +0000
++++ src/common/imageio_rgbe.c
+@@ -189,7 +189,7 @@ int RGBE_ReadHeader(FILE *fp, int *width
+     info->valid |= RGBE_VALID_PROGRAMTYPE;
+     for(i=0; i<sizeof(info->programtype)-1; i++)
+     {
+-      if ((buf[i+2] == 0) || isspace(buf[i+2]))
++      if ((buf[i+2] == 0) || isspace((unsigned char)buf[i+2]))
+         break;
+       info->programtype[i] = buf[i+2];
+     }
diff --git a/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c b/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
index f14721c0321..5868d8bf006 100644
--- a/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
+++ b/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_control_jobs_control__jobs.c,v 1.2 2012/03/16 00:35:01 jakllsch Exp $
+$NetBSD: patch-src_control_jobs_control__jobs.c,v 1.3 2012/05/05 19:18:33 jakllsch Exp $
 
---- src/control/jobs/control_jobs.c.orig	2012-03-13 21:29:39.000000000 +0000
+--- src/control/jobs/control_jobs.c.orig	2012-04-27 20:25:52.000000000 +0000
 +++ src/control/jobs/control_jobs.c
-@@ -546,7 +546,7 @@ int32_t dt_control_export_job_run(dt_job
+@@ -534,7 +534,7 @@ int32_t dt_control_export_job_run(dt_job
    // GCC won't accept that this variable is used in a macro, considers
    // it set but not used, which makes for instance Fedora break.
    const __attribute__((__unused__)) int num_threads = MAX(1, MIN(full_entries, 8));
diff --git a/graphics/darktable/patches/patch-src_iop_lens.c b/graphics/darktable/patches/patch-src_iop_lens.c
new file mode 100644
index 00000000000..470b48719bb
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_iop_lens.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_iop_lens.c,v 1.1 2012/05/05 19:18:33 jakllsch Exp $
+
+--- src/iop/lens.c.orig	2012-04-27 20:25:52.000000000 +0000
++++ src/iop/lens.c
+@@ -842,7 +842,7 @@ static void parse_maker_model (
+ {
+   const gchar *sep;
+ 
+-  while (txt [0] && isspace (txt [0]))
++  while (txt [0] && isspace ((unsigned char)txt [0]))
+     txt++;
+   sep = strchr (txt, ',');
+   if (sep)
+@@ -853,7 +853,7 @@ static void parse_maker_model (
+     memcpy (make, txt, len);
+     make [len] = 0;
+ 
+-    while (*++sep && isspace (sep [0]))
++    while (*++sep && isspace ((unsigned char)sep [0]))
+       ;
+     len = strlen (sep);
+     if (len > sz_model - 1)
diff --git a/graphics/darktable/patches/patch-tools_create__preferences.sh.in b/graphics/darktable/patches/patch-tools_create__preferences.sh.in
deleted file mode 100644
index 9f75cba1db4..00000000000
--- a/graphics/darktable/patches/patch-tools_create__preferences.sh.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-tools_create__preferences.sh.in,v 1.1 2012/03/16 00:35:01 jakllsch Exp $
-
-We don't want to depend on bash.
-
---- tools/create_preferences.sh.in.orig	2012-03-13 21:29:39.000000000 +0000
-+++ tools/create_preferences.sh.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- tabs='gui core'
-