graphics/darktable: Update to 2.0.1

darktable 2.0.x officially dropped support for i386. I believe the crash
reported in PR 202457 was specific to 32-bit because this was already
largely untested with darktable 1.6.x, so I'm considering this issue
"fixed".

PR:		202457
Reviewed by:	kwm
Approved by:	kwm
Differential Revision:	https://reviews.freebsd.org/D4247

9 files changed, 130 insertions, 101 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 8a20259d4310..fb64849b673d 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	darktable
-PORTVERSION=	1.6.9
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics
-MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION}/
+MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
 
 MAINTAINER=	dumbbell@FreeBSD.org
 COMMENT=	Virtual lighttable and darkroom for photographers
@@ -12,52 +12,54 @@ COMMENT=	Virtual lighttable and darkroom for photographers
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		liblensfun.so:${PORTSDIR}/graphics/lensfun \
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
+		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+		liblensfun.so:${PORTSDIR}/graphics/lensfun \
+		libpugixml.so:${PORTSDIR}/textproc/pugixml \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	uses SSE instructions
+ONLY_FOR_ARCHS=		amd64
+ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
 
-USES=		compiler:c++11-lib cmake:outsource desktop-file-utils	\
-		ninja pkgconfig sqlite tar:xz
-USE_GNOME=	gtk20 intltool librsvg2
+USES=		cmake:outsource compiler:c++11-lib desktop-file-utils	\
+		jpeg ninja pkgconfig sqlite tar:xz
+USE_GNOME=	gtk30 intltool librsvg2 libxml2
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-OPTIONS_DEFINE=	COLORD DOCS FB_PICASA FLICKR GEO GNOMEKEYRING GPHOTO	\
-		GRAPHMAGICK LIBSECRET LUA NLS OPENEXR OPENJPEG RAWSPEED	\
+OPTIONS_DEFINE=	COLORD DOCS FLICKR GEO GNOMEKEYRING GPHOTO GRAPHMAGICK	\
+		LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT RAWSPEED	\
 		SLIDESHOW SQUISH WEBP
 
 GEO_DESC=	Support geotagging
-FB_PICASA_DESC=	Support export to Facebook and Picasa
 LIBSECRET_DESC=	Support libsecret as password backend
 SQUISH_DESC=	Compress thumbnail via libsquish
 RAWSPEED_DESC=	Compile with rawspeed backend
 SLIDESHOW_DESC=	Build OpenGL/SDL slideshow viewer
 
-OPTIONS_DEFAULT=COLORD FB_PICASA FLICKR GEO GPHOTO LUA NLS OPENEXR	\
-		OPENJPEG RAWSPEED SLIDESHOW SQUISH WEBP
+OPTIONS_DEFAULT=COLORD FLICKR GEO GPHOTO LUA NLS OPENEXR OPENJPEG	\
+		PRINT RAWSPEED SLIDESHOW SQUISH WEBP
 OPTIONS_SUB=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
+
 CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1
 CMAKE_ARGS+=	-DBUILD_CMSTEST:BOOL=ON
 CMAKE_ARGS+=	-DUSE_KWALLET:BOOL=ON
 
-# darktable 1.4 can use colord but provides its own libcolord,
+# darktable 1.4+ can use colord but provides its own libcolord,
 # statically linked to libdarktable.so.
-COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
+COLORD_LIB_DEPENDS=	libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk
 COLORD_CMAKE_OFF=	-DUSE_COLORD:BOOL=OFF
 
-FB_PICASA_LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
-FB_PICASA_CMAKE_OFF=	-DUSE_GLIBJSON:BOOL=OFF
-
 FLICKR_LIB_DEPENDS=	libflickcurl.so:${PORTSDIR}/www/flickcurl
 FLICKR_CMAKE_OFF=	-DUSE_FLICKR:BOOL=OFF
 
-GEO_LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+GEO_LIB_DEPENDS=	libosmgpsmap-1.0.so:${PORTSDIR}/x11-toolkits/osm-gps-map \
+			libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 GEO_CMAKE_OFF=		-DUSE_GEO:BOOL=OFF
 
 GNOMEKEYRING_LIB_DEPENDS=libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
@@ -84,6 +86,9 @@ OPENEXR_CMAKE_OFF=	-DUSE_OPENEXR:BOOL=OFF
 OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
 OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
 
+PRINT_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+PRINT_CMAKE_OFF=	-DBUILD_PRINT:BOOL=OFF
+
 RAWSPEED_CMAKE_OFF=	-DDONT_USE_RAWSPEED:BOOL=ON
 
 SLIDESHOW_USE=		GL=gl SDL=sdl
