diff options
| author | wiz <wiz> | 2013-05-09 15:27:02 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-05-09 15:27:02 +0000 |
| commit | ce39ab691ef26eba2ed7e005b15420d31e42e1bd (patch) | |
| tree | 6b399d173f67cd2e43ea7e094a6b4806c303c522 /graphics | |
| parent | b693a6b7649fc664404c6ba179ba9ef13eb9be39 (diff) | |
| download | pkgsrc-ce39ab691ef26eba2ed7e005b15420d31e42e1bd.tar.gz | |
Fix build with openexr. Comment patch (hi joerg).
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/darktable/distinfo | 4 | ||||
| -rw-r--r-- | graphics/darktable/patches/patch-src_common_imageio__exr.hh | 31 |
2 files changed, 30 insertions, 5 deletions
diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index 6a8ca1b2755..7c6847da5f1 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.19 2013/05/06 14:47:47 joerg Exp $ +$NetBSD: distinfo,v 1.20 2013/05/09 15:27:02 wiz Exp $ SHA1 (darktable-1.2.tar.xz) = 2a444a691bd7cf77a9cdbb174d3ce5b2e247efd2 RMD160 (darktable-1.2.tar.xz) = 765267bcde5d7970af03f3be23ad1dc8a85a7212 Size (darktable-1.2.tar.xz) = 2399856 bytes SHA1 (patch-cmake_modules_FindGTK2.cmake) = de1273594801ab82da31b624845e0b36a77b53b3 SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 8227a7180383cd4379313b07ff964bb7fb9ce694 -SHA1 (patch-src_common_imageio__exr.hh) = 310fe043db5dcc107d710e411c11493f698a1b65 +SHA1 (patch-src_common_imageio__exr.hh) = e8d4fc364656746078dca9406029e382f2ab92c6 SHA1 (patch-src_common_imageio__rgbe.c) = 5c396754d6dbb7390062e78afde315ee293215d6 SHA1 (patch-src_develop_blend.c) = d847c5d6a9f2c0e914d1fced8eb76ce79f127f70 SHA1 (patch-src_iop_lens.c) = 28b5462311f778184143152bdef4e59ee18a6a3f diff --git a/graphics/darktable/patches/patch-src_common_imageio__exr.hh b/graphics/darktable/patches/patch-src_common_imageio__exr.hh index e2a9f7effc2..c5d1de42ab9 100644 --- a/graphics/darktable/patches/patch-src_common_imageio__exr.hh +++ b/graphics/darktable/patches/patch-src_common_imageio__exr.hh @@ -1,6 +1,10 @@ -$NetBSD: patch-src_common_imageio__exr.hh,v 1.1 2013/05/06 14:47:48 joerg Exp $ +$NetBSD: patch-src_common_imageio__exr.hh,v 1.2 2013/05/09 15:27:02 wiz Exp $ ---- src/common/imageio_exr.hh.orig 2013-05-04 14:59:46.000000000 +0000 +stdc++ fixes from joerg (first, first half of third junk). + +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 @@ -21,7 +21,15 @@ #include "common/image.h" @@ -18,7 +22,23 @@ $NetBSD: patch-src_common_imageio__exr.hh,v 1.1 2013/05/06 14:47:48 joerg Exp $ #include <OpenEXR/ImfFrameBuffer.h> #include <OpenEXR/ImfTestFile.h> -@@ -50,7 +58,7 @@ public: +@@ -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: } uint32_t size; @@ -27,3 +47,8 @@ $NetBSD: patch-src_common_imageio__exr.hh,v 1.1 2013/05/06 14:47:48 joerg Exp $ }; +-typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute; ++typedef IMF_NS::TypedAttribute<IMF_NS::Blob> BlobAttribute; + template <> const char *BlobAttribute::staticTypeName() + { + return "blob"; |