[154304] trunk/dports/graphics/ufraw

[devans at macports.org]

Revision: 154304
          https://trac.macports.org/changeset/154304
Author:   devans at macports.org
Date:     2016-10-26 21:41:14 +0200 (Wed, 26 Oct 2016)
Log Message:
-----------
ufraw: patch dcraw.cc to fix int vs boolean issue that breaks build (#52619).

Modified Paths:
--------------
    trunk/dports/graphics/ufraw/Portfile

Added Paths:
-----------
    trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff

Modified: trunk/dports/graphics/ufraw/Portfile
===================================================================
--- trunk/dports/graphics/ufraw/Portfile	2016-10-26 17:12:49 UTC (rev 154303)
+++ trunk/dports/graphics/ufraw/Portfile	2016-10-26 19:41:14 UTC (rev 154304)
@@ -41,7 +41,8 @@
                     port:lensfun \
                     port:tiff
 
-patchfiles          patch-ufraw-gimp.c.diff \
+patchfiles          patch-dcraw.cc.diff \
+                    patch-ufraw-gimp.c.diff \
                     patch-uf_gtk.cc.diff
 
 platform darwin {

Added: trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff
===================================================================
--- trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff	                        (rev 0)
+++ trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff	2016-10-26 19:41:14 UTC (rev 154304)
@@ -0,0 +1,29 @@
+--- dcraw.cc.orig	2016-10-26 11:00:19.000000000 -0700
++++ dcraw.cc	2016-10-26 12:20:29.000000000 -0700
+@@ -2404,7 +2404,7 @@
+ #endif
+   cinfo->src->next_input_byte = jpeg_buffer;
+   cinfo->src->bytes_in_buffer = nbytes;
+-  return TRUE;
++  return (boolean) TRUE;
+ }
+ 
+ void CLASS kodak_jpeg_load_raw()
+@@ -2420,7 +2420,7 @@
+   jpeg_create_decompress (&cinfo);
+   jpeg_stdio_src (&cinfo, ifp);
+   cinfo.src->fill_input_buffer = fill_input_buffer;
+-  jpeg_read_header (&cinfo, TRUE);
++  jpeg_read_header (&cinfo, (boolean) TRUE);
+   jpeg_start_decompress (&cinfo);
+   if ((cinfo.output_width      != width  ) ||
+       (cinfo.output_height*2   != height ) ||
+@@ -2493,7 +2493,7 @@
+     if (tile_length < INT_MAX)
+       fseek (ifp, get4(), SEEK_SET);
+     jpeg_stdio_src (&cinfo, ifp);
+-    jpeg_read_header (&cinfo, TRUE);
++    jpeg_read_header (&cinfo, (boolean) TRUE);
+     jpeg_start_decompress (&cinfo);
+     buf = (*cinfo.mem->alloc_sarray)
+ 	((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161026/8ed60f28/attachment-0002.html>