@@ -102,10 +107,22 @@ WEBP_CMAKE_OFF=		-DUSE_WEBP:BOOL=OFF
 BUILD_DEPENDS+=	clang37:${PORTSDIR}/devel/llvm37
 RUN_DEPENDS+=	clang37:${PORTSDIR}/devel/llvm37
 
-CPP=		${LOCALBASE}/bin/clang-cpp37
-CC=		${LOCALBASE}/bin/clang37
-CXX=		${LOCALBASE}/bin/clang++37
-LDFLAGS+=	-L${LOCALBASE}/llvm37/lib -lomp
+CPP=		clang-cpp37
+CC=		clang37
+CXX=		clang++37
+
+# FIXME: At least in 3.7.0 and 3.7.1, Clang doesn't find libomp.so
+# itself. Furthermore, there may be a regression in 3.7.1 because we now
+# need to explicitely link to libm.so as well.
+OPENMP_FLAGS=	-L${LOCALBASE}/llvm37/lib -lm -lomp
+LDFLAGS+=	${OPENMP_FLAGS}
+
+# Last but not least, there is a second change or regression in CMake
+# 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
+# anymore. The CMP0056 policy must be explicitely set to NEW to ensure
+# linker flags are passed.
+# See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html
+CMAKE_ARGS+=	-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 .endif
 
 .if defined(WITH_DEBUG)
@@ -113,4 +130,7 @@ CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
+post-patch:
+	@${MV} ${WRKSRC}/data/darktableconfig.dtd ${WRKSRC}/data/darktableconfig.dtd.in
+
 .include <bsd.port.post.mk>
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 46a41841582f..0723b90678d1 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (darktable-1.6.9.tar.xz) = 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173
-SIZE (darktable-1.6.9.tar.xz) = 3124940
+SHA256 (darktable-2.0.1.tar.xz) = 4d0e76eb42b95418ab59c17bff8aac660f5348b082aabfb3113607c67e87830b
+SIZE (darktable-2.0.1.tar.xz) = 2927028
diff --git a/graphics/darktable/files/patch-cmake_modules_FindGettext.cmake b/graphics/darktable/files/patch-cmake_modules_FindGettext.cmake
deleted file mode 100644
index e20253c8e079..000000000000
--- a/graphics/darktable/files/patch-cmake_modules_FindGettext.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/FindGettext.cmake.orig	2015-07-26 11:47:47 UTC
-+++ cmake/modules/FindGettext.cmake
-@@ -13,6 +13,8 @@ include(LibFindMacros)
- # On Linux there is no pkgconfig script, but with this we force Gettext_PKGCONF_INCLUDE_DIRS to ""
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-   set(Gettext_PKGCONF_INCLUDE_DIRS "")
-+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  set(Gettext_PKGCONF_INCLUDE_DIRS "/usr/local/include")
- else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-   libfind_pkg_check_modules(Gettext_PKGCONF Gettext)
- endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/graphics/darktable/files/patch-data_CMakeLists.txt b/graphics/darktable/files/patch-data_CMakeLists.txt
index 0e652732752c..c9ef66090156 100644
--- a/graphics/darktable/files/patch-data_CMakeLists.txt
+++ b/graphics/darktable/files/patch-data_CMakeLists.txt
@@ -1,38 +1,11 @@
---- data/CMakeLists.txt.orig	2015-07-26 11:47:47 UTC
+--- data/CMakeLists.txt.orig	2016-02-02 11:36:06 UTC
 +++ data/CMakeLists.txt
