[pkgsrc/trunk]: pkgsrc/graphics/darktable Update to darktable-1.0.

[jakllsch <jakllsch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90633b5f22fc
branches:  trunk
changeset: 600886:90633b5f22fc
user:      jakllsch <jakllsch%pkgsrc.org@localhost>
date:      Fri Mar 16 00:35:01 2012 +0000

description:
Update to darktable-1.0.

changes since 0.9.3:
 * new cameras supported
 . Leica M9
 . NX100/NX5/NX10/NX11
 . Panasonic DMC-GX1
 . Pentax K-r
 . Canon Powershot S100
 . Olympus XZ-1
 . Olympus E-P3
 . Sony DSLR A330
 . Sony NEX-5N
 . Canon EOS 1000D
 . Canon EOS 600D
 . Sony Alpha 390
 . Fuji Finepix HS20EXR
 * new and updated translations (we now have chinese!)
 * new modules:
 . shadows & highlights
 . enhanced tone curve. now operates in a and b channels as well
 * refactored modules:
 . import
 . snapshots (enable sliding separation line between before/after images)
 . metadata
 * new image cache
 . faster concurrent access and insertion
 . reduces needed memory
 . more thumbnails stored on disk
 . read embedded jpegs for creating thumbnails (faster folder import)
 * increased general speed on sqlite3 (journaled, pagesize optimizations)
 * reworked, modular ui
 * keyboard shortcuts support - key accelerators (GSoC)
 * unity launcher support (ubuntu)
 * quicktool bar: exposure, presets and styles
 * new color picker
 * web gallery export now with next/prev buttons per image
 * removed gconf: not used anymore, we have our own backend
 * bugfixes

diffstat:

 graphics/darktable/Makefile                                       |  13 ++-
 graphics/darktable/PLIST                                          |  45 ++++++++-
 graphics/darktable/distinfo                                       |  17 ++-
 graphics/darktable/patches/patch-data_CMakeLists.txt              |  22 ++++
 graphics/darktable/patches/patch-data_darktable-faster            |  12 --
 graphics/darktable/patches/patch-src_CMakeLists.txt               |  45 ++++++---
 graphics/darktable/patches/patch-src_control_jobs_control__jobs.c |  21 ++--
 graphics/darktable/patches/patch-src_develop_blend.c              |  18 +--
 graphics/darktable/patches/patch-tools_create__preferences.sh.in  |  12 ++
 9 files changed, 136 insertions(+), 69 deletions(-)

diffs (truncated from 405 to 300 lines):

diff -r beac013d03a8 -r 90633b5f22fc graphics/darktable/Makefile
--- a/graphics/darktable/Makefile       Fri Mar 16 00:20:51 2012 +0000
+++ b/graphics/darktable/Makefile       Fri Mar 16 00:35:01 2012 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/03/03 00:13:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/16 00:35:01 jakllsch Exp $
 
-DISTNAME=      darktable-0.9.3
-PKGREVISION=   3
+DISTNAME=      darktable-1.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=darktable/}
 
@@ -19,7 +18,6 @@
 
 CMAKE_ARGS+=   -DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
 CMAKE_ARGS+=   -DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
-#CMAKE_ARGS+=  -DUSE_OPENMP=OFF
 CMAKE_ARGS+=   -DUSE_OPENCL=OFF
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
@@ -46,13 +44,20 @@
 CFLAGS+=       -mstackrealign
 .endif
 
+.if ${OPSYS} == "NetBSD"
+CFLAGS+=       -D_NETBSD_SOURCE
+.endif
+
 # for some reason msgfmt can't handle these po files
 post-extract:
        ${RM} ${WRKSRC}/po/cs.po
        ${RM} ${WRKSRC}/po/es.po
        ${RM} ${WRKSRC}/po/fr.po
        ${RM} ${WRKSRC}/po/it.po
+       ${RM} ${WRKSRC}/po/ja.po
+       ${RM} ${WRKSRC}/po/nl.po
        ${RM} ${WRKSRC}/po/pl.po
+       ${RM} ${WRKSRC}/po/ru.po
        ${RM} ${WRKSRC}/po/sv.po
 
 pre-configure:
