Mon Oct 5 04:37:40 2015 UTC ()
patches to undefine DS if sys/regset.h is pulled in on SunOS
(richard)
diff -r1.19 -r1.20 pkgsrc/graphics/libraw/distinfo
diff -r0 -r1.1 pkgsrc/graphics/libraw/patches/patch-internal_libraw__x3f.cpp
diff -r0 -r1.1 pkgsrc/graphics/libraw/patches/patch-src_libraw__cxx.cpp
--- pkgsrc/graphics/libraw/distinfo 2015/07/18 10:40:20 1.19
+++ pkgsrc/graphics/libraw/distinfo 2015/10/05 04:37:39 1.20
| @@ -1,7 +1,9 @@ | | | @@ -1,7 +1,9 @@ |
| 1 | $NetBSD: distinfo,v 1.19 2015/07/18 10:40:20 adam Exp $ | | 1 | $NetBSD: distinfo,v 1.20 2015/10/05 04:37:39 richard Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (LibRaw-0.16.2.tar.gz) = fd74432c9167a5621d24cb5ba0d1fc082a8963b4 | | 3 | SHA1 (LibRaw-0.16.2.tar.gz) = fd74432c9167a5621d24cb5ba0d1fc082a8963b4 |
| 4 | RMD160 (LibRaw-0.16.2.tar.gz) = 8857b3531be0c96e4715dd7e3f4ba97e9d0f82ac | | 4 | RMD160 (LibRaw-0.16.2.tar.gz) = 8857b3531be0c96e4715dd7e3f4ba97e9d0f82ac |
| 5 | Size (LibRaw-0.16.2.tar.gz) = 1476575 bytes | | 5 | Size (LibRaw-0.16.2.tar.gz) = 1476575 bytes |
| 6 | SHA1 (patch-configure) = 7626ff87dff75da3c7c136b095ee920a0045c064 | | 6 | SHA1 (patch-configure) = 7626ff87dff75da3c7c136b095ee920a0045c064 |
| | | 7 | SHA1 (patch-internal_libraw__x3f.cpp) = c141c9a86193717b829afc2795b9c4d3976fa490 |
| 7 | SHA1 (patch-libraw__r.pc.in) = e691f79c69c5530c93262c270fe7e2f5b1c959d9 | | 8 | SHA1 (patch-libraw__r.pc.in) = e691f79c69c5530c93262c270fe7e2f5b1c959d9 |
| | | 9 | SHA1 (patch-src_libraw__cxx.cpp) = cfbb3afbd0b44ce1bbc24e5af212ad5c53d251b7 |
$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));
$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;