Import of pkgsrc-2014Q1

graphics/darktable/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2014/02/19 09:44:56 jperkin Exp $
 
-DISTNAME=	darktable-1.2
-PKGREVISION=	5
+DISTNAME=	darktable-1.2.3
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darktable/}
 EXTRACT_SUFX=	.tar.xz
@@ -41,8 +41,8 @@ LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/darktable
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${MACHINE_ARCH} == "i386"
 # SSE alignment issues
-GCC_REQD=	4.2
-CFLAGS+=	-mstackrealign -msse2
+GCC_REQD+=	4.2
+CFLAGS+=	-mstackrealign -msse2 -march=i686
 .endif
 
 .if ${OPSYS} == "NetBSD"
@@ -66,6 +66,7 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/GraphicsMagick/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/gegl/buildlink3.mk"
 .include "../../graphics/lensfun/buildlink3.mk"
@@ -75,7 +76,7 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../net/flickcurl/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
+#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"

graphics/darktable/PLIST

@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2013/04/21 14:12:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2013/12/04 13:02:08 drochner Exp $
 bin/darktable
 bin/darktable-cli
-bin/darktable-cltest
 bin/darktable-viewer
 lib/darktable/libdarktable.so
 lib/darktable/plugins/imageio/format/libcopy.so
@@ -114,6 +113,7 @@ lib/darktable/views/libdarkroom.so
 lib/darktable/views/liblighttable.so
 lib/darktable/views/libmap.so
 man/man1/darktable.1
+share/appdata/darktable.appdata.xml
 share/applications/darktable.desktop
 share/darktable/darktable.gtkrc
 share/darktable/darktablerc
@@ -207,23 +207,17 @@ share/icons/hicolor/32x32/apps/darktable.png
 share/icons/hicolor/48x48/apps/darktable.png
 share/icons/hicolor/64x64/apps/darktable.png
 share/icons/hicolor/scalable/apps/darktable.svg
-share/locale/ca/LC_MESSAGES/darktable.mo
-share/locale/cs/LC_MESSAGES/darktable.mo
+share/locale/da/LC_MESSAGES/darktable.mo
 share/locale/de/LC_MESSAGES/darktable.mo
 share/locale/es/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/pt_BR/LC_MESSAGES/darktable.mo
 share/locale/pt_PT/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/sv/LC_MESSAGES/darktable.mo
-share/locale/th/LC_MESSAGES/darktable.mo
 share/locale/uk/LC_MESSAGES/darktable.mo
-share/locale/zh_CN/LC_MESSAGES/darktable.mo

graphics/darktable/distinfo

@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.20 2013/05/09 15:27:02 wiz Exp $
+$NetBSD: distinfo,v 1.22 2014/03/23 15:16:35 spz Exp $
 
-SHA1 (darktable-1.2.tar.xz) = 2a444a691bd7cf77a9cdbb174d3ce5b2e247efd2
-RMD160 (darktable-1.2.tar.xz) = 765267bcde5d7970af03f3be23ad1dc8a85a7212
-Size (darktable-1.2.tar.xz) = 2399856 bytes
+SHA1 (darktable-1.2.3.tar.xz) = dbd7545d1fbb5f67862f62ae39c7e6ba008d1c10
+RMD160 (darktable-1.2.3.tar.xz) = 3148a7f9063c372b3477525cacf518750c88766d
+Size (darktable-1.2.3.tar.xz) = 2348864 bytes
+SHA1 (patch-aa) = 7b6987512bdac0477ab724ade75785802903dfd8
+SHA1 (patch-cmake_modules_FindFreetype.cmake) = fb69e7a413f455490649d4b2b39cce74408dd332
 SHA1 (patch-cmake_modules_FindGTK2.cmake) = de1273594801ab82da31b624845e0b36a77b53b3
 SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 8227a7180383cd4379313b07ff964bb7fb9ce694
-SHA1 (patch-src_common_imageio__exr.hh) = e8d4fc364656746078dca9406029e382f2ab92c6
+SHA1 (patch-src_common_imageio__exr.hh) = 8bef7fab739dfdd0688371b08d6f31503eaf04af
 SHA1 (patch-src_common_imageio__rgbe.c) = 5c396754d6dbb7390062e78afde315ee293215d6
-SHA1 (patch-src_develop_blend.c) = d847c5d6a9f2c0e914d1fced8eb76ce79f127f70
+SHA1 (patch-src_develop_blend.c) = de54957d16b8230e05ffd945c50b76d7a13b4936
 SHA1 (patch-src_iop_lens.c) = 28b5462311f778184143152bdef4e59ee18a6a3f

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