diff -r beac013d03a8 -r 90633b5f22fc graphics/darktable/PLIST
--- a/graphics/darktable/PLIST  Fri Mar 16 00:20:51 2012 +0000
+++ b/graphics/darktable/PLIST  Fri Mar 16 00:35:01 2012 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2011/11/15 21:19:02 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/03/16 00:35:01 jakllsch Exp $
 bin/darktable
 bin/darktable-cltest
-bin/darktable-faster
 bin/darktable-viewer
 lib/darktable/libdarktable.so
 lib/darktable/plugins/imageio/format/libcopy.so
@@ -28,25 +27,32 @@
 lib/darktable/plugins/libcolorcontrast.so
 lib/darktable/plugins/libcolorcorrection.so
 lib/darktable/plugins/libcolorin.so
+lib/darktable/plugins/libcolorize.so
 lib/darktable/plugins/libcolorout.so
+lib/darktable/plugins/libcolortransfer.so
 lib/darktable/plugins/libcolorzones.so
 lib/darktable/plugins/libdemosaic.so
 lib/darktable/plugins/libequalizer.so
 lib/darktable/plugins/libexposure.so
+lib/darktable/plugins/libflip.so
 lib/darktable/plugins/libgamma.so
 lib/darktable/plugins/libgraduatednd.so
 lib/darktable/plugins/libgrain.so
 lib/darktable/plugins/libhighlights.so
 lib/darktable/plugins/libhighpass.so
 lib/darktable/plugins/libhotpixels.so
+lib/darktable/plugins/libinvert.so
 lib/darktable/plugins/liblens.so
+lib/darktable/plugins/liblevels.so
 lib/darktable/plugins/liblowlight.so
+lib/darktable/plugins/liblowpass.so
 lib/darktable/plugins/libmonochrome.so
 lib/darktable/plugins/libnlmeans.so
 lib/darktable/plugins/liboverexposed.so
 lib/darktable/plugins/libprofile_gamma.so
 lib/darktable/plugins/librawdenoise.so
 lib/darktable/plugins/librelight.so
+lib/darktable/plugins/libshadhi.so
 lib/darktable/plugins/libsharpen.so
 lib/darktable/plugins/libsoften.so
 lib/darktable/plugins/libsplittoning.so
@@ -55,27 +61,50 @@
 lib/darktable/plugins/libtonecurve.so
 lib/darktable/plugins/libtonemap.so
 lib/darktable/plugins/libvelvia.so
+lib/darktable/plugins/libvibrance.so
 lib/darktable/plugins/libvignette.so
 lib/darktable/plugins/libwatermark.so
 lib/darktable/plugins/libzonesystem.so
+lib/darktable/plugins/lighttable/libbackgroundjobs.so
 lib/darktable/plugins/lighttable/libcamera.so
 lib/darktable/plugins/lighttable/libcapture.so
 lib/darktable/plugins/lighttable/libcollect.so
+lib/darktable/plugins/lighttable/libcolorlabels.so
+lib/darktable/plugins/lighttable/libcolorpicker.so
 lib/darktable/plugins/lighttable/libcopy_history.so
+lib/darktable/plugins/lighttable/libdarktable_label.so
 lib/darktable/plugins/lighttable/libexport.so
+lib/darktable/plugins/lighttable/libfilmstrip.so
+lib/darktable/plugins/lighttable/libfilter.so
+lib/darktable/plugins/lighttable/libglobal_toolbox.so
+lib/darktable/plugins/lighttable/libhinter.so
+lib/darktable/plugins/lighttable/libhistogram.so
+lib/darktable/plugins/lighttable/libhistory.so
 lib/darktable/plugins/lighttable/libimage.so
+lib/darktable/plugins/lighttable/libimport.so
+lib/darktable/plugins/lighttable/libkeywords.so
+lib/darktable/plugins/lighttable/liblighttable_mode.so
 lib/darktable/plugins/lighttable/libmetadata.so
+lib/darktable/plugins/lighttable/libmetadata_view.so
+lib/darktable/plugins/lighttable/libmodule_toolbox.so
+lib/darktable/plugins/lighttable/libmodulegroups.so
+lib/darktable/plugins/lighttable/libmodulelist.so
+lib/darktable/plugins/lighttable/libnavigation.so
+lib/darktable/plugins/lighttable/libratings.so
 lib/darktable/plugins/lighttable/librecentcollect.so
 lib/darktable/plugins/lighttable/libselect.so
