From 32d5857992be510f1b2cec9be20845ec64a47c80 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 23 Sep 2015 11:52:15 +0000
Subject: Help lensfun detection. Fix OpenMP syntax.

---
 graphics/darktable/Makefile                       |  4 +++-
 graphics/darktable/distinfo                       |  3 ++-
 graphics/darktable/patches/patch-src_iop_invert.c | 13 +++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 graphics/darktable/patches/patch-src_iop_invert.c

(limited to 'graphics/darktable')

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 91e81dcc22d..a67c71b4b72 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2015/08/25 13:24:27 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2015/09/23 11:52:15 joerg Exp $
 
 DISTNAME=	darktable-1.2.3
 PKGREVISION=	11
@@ -16,6 +16,7 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config bash
 
+CMAKE_ARGS+=	-DLENSFUN_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/lensfun
 CMAKE_ARGS+=	-DGTHREAD_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
 CMAKE_ARGS+=	-DGMODULE_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
@@ -67,6 +68,7 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libinotify/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/GraphicsMagick/buildlink3.mk"
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 6ef37bda57e..8ee451f6c31 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2014/03/23 15:16:35 spz Exp $
+$NetBSD: distinfo,v 1.23 2015/09/23 11:52:15 joerg Exp $
 
 SHA1 (darktable-1.2.3.tar.xz) = dbd7545d1fbb5f67862f62ae39c7e6ba008d1c10
 RMD160 (darktable-1.2.3.tar.xz) = 3148a7f9063c372b3477525cacf518750c88766d
@@ -10,4 +10,5 @@ SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 8227a7180383cd4379313b07ff964bb
 SHA1 (patch-src_common_imageio__exr.hh) = 8bef7fab739dfdd0688371b08d6f31503eaf04af
 SHA1 (patch-src_common_imageio__rgbe.c) = 5c396754d6dbb7390062e78afde315ee293215d6
 SHA1 (patch-src_develop_blend.c) = de54957d16b8230e05ffd945c50b76d7a13b4936
+SHA1 (patch-src_iop_invert.c) = 6809fcab0e8201e3b773781b6a83c28cbb36b9c5
 SHA1 (patch-src_iop_lens.c) = 28b5462311f778184143152bdef4e59ee18a6a3f
diff --git a/graphics/darktable/patches/patch-src_iop_invert.c b/graphics/darktable/patches/patch-src_iop_invert.c
new file mode 100644
index 00000000000..ceb856635ab
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_iop_invert.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_iop_invert.c,v 1.1 2015/09/23 11:52:15 joerg Exp $
+
+--- src/iop/invert.c.orig	2015-09-22 13:04:15.000000000 +0000
++++ src/iop/invert.c
+@@ -199,7 +199,7 @@ void process (struct dt_iop_module_t *se
+     const float *const m = piece->pipe->processed_maximum;
+     const int32_t film_rgb_i[3] = {m[0]*film_rgb[0]*65535, m[1]*film_rgb[1]*65535, m[2]*film_rgb[2]*65535};
+ #ifdef _OPENMP
+-    #pragma omp parallel for default(none) shared(roi_out, ivoid, ovoid, /*film_rgb_i, min, max, res*/) schedule(static)
++    #pragma omp parallel for default(none) shared(roi_out, ivoid, ovoid/*, film_rgb_i, min, max, res*/) schedule(static)
+ #endif
+     for(int j=0; j<roi_out->height; j++)
+     {
-- 
cgit v1.2.3