diff options
| author | richard <richard> | 2015-10-05 04:37:39 +0000 |
|---|---|---|
| committer | richard <richard> | 2015-10-05 04:37:39 +0000 |
| commit | 5ec2860c082b8ade930fa002506ea7a8a6558f19 (patch) | |
| tree | 027d20cd4428b8369d2eb7b80b8efb5b11daae1d | |
| parent | 30d7a8452334586cf5e1a6238ba7db9715367d80 (diff) | |
| download | pkgsrc-5ec2860c082b8ade930fa002506ea7a8a6558f19.tar.gz | |
patches to undefine DS if sys/regset.h is pulled in on SunOS
| -rw-r--r-- | graphics/libraw/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libraw/patches/patch-internal_libraw__x3f.cpp | 17 | ||||
| -rw-r--r-- | graphics/libraw/patches/patch-src_libraw__cxx.cpp | 16 |
3 files changed, 36 insertions, 1 deletions
diff --git a/graphics/libraw/distinfo b/graphics/libraw/distinfo index 2ef07cef431..8a08ddba35d 100644 --- a/graphics/libraw/distinfo +++ b/graphics/libraw/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.19 2015/07/18 10:40:20 adam Exp $ +$NetBSD: distinfo,v 1.20 2015/10/05 04:37:39 richard Exp $ SHA1 (LibRaw-0.16.2.tar.gz) = fd74432c9167a5621d24cb5ba0d1fc082a8963b4 RMD160 (LibRaw-0.16.2.tar.gz) = 8857b3531be0c96e4715dd7e3f4ba97e9d0f82ac Size (LibRaw-0.16.2.tar.gz) = 1476575 bytes SHA1 (patch-configure) = 7626ff87dff75da3c7c136b095ee920a0045c064 +SHA1 (patch-internal_libraw__x3f.cpp) = c141c9a86193717b829afc2795b9c4d3976fa490 SHA1 (patch-libraw__r.pc.in) = e691f79c69c5530c93262c270fe7e2f5b1c959d9 +SHA1 (patch-src_libraw__cxx.cpp) = cfbb3afbd0b44ce1bbc24e5af212ad5c53d251b7 diff --git a/graphics/libraw/patches/patch-internal_libraw__x3f.cpp b/graphics/libraw/patches/patch-internal_libraw__x3f.cpp new file mode 100644 index 00000000000..4a7c55e403b --- /dev/null +++ b/graphics/libraw/patches/patch-internal_libraw__x3f.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-internal_libraw__x3f.cpp,v 1.1 2015/10/05 04:37:39 richard Exp $ + +undefine DS if sys/regset.h is pulled in on SunOS + +--- internal/libraw_x3f.cpp.orig 2015-05-16 12:32:15.000000000 +0000 ++++ internal/libraw_x3f.cpp +@@ -619,7 +619,9 @@ static x3f_huffman_t *new_huffman(x3f_hu + /* --------------------------------------------------------------------- */ + /* Creating a new x3f structure from file */ + /* --------------------------------------------------------------------- */ +- ++#ifdef DS ++#undef DS ++#endif + /* extern */ x3f_t *x3f_new_from_file(LibRaw_abstract_datastream *infile) + { + x3f_t *x3f = (x3f_t *)calloc(1, sizeof(x3f_t)); diff --git a/graphics/libraw/patches/patch-src_libraw__cxx.cpp b/graphics/libraw/patches/patch-src_libraw__cxx.cpp new file mode 100644 index 00000000000..3bd44d9534e --- /dev/null +++ b/graphics/libraw/patches/patch-src_libraw__cxx.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-src_libraw__cxx.cpp,v 1.1 2015/10/05 04:37:39 richard Exp $ + +undefine DS if sys/regset.h is pulled in on SunOS + +--- src/libraw_cxx.cpp.orig 2015-05-16 12:32:15.000000000 +0000 ++++ src/libraw_cxx.cpp +@@ -3623,6 +3623,9 @@ void LibRaw::parse_x3f() + _x3f_data = x3f; + + x3f_header_t *H = NULL; ++#ifdef DS ++#undef DS ++#endif + x3f_directory_section_t *DS = NULL; + + H = &x3f->header; |