+lib/darktable/plugins/lighttable/libsnapshots.so
 lib/darktable/plugins/lighttable/libstyles.so
 lib/darktable/plugins/lighttable/libtagging.so
+lib/darktable/plugins/lighttable/libview_toolbox.so
+lib/darktable/plugins/lighttable/libviewswitcher.so
 lib/darktable/views/libcapture.so
 lib/darktable/views/libdarkroom.so
-lib/darktable/views/libfilmstrip.so
 lib/darktable/views/liblighttable.so
 man/man1/darktable.1
 share/applications/darktable.desktop
 share/darktable/darktable.gtkrc
+share/darktable/darktablerc
 share/darktable/gdb_commands
 share/darktable/kernels/atrous.cl
 share/darktable/kernels/basic.cl
@@ -86,6 +115,8 @@
 share/darktable/kernels/nlmeans.cl
 share/darktable/kernels/programs.conf
 share/darktable/kernels/sharpen.cl
+share/darktable/pixmaps/idbutton.png
+share/darktable/pixmaps/off.png
 share/darktable/pixmaps/plugins/darkroom/anlfyeni.png
 share/darktable/pixmaps/plugins/darkroom/atrous.png
 share/darktable/pixmaps/plugins/darkroom/basecurve.png
@@ -110,6 +141,7 @@
 share/darktable/pixmaps/plugins/darkroom/hotpixels.png
 share/darktable/pixmaps/plugins/darkroom/invert.png
 share/darktable/pixmaps/plugins/darkroom/lens.png
+share/darktable/pixmaps/plugins/darkroom/levels.png
 share/darktable/pixmaps/plugins/darkroom/lowlight.png
 share/darktable/pixmaps/plugins/darkroom/lowpass.png
 share/darktable/pixmaps/plugins/darkroom/monochrome.png
@@ -119,6 +151,7 @@
 share/darktable/pixmaps/plugins/darkroom/rawdenoise.png
 share/darktable/pixmaps/plugins/darkroom/rawimport.png
 share/darktable/pixmaps/plugins/darkroom/relight.png
+share/darktable/pixmaps/plugins/darkroom/shadhi.png
 share/darktable/pixmaps/plugins/darkroom/sharpen.png
 share/darktable/pixmaps/plugins/darkroom/soften.png
 share/darktable/pixmaps/plugins/darkroom/splittoning.png
@@ -144,6 +177,8 @@
 share/doc/darktable/TRANSLATORS
 share/icons/hicolor/16x16/apps/darktable.png
 share/icons/hicolor/22x22/apps/darktable.png
+share/icons/hicolor/24x24/apps/darktable.png
+share/icons/hicolor/256x256/apps/darktable.png
 share/icons/hicolor/32x32/apps/darktable.png
 share/icons/hicolor/48x48/apps/darktable.png
 share/icons/hicolor/64x64/apps/darktable.png
@@ -152,9 +187,7 @@
 share/locale/de/LC_MESSAGES/darktable.mo
 share/locale/fi/LC_MESSAGES/darktable.mo
 share/locale/gl/LC_MESSAGES/darktable.mo
-share/locale/ja/LC_MESSAGES/darktable.mo
-share/locale/nl/LC_MESSAGES/darktable.mo
 share/locale/ro/LC_MESSAGES/darktable.mo
-share/locale/ru/LC_MESSAGES/darktable.mo
 share/locale/sq/LC_MESSAGES/darktable.mo
 share/locale/th/LC_MESSAGES/darktable.mo
+share/locale/zh_CN/LC_MESSAGES/darktable.mo
diff -r beac013d03a8 -r 90633b5f22fc graphics/darktable/distinfo
--- a/graphics/darktable/distinfo       Fri Mar 16 00:20:51 2012 +0000
+++ b/graphics/darktable/distinfo       Fri Mar 16 00:35:01 2012 +0000
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.6 2011/11/20 01:16:23 dholland Exp $
+$NetBSD: distinfo,v 1.7 2012/03/16 00:35:01 jakllsch Exp $
 
