Update to darktable-0.9.3.

6 files changed, 78 insertions, 35 deletions

diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 7bf694a69af..c436bca3a31 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2011/11/01 06:01:28 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2011/11/15 21:19:02 jakllsch Exp $
 
-DISTNAME=	darktable-0.9.2
-PKGREVISION=	2
+DISTNAME=	darktable-0.9.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darktable/}
 
@@ -19,7 +18,7 @@ USE_TOOLS+=		gmake msgfmt pkg-config
 
 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_OPENMP=OFF
 CMAKE_ARGS+=	-DUSE_OPENCL=OFF
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
@@ -40,10 +39,13 @@ GCC_REQD=	4.2
 CFLAGS+=	-mstackrealign
 .endif
 
-# for some reason msgfmt can't handle these two
+# 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/pl.po
 	${RM} ${WRKSRC}/po/sv.po
 
 pre-configure:
diff --git a/graphics/darktable/PLIST b/graphics/darktable/PLIST
index 7e1f04dc095..7e6878bb356 100644
--- a/graphics/darktable/PLIST
+++ b/graphics/darktable/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/11/15 21:19:02 jakllsch Exp $
 bin/darktable
 bin/darktable-cltest
 bin/darktable-faster
@@ -76,6 +76,7 @@ lib/darktable/views/liblighttable.so
 man/man1/darktable.1
 share/applications/darktable.desktop
 share/darktable/darktable.gtkrc
+share/darktable/gdb_commands
 share/darktable/kernels/atrous.cl
 share/darktable/kernels/basic.cl
 share/darktable/kernels/blendop.cl
@@ -88,6 +89,7 @@ share/darktable/kernels/sharpen.cl
 share/darktable/pixmaps/plugins/darkroom/anlfyeni.png
 share/darktable/pixmaps/plugins/darkroom/atrous.png
 share/darktable/pixmaps/plugins/darkroom/basecurve.png
+share/darktable/pixmaps/plugins/darkroom/bilateral.png
 share/darktable/pixmaps/plugins/darkroom/bloom.png
 share/darktable/pixmaps/plugins/darkroom/borders.png
 share/darktable/pixmaps/plugins/darkroom/cacorrect.png
@@ -106,6 +108,7 @@ share/darktable/pixmaps/plugins/darkroom/grain.png
 share/darktable/pixmaps/plugins/darkroom/highlights.png
 share/darktable/pixmaps/plugins/darkroom/highpass.png
 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/lowlight.png
 share/darktable/pixmaps/plugins/darkroom/lowpass.png
@@ -120,7 +123,6 @@ share/darktable/pixmaps/plugins/darkroom/sharpen.png
 share/darktable/pixmaps/plugins/darkroom/soften.png
 share/darktable/pixmaps/plugins/darkroom/splittoning.png
 share/darktable/pixmaps/plugins/darkroom/spots.png
-share/darktable/pixmaps/plugins/darkroom/stuckpixels.png
 share/darktable/pixmaps/plugins/darkroom/temperature.png
 share/darktable/pixmaps/plugins/darkroom/template.png
 share/darktable/pixmaps/plugins/darkroom/tonecurve.png
@@ -149,12 +151,9 @@ share/icons/hicolor/scalable/apps/darktable.svg
 share/locale/ca/LC_MESSAGES/darktable.mo
 share/locale/de/LC_MESSAGES/darktable.mo
 share/locale/fi/LC_MESSAGES/darktable.mo
-share/locale/fr/LC_MESSAGES/darktable.mo
 share/locale/gl/LC_MESSAGES/darktable.mo
-share/locale/it/LC_MESSAGES/darktable.mo
 share/locale/ja/LC_MESSAGES/darktable.mo
 share/locale/nl/LC_MESSAGES/darktable.mo
-share/locale/pl/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
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo
index 6f64d095d63..8758d298323 100644
--- a/graphics/darktable/distinfo
+++ b/graphics/darktable/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.3 2011/08/25 14:42:53 jakllsch Exp $
+$NetBSD: distinfo,v 1.4 2011/11/15 21:19:02 jakllsch Exp $
 
-SHA1 (darktable-0.9.2.tar.gz) = 5527854edd10cca074bd956772b81d646a796293
-RMD160 (darktable-0.9.2.tar.gz) = 95b5f28afd787070d5e8c236f7e3bb2d27522cae
-Size (darktable-0.9.2.tar.gz) = 2269319 bytes
+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 (patch-cmake_modules_FindGTK2.cmake) = 30dae502bad02a7b993f201a727eba7efa43ed4e
 SHA1 (patch-data_darktable-faster) = 2eed0fcf4cf571aaf2a19f5dee6b19a2668cf1e1
 SHA1 (patch-doc_CMakeLists.txt) = 7b7af1dda752725d5b42ba4395de1cd5390c64fd
-SHA1 (patch-src_CMakeLists.txt) = 31e90c7c7b622ccc4299f4caa576d5625835555a
+SHA1 (patch-src_CMakeLists.txt) = e83542370f68b3c253553e8688421bfce0a1a1c1
 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_imageio_format_png.c) = 59c44f57132f59bb09930498fcdc2357734da6ba
 SHA1 (patch-src_rawspeed_RawSpeed_Common.h) = c7dfc4e65ea46e7318d3d5ebdab6dcb5491c1c48
diff --git a/graphics/darktable/patches/patch-src_CMakeLists.txt b/graphics/darktable/patches/patch-src_CMakeLists.txt
index f23e12f7511..6a345c08af7 100644
--- a/graphics/darktable/patches/patch-src_CMakeLists.txt
+++ b/graphics/darktable/patches/patch-src_CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2011/08/25 14:42:53 jakllsch Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.3 2011/11/15 21:19:02 jakllsch Exp $
 
 Various thing to possibly improve portability.
 
---- src/CMakeLists.txt.orig	2011-08-24 09:20:29.000000000 +0000
+--- src/CMakeLists.txt.orig	2011-11-07 06:46:13.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -240,7 +240,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
+@@ -233,7 +233,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
  
  if(NOT APPLE)
    # apple build fails on deprecated warnings..
@@ -13,29 +13,36 @@ Various thing to possibly improve portability.
  endif(NOT APPLE)
  
  if(NOT WIN32)
-@@ -248,17 +248,17 @@ if(NOT WIN32)
- endif(NOT WIN32)
- 
- if(NOT BINARY_PACKAGE_BUILD)
--	set(MARCH "-march=native")	
-+#	set(MARCH "-march=native")	
+@@ -251,18 +251,26 @@ if(NOT BINARY_PACKAGE_BUILD)
+ 		if (MTUNENATIVE)
+ 			set(MARCH "-mtune=native")
+ 		else()
+-			set(MARCH "-mtune=generic")
++			MESSAGE("-- Checking for -mtune=generic support")
++			CHECK_C_COMPILER_FLAG("-mtuen=generic" MTUNEGENERIC)
++			if (MTUNEGENERIC)
++				set(MARCH "-mtune=generic")
++			endif()
+ 		endif()
+ 	endif()
  else()
--	set(MARCH "-mtune=generic")
-+#	set(MARCH "-mtune=generic")
+- 	set(MARCH "-mtune=generic")
++	MESSAGE("-- Checking for -mtune=generic support")
++	CHECK_C_COMPILER_FLAG("-mtuen=generic" MTUNEGENERIC)
++	if (MTUNEGENERIC)
++		set(MARCH "-mtune=generic")
++	endif()
  endif()
  
 -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
 -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
--set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} -g")
++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -fexpensive-optimizations")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
 -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
--set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
-+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
-+#set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
-+#set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
-+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
-+#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
-+#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} -g")
++set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fexpensive-optimizations")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
    
  
- #
diff --git a/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c b/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
new file mode 100644
index 00000000000..5b9d06fdfc7
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_control_jobs_control__jobs.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_control_jobs_control__jobs.c,v 1.1 2011/11/15 21:19:02 jakllsch Exp $
+
+--- src/control/jobs/control_jobs.c.orig	2011-11-07 06:46:13.000000000 +0000
++++ src/control/jobs/control_jobs.c
+@@ -540,7 +540,11 @@ 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, darktable.mipmap_cache->num_entries[DT_IMAGE_FULL]) - 1);
++#if defined(__NetBSD__)
++  #pragma omp parallel default(none) private(imgid, size) shared(j, fraction, __sF, w, h, mformat, mstorage, t, sdata, job) num_threads(num_threads) if(num_threads > 1)
++#else
+   #pragma omp parallel default(none) private(imgid, size) shared(j, fraction, stderr, w, h, mformat, mstorage, t, sdata, job) num_threads(num_threads) if(num_threads > 1)
++#endif
+   {
+ #endif
+     // get a thread-safe fdata struct (one jpeg struct per thread etc):
diff --git a/graphics/darktable/patches/patch-src_develop_blend.c b/graphics/darktable/patches/patch-src_develop_blend.c
new file mode 100644
index 00000000000..a6203dfbe02
--- /dev/null
+++ b/graphics/darktable/patches/patch-src_develop_blend.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_develop_blend.c,v 1.1 2011/11/15 21:19:02 jakllsch Exp $
+
+--- src/develop/blend.c.orig	2011-11-07 06:46:13.000000000 +0000
++++ src/develop/blend.c
+@@ -1230,8 +1230,12 @@ void dt_develop_blend_process (struct dt
+       ch = 1;
+     
+ #ifdef _OPENMP
++#if defined(__NetBSD__)
++    #pragma omp parallel for default(none) shared(in,roi_out,out,blend,d,__sF,ch)
++#else
+     #pragma omp parallel for default(none) shared(in,roi_out,out,blend,d,stderr,ch)
+ #endif
++#endif
+     for (int y=0; y<roi_out->height; y++) {
+         int index = (ch*y*roi_out->width);
+         blend(cst, opacity, in+index, out+index, roi_out->width*ch, blendflag);