Import of pkgsrc-2014Q1

graphics/darktable/patches/patch-aa

@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.3 2013/12/04 13:02:08 drochner Exp $
+
+--- src/common/utility.c.orig	2013-09-10 12:25:47.000000000 +0000
++++ src/common/utility.c
+@@ -17,13 +17,11 @@
+ */
+ 
+ /* getpwnam_r availibility check */
+-#if defined __APPLE__ || defined _POSIX_C_SOURCE >= 1 || defined _XOPEN_SOURCE || defined _BSD_SOURCE || defined _SVID_SOURCE || defined _POSIX_SOURCE
+ #include <pwd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include "darktable.h"
+-#endif
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>

graphics/darktable/patches/patch-cmake_modules_FindFreetype.cmake

@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_modules_FindFreetype.cmake,v 1.1 2014/03/23 15:16:35 spz Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- cmake/modules/FindFreetype.cmake.orig	2013-09-10 12:25:47.000000000 +0000
++++ cmake/modules/FindFreetype.cmake
+@@ -12,7 +12,7 @@ libfind_pkg_check_modules(Freetype_PKGCO
+ 
+ # Include dir
+ find_path(Freetype_INCLUDE_DIR
+-  NAMES freetype/freetype.h
++  NAMES ft2build.h
+   PATHS ${Freetype_PKGCONF_INCLUDE_DIRS}
+   PATH_SUFFIXES freetype2
+ )

graphics/darktable/patches/patch-src_common_imageio__exr.hh

@@ -1,10 +1,8 @@
-$NetBSD: patch-src_common_imageio__exr.hh,v 1.2 2013/05/09 15:27:02 wiz Exp $
+$NetBSD: patch-src_common_imageio__exr.hh,v 1.3 2013/12/04 13:02:08 drochner Exp $
 
-stdc++ fixes from joerg (first, first half of third junk).
+stdc++ fixes from joerg
 
-openexr-2.0 compat from http://www.darktable.org/redmine/issues/9398
-
---- src/common/imageio_exr.hh.orig	2013-04-03 20:13:14.000000000 +0000
+--- src/common/imageio_exr.hh.orig	2013-06-24 18:35:28.000000000 +0000
 +++ src/common/imageio_exr.hh
 @@ -21,7 +21,15 @@
  #include "common/image.h"
@@ -22,23 +20,7 @@ openexr-2.0 compat from http://www.darktable.org/redmine/issues/9398
  
  #include <OpenEXR/ImfFrameBuffer.h>
  #include <OpenEXR/ImfTestFile.h>
-@@ -30,8 +38,14 @@
- #include <OpenEXR/ImfChannelList.h>
- #include <OpenEXR/ImfStandardAttributes.h>
- 
-+#ifdef OPENEXR_IMF_INTERNAL_NAMESPACE
-+#define IMF_NS OPENEXR_IMF_INTERNAL_NAMESPACE
-+#else
-+#define IMF_NS Imf
-+#endif
-+
- // this stores our exif data as a blob.
--namespace Imf
-+namespace IMF_NS
- {
- class Blob
- {
-@@ -50,11 +64,11 @@ public:
+@@ -56,7 +64,7 @@ public:
    }
  
    uint32_t size;
@@ -47,8 +29,3 @@ openexr-2.0 compat from http://www.darktable.org/redmine/issues/9398
  };
  
  
--typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute;
-+typedef IMF_NS::TypedAttribute<IMF_NS::Blob> BlobAttribute;
- template <> const char *BlobAttribute::staticTypeName()
- {
-   return "blob";

graphics/darktable/patches/patch-src_develop_blend.c

@@ -1,17 +1,17 @@
-$NetBSD: patch-src_develop_blend.c,v 1.3 2012/12/08 00:15:26 jakllsch Exp $
+$NetBSD: patch-src_develop_blend.c,v 1.4 2013/12/04 13:02:08 drochner Exp $
 
---- src/develop/blend.c.orig	2012-11-23 23:23:21.000000000 +0000
+--- src/develop/blend.c.orig	2013-06-24 18:35:28.000000000 +0000
 +++ src/develop/blend.c
-@@ -1718,7 +1718,7 @@ void dt_develop_blend_process (struct dt
+@@ -1758,7 +1758,7 @@ void dt_develop_blend_process (struct dt
      if(self->suppress_mask && self->dev->gui_attached && self == self->dev->gui_module && piece->pipe == self->dev->pipe && (d->blendif & (1<<31)))
      {
  #ifdef _OPENMP
 -#if !defined(__SUNOS__)
 +#if !defined(__SUNOS__) && !defined(__NetBSD__)
-     #pragma omp parallel for default(none) shared(roi_out,mask,stderr)
+       #pragma omp parallel for default(none) shared(roi_out,mask,stderr)
  #else
-     #pragma omp parallel for shared(roi_out,mask)
-@@ -1733,7 +1733,7 @@ void dt_develop_blend_process (struct dt
+       #pragma omp parallel for shared(roi_out,mask)
+@@ -1773,7 +1773,7 @@ void dt_develop_blend_process (struct dt
  
  
  #ifdef _OPENMP