-SHA1 (darktable-0.9.3.tar.gz) = 36ed6c1102b920096cf80affd71adfa66ae85381
-RMD160 (darktable-0.9.3.tar.gz) = a7c51262a52fae0b33179fb4d9030eb78444305d
-Size (darktable-0.9.3.tar.gz) = 2330605 bytes
+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_darktable-faster) = 2eed0fcf4cf571aaf2a19f5dee6b19a2668cf1e1
+SHA1 (patch-data_CMakeLists.txt) = f40f99c07ccbd3d025e7865cf7647c7b218c7d56
 SHA1 (patch-doc_CMakeLists.txt) = 7b7af1dda752725d5b42ba4395de1cd5390c64fd
-SHA1 (patch-src_CMakeLists.txt) = a91701a345376ba140167229b475d11c7c2e7b13
+SHA1 (patch-src_CMakeLists.txt) = 51a332f2e66b5f00f37af45b74f994f90da2d03f
 SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 1217d6bf0b14b538d39e9bfe9fa70e2f7bffbfc5
-SHA1 (patch-src_control_jobs_control__jobs.c) = 46cd16b7091dc8b8f197bc6051c30aae791e613a
-SHA1 (patch-src_develop_blend.c) = 16dc2c8b9eeb19de83068494f9a187ea5ccbde97
+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
diff -r beac013d03a8 -r 90633b5f22fc graphics/darktable/patches/patch-data_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-data_CMakeLists.txt      Fri Mar 16 00:35:01 2012 +0000
@@ -0,0 +1,22 @@
+$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 -r beac013d03a8 -r 90633b5f22fc graphics/darktable/patches/patch-data_darktable-faster
--- a/graphics/darktable/patches/patch-data_darktable-faster    Fri Mar 16 00:20:51 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-data_darktable-faster,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
-
-Don't depend on bash.  This might not work.
-
---- data/darktable-faster.orig 2011-08-24 09:20:29.000000000 +0000
-+++ data/darktable-faster
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- PATH=`dirname $_`:$PATH
- 
diff -r beac013d03a8 -r 90633b5f22fc graphics/darktable/patches/patch-src_CMakeLists.txt
--- a/graphics/darktable/patches/patch-src_CMakeLists.txt       Fri Mar 16 00:20:51 2012 +0000
+++ b/graphics/darktable/patches/patch-src_CMakeLists.txt       Fri Mar 16 00:35:01 2012 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.4 2011/11/17 08:12:40 wiz Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.5 2012/03/16 00:35:01 jakllsch Exp $
 
 Various thing to possibly improve portability.
 
---- src/CMakeLists.txt.orig    2011-11-07 06:46:13.000000000 +0000
+--- src/CMakeLists.txt.orig    2012-03-13 21:29:39.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -233,7 +233,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
+@@ -235,36 +235,43 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
  
  if(NOT APPLE)
    # apple build fails on deprecated warnings..
@@ -13,13 +13,28 @@
  endif(NOT APPLE)
  
  if(NOT WIN32)
-@@ -251,18 +251,26 @@ if(NOT BINARY_PACKAGE_BUILD)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+ endif(NOT WIN32)
+ 
++MESSAGE("-- Checking for -march=native support")
++CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
++MESSAGE("-- Checking for -mtune=native support")
++CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
++MESSAGE("-- Checking for -mtune=generic support")
++CHECK_C_COMPILER_FLAG("-mtune=generic" MTUNEGENERIC)
++
+ if(NOT BINARY_PACKAGE_BUILD)
+-      MESSAGE("-- Checking for -march=native support")
+-      CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
+       if (MARCHNATIVE)
+               set(MARCH "-march=native")      
+       else()
+-              MESSAGE("-- Checking for -mtune=native support")
+-              CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
                if (MTUNENATIVE)
                        set(MARCH "-mtune=native")
                else()
 -                      set(MARCH "-mtune=generic")
-+                      MESSAGE("-- Checking for -mtune=generic support")
-+                      CHECK_C_COMPILER_FLAG("-mtune=generic" MTUNEGENERIC)
 +                      if (MTUNEGENERIC)
 +                              set(MARCH "-mtune=generic")