-@@ -39,21 +39,21 @@ if(USE_LUA)
- #
- # lua system scripts
- #
--install(DIRECTORY "lua" DESTINATION ${SHARE_INSTALL}/darktable/)
--install(FILES luarc DESTINATION ${SHARE_INSTALL}/darktable/)
-+install(DIRECTORY "lua" DESTINATION ${SHARE_INSTALL}/darktable)
-+install(FILES luarc DESTINATION ${SHARE_INSTALL}/darktable)
- endif(USE_LUA)
- #
- # Install (and generate when necessary) other system shares
- #
- file(GLOB PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../po/*.po")
- add_custom_command(
--		OUTPUT darktable.desktop
--		SOURCE darktable.desktop.in
-+		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop
-+		SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in
- 		COMMAND ${intltool_merge_BIN} -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop
- 		MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in
- 		DEPENDS ${PO_FILES}
- )
--add_custom_target(darktable.desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop)
-+add_custom_target(darktable.desktop_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop DESTINATION ./share/applications)
- install(FILES darktable.appdata.xml DESTINATION ./share/appdata)
+@@ -85,7 +85,7 @@ if(APPLE)
+   set(DEFCONFIG_AUDIOPLAYER "afplay")
+ endif(APPLE)
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.xml.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.xml )
+-execute_process( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd)
++configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd )
  
-@@ -116,7 +116,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltp
-   endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
- endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
  
--add_custom_target(darktablerc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc)
-+add_custom_target(darktablerc_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc)
- 
- # first of all install darktablerc file into share as template
- # postinst script should copy this into users homedirectory
+ if(USE_XMLLINT)
diff --git a/graphics/darktable/files/patch-doc_CMakeLists.txt b/graphics/darktable/files/patch-doc_CMakeLists.txt
index 059cde305adb..8c49823de17f 100644
--- a/graphics/darktable/files/patch-doc_CMakeLists.txt
+++ b/graphics/darktable/files/patch-doc_CMakeLists.txt
@@ -1,11 +1,19 @@
---- doc/CMakeLists.txt.orig	2015-07-26 11:47:47 UTC
+--- doc/CMakeLists.txt.orig	2016-02-02 11:36:06 UTC
 +++ doc/CMakeLists.txt
-@@ -58,7 +58,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltp
-   endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
- endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
- 
--add_custom_target(darktablerc.html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html)
-+add_custom_target(darktablerc.html_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html)
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html DESTINATION ${SHARE_INSTALL}/doc/darktable/)
- 
+@@ -9,14 +9,14 @@ install(FILES ${DOC_FILES} DESTINATION .
+ # create config docs
+ if(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+   add_custom_command(
+-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
++    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
+     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
+     COMMAND ${Xsltproc_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
+   )
+ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+   if(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
+     add_custom_command(
+-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
++      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
+       COMMAND ${Saxon_BIN} ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_darktablerc_doc.xsl > ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html
+     )
diff --git a/graphics/darktable/files/patch-src_CMakeLists.txt b/graphics/darktable/files/patch-src_CMakeLists.txt
index 7527e329d814..af46073395ff 100644
--- a/graphics/darktable/files/patch-src_CMakeLists.txt
+++ b/graphics/darktable/files/patch-src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig	2015-10-15 12:59:51 UTC
+--- src/CMakeLists.txt.orig	2016-02-02 11:36:06 UTC
 +++ src/CMakeLists.txt
-@@ -419,8 +419,9 @@ if(NOT CUSTOM_CFLAGS)
+@@ -415,8 +415,9 @@ if(NOT CUSTOM_CFLAGS)
    #-g MUST be set for ALL builds, or there will be no support for them when bugs happen
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2")
@@ -11,7 +11,7 @@
      execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
  
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
-@@ -436,8 +437,9 @@ if(NOT CUSTOM_CFLAGS)
+@@ -428,8 +429,9 @@ if(NOT CUSTOM_CFLAGS)
  
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2")
@@ -22,3 +22,20 @@
      execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
  
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
+@@ -677,14 +679,14 @@ endif(CMAKE_C_COMPILER_ID STREQUAL "GCC"
+ #
+ if(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+   add_custom_command(
+-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
++    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
+     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
+     COMMAND ${Xsltproc_BIN} --stringparam HAVE_OPENCL ${HAVE_OPENCL} ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml > ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
+   )
+ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+   if(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
+     add_custom_command(
+-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
++      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
+       COMMAND ${Saxon_BIN} ${CMAKE_CURRENT_BINARY_DIR}/../data/darktableconfig.xml ${CMAKE_CURRENT_SOURCE_DIR}/../tools/generate_prefs.xsl HAVE_OPENCL=${HAVE_OPENCL} > ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h
+     )
diff --git a/graphics/darktable/files/patch-src_common_darktable.c b/graphics/darktable/files/patch-src_common_darktable.c
deleted file mode 100644
index 7c8ebee5ac8a..000000000000
--- a/graphics/darktable/files/patch-src_common_darktable.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/darktable.c.orig	2015-07-26 11:47:47 UTC
-+++ src/common/darktable.c
-@@ -403,7 +403,7 @@ int dt_init(int argc, char *argv[], cons
- #else
-   int sse3_supported = 0;
- 
--#if(__GNUC_PREREQ(4, 8) || __has_builtin(__builtin_cpu_supports))
-+#if(__GNUC_PREREQ(4, 8) || (!defined(__FreeBSD__) && __has_builtin(__builtin_cpu_supports)))
-   // NOTE: _may_i_use_cpu_feature() looks better, but only avaliable in ICC
-   sse3_supported = __builtin_cpu_supports("sse3");
- #else
diff --git a/graphics/darktable/files/patch-src_develop_masks_path.c b/graphics/darktable/files/patch-src_develop_masks_path.c
new file mode 100644
index 000000000000..07a505e5ca32
--- /dev/null
+++ b/graphics/darktable/files/patch-src_develop_masks_path.c
@@ -0,0 +1,13 @@
+--- src/develop/masks/path.c.orig	2016-02-02 11:36:06 UTC
++++ src/develop/masks/path.c
+@@ -2555,8 +2555,8 @@ static int dt_path_get_mask_roi(dt_iop_m
+   // now check if feather is at least partially within roi
+   for(int i = nb_corner * 3; i < border_count; i++)
+   {
+-    int xx = border[i * 2];
+-    int yy = border[i * 2 + 1];
++    float xx = border[i * 2];
++    float yy = border[i * 2 + 1];
+     if(isnan(xx))
+     {
+       if(isnan(yy)) break; // that means we have to skip the end of the border path
diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
index b2720e9366ec..45ad77ee6c39 100644
--- a/graphics/darktable/pkg-plist
+++ b/graphics/darktable/pkg-plist
@@ -2,12 +2,14 @@ bin/darktable
 bin/darktable-cli
 bin/darktable-cltest
 bin/darktable-cmstest
+bin/darktable-generate-cache
 %%SLIDESHOW%%bin/darktable-viewer
 lib/darktable/libdarktable.so
 lib/darktable/plugins/imageio/format/libcopy.so
 %%OPENEXR%%lib/darktable/plugins/imageio/format/libexr.so
 %%OPENJPEG%%lib/darktable/plugins/imageio/format/libj2k.so
 lib/darktable/plugins/imageio/format/libjpeg.so
+lib/darktable/plugins/imageio/format/libpdf.so
 lib/darktable/plugins/imageio/format/libpfm.so
 lib/darktable/plugins/imageio/format/libpng.so
 lib/darktable/plugins/imageio/format/libppm.so
@@ -15,11 +17,11 @@ lib/darktable/plugins/imageio/format/libtiff.so
 %%WEBP%%lib/darktable/plugins/imageio/format/libwebp.so
 lib/darktable/plugins/imageio/storage/libdisk.so
 lib/darktable/plugins/imageio/storage/libemail.so
-%%FB_PICASA%%lib/darktable/plugins/imageio/storage/libfacebook.so
+lib/darktable/plugins/imageio/storage/libfacebook.so
 %%FLICKR%%lib/darktable/plugins/imageio/storage/libflickr.so
 lib/darktable/plugins/imageio/storage/libgallery.so
 lib/darktable/plugins/imageio/storage/liblatex.so
-%%FB_PICASA%%lib/darktable/plugins/imageio/storage/libpicasa.so
+lib/darktable/plugins/imageio/storage/libpicasa.so
 lib/darktable/plugins/libatrous.so
 lib/darktable/plugins/libbasecurve.so
 lib/darktable/plugins/libbilat.so
@@ -38,6 +40,7 @@ lib/darktable/plugins/libcolorin.so
 lib/darktable/plugins/libcolorize.so
 lib/darktable/plugins/libcolormapping.so
 lib/darktable/plugins/libcolorout.so
+lib/darktable/plugins/libcolorreconstruct.so
 lib/darktable/plugins/libcolortransfer.so
 lib/darktable/plugins/libcolorzones.so
 lib/darktable/plugins/libdefringe.so
@@ -46,6 +49,7 @@ lib/darktable/plugins/libdenoiseprofile.so
 lib/darktable/plugins/libdither.so
 lib/darktable/plugins/libequalizer.so
 lib/darktable/plugins/libexposure.so
+lib/darktable/plugins/libfinalscale.so
 lib/darktable/plugins/libflip.so
 lib/darktable/plugins/libgamma.so
 lib/darktable/plugins/libglobaltonemap.so
@@ -56,7 +60,6 @@ lib/darktable/plugins/libhighpass.so
 lib/darktable/plugins/libhotpixels.so
 lib/darktable/plugins/libinvert.so
 lib/darktable/plugins/liblens.so
-lib/darktable/plugins/libletsgofloat.so
 lib/darktable/plugins/liblevels.so
 lib/darktable/plugins/liblowlight.so
 lib/darktable/plugins/liblowpass.so
@@ -65,6 +68,7 @@ lib/darktable/plugins/libnlmeans.so
 lib/darktable/plugins/liboverexposed.so
 lib/darktable/plugins/libprofile_gamma.so
 lib/darktable/plugins/librawdenoise.so
+lib/darktable/plugins/librawprepare.so
 lib/darktable/plugins/librelight.so
 lib/darktable/plugins/librotatepixels.so
 lib/darktable/plugins/libscalepixels.so
@@ -109,6 +113,7 @@ 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/libprint_settings.so
 lib/darktable/plugins/lighttable/libratings.so
 lib/darktable/plugins/lighttable/librecentcollect.so
 lib/darktable/plugins/lighttable/libselect.so
@@ -121,13 +126,18 @@ lib/darktable/plugins/lighttable/libviewswitcher.so
 lib/darktable/views/libdarkroom.so
 lib/darktable/views/liblighttable.so
 %%GEO%%lib/darktable/views/libmap.so
+lib/darktable/views/libprint.so
 lib/darktable/views/libslideshow.so
 %%GPHOTO%%lib/darktable/views/libtethering.so
 man/man1/darktable-cli.1.gz
+man/man1/darktable-cltest.1.gz
+man/man1/darktable-cmstest.1.gz
+man/man1/darktable-generate-cache.1.gz
+man/man1/darktable-viewer.1.gz
 man/man1/darktable.1.gz
 share/appdata/darktable.appdata.xml
 share/applications/darktable.desktop
-%%DATADIR%%/darktable.gtkrc
+%%DATADIR%%/darktable.css
 %%DATADIR%%/darktablerc
 %%DATADIR%%/gdb_commands
 %%DATADIR%%/js/builder.js
@@ -141,8 +151,10 @@ share/applications/darktable.desktop
 %%DATADIR%%/kernels/bilateral.cl
 %%DATADIR%%/kernels/blendop.cl
 %%DATADIR%%/kernels/bloom.cl
+%%DATADIR%%/kernels/colorreconstruction.cl
 %%DATADIR%%/kernels/colorspace.cl
 %%DATADIR%%/kernels/common.h
+%%DATADIR%%/kernels/demosaic_other.cl
 %%DATADIR%%/kernels/demosaic_ppg.cl
 %%DATADIR%%/kernels/denoiseprofile.cl
 %%DATADIR%%/kernels/extended.cl
@@ -169,6 +181,7 @@ share/applications/darktable.desktop
 %%LUA%%%%DATADIR%%/lua/darktable/external/pygy_require/rockspecs/require-0.1.7-1.rockspec
 %%LUA%%%%DATADIR%%/lua/darktable/external/pygy_require/rockspecs/require-0.1.7-2.rockspec
 %%LUA%%%%DATADIR%%/luarc
+%%DATADIR%%/noiseprofiles.json
 %%DATADIR%%/pixmaps/dt_logo_128x128.png
 %%DATADIR%%/pixmaps/idbutton-1.png
 %%DATADIR%%/pixmaps/idbutton-1.svg
@@ -200,6 +213,8 @@ share/applications/darktable.desktop
 %%DATADIR%%/pixmaps/plugins/darkroom/colisa.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.svg
+%%DATADIR%%/pixmaps/plugins/darkroom/colorreconstruct.png
+%%DATADIR%%/pixmaps/plugins/darkroom/colorreconstruct.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/colorin.png
 %%DATADIR%%/pixmaps/plugins/darkroom/colorin.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/colormapping.png
@@ -250,6 +265,8 @@ share/applications/darktable.desktop
 %%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png
 %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.svg
+%%DATADIR%%/pixmaps/plugins/darkroom/rawprepare.png
+%%DATADIR%%/pixmaps/plugins/darkroom/rawprepare.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/relight.png
 %%DATADIR%%/pixmaps/plugins/darkroom/relight.svg
 %%DATADIR%%/pixmaps/plugins/darkroom/shadhi.png
@@ -296,6 +313,7 @@ share/applications/darktable.desktop
 %%DATADIR%%/watermarks/darktable.svg
 %%DATADIR%%/watermarks/hasselblad.svg
 %%DATADIR%%/watermarks/promo.svg
+%%DATADIR%%/watermarks/simple-text.svg
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -319,6 +337,7 @@ share/icons/hicolor/scalable/apps/darktable.svg
 %%NLS%%share/locale/el/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/es/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/darktable.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/it/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/darktable.mo
@@ -326,6 +345,7 @@ share/icons/hicolor/scalable/apps/darktable.svg
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/darktable.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/darktable.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/darktable.mo