[102823] trunk/dports/graphics/tiff
jmr at macports.org
jmr at macports.org
Fri Feb 8 17:39:39 PST 2013
Revision: 102823
https://trac.macports.org/changeset/102823
Author: jmr at macports.org
Date: 2013-02-08 17:39:39 -0800 (Fri, 08 Feb 2013)
Log Message:
-----------
tiff: work around conflict with jpeg header
Modified Paths:
--------------
trunk/dports/graphics/tiff/Portfile
Added Paths:
-----------
trunk/dports/graphics/tiff/files/libtiff__tif_jpeg.c.patch
trunk/dports/graphics/tiff/files/libtiff__tif_ojpeg.c.patch
Modified: trunk/dports/graphics/tiff/Portfile
===================================================================
--- trunk/dports/graphics/tiff/Portfile 2013-02-09 00:51:24 UTC (rev 102822)
+++ trunk/dports/graphics/tiff/Portfile 2013-02-09 01:39:39 UTC (rev 102823)
@@ -36,6 +36,8 @@
depends_lib port:jpeg port:zlib
+patchfiles libtiff__tif_jpeg.c.patch libtiff__tif_ojpeg.c.patch
+
test.run yes
test.target check
Added: trunk/dports/graphics/tiff/files/libtiff__tif_jpeg.c.patch
===================================================================
--- trunk/dports/graphics/tiff/files/libtiff__tif_jpeg.c.patch (rev 0)
+++ trunk/dports/graphics/tiff/files/libtiff__tif_jpeg.c.patch 2013-02-09 01:39:39 UTC (rev 102823)
@@ -0,0 +1,17 @@
+--- libtiff/tif_jpeg.c.orig 2012-09-23 00:48:09.000000000 +1000
++++ libtiff/tif_jpeg.c 2013-02-09 12:25:15.000000000 +1100
+@@ -81,8 +81,13 @@
+ # ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
+ typedef unsigned char boolean;
+ # endif
+-# define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
++#else
++/* tiffiop.h defines TRUE and FALSE, which would cause jmorecfg.h's attempted:
++ * typedef enum { FALSE = 0, TRUE = 1 } boolean;
++ * to fail. */
++typedef int boolean;
+ #endif
++# define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+
+ #include "jpeglib.h"
+ #include "jerror.h"
Added: trunk/dports/graphics/tiff/files/libtiff__tif_ojpeg.c.patch
===================================================================
--- trunk/dports/graphics/tiff/files/libtiff__tif_ojpeg.c.patch (rev 0)
+++ trunk/dports/graphics/tiff/files/libtiff__tif_ojpeg.c.patch 2013-02-09 01:39:39 UTC (rev 102823)
@@ -0,0 +1,15 @@
+--- libtiff/tif_ojpeg.c.orig 2010-12-14 12:45:51.000000000 +1100
++++ libtiff/tif_ojpeg.c 2013-02-09 12:33:00.000000000 +1100
+@@ -189,6 +189,12 @@
+ #include <setjmp.h>
+ #endif
+
++/* tiffiop.h defines TRUE and FALSE, which would cause jmorecfg.h's attempted:
++ * typedef enum { FALSE = 0, TRUE = 1 } boolean;
++ * to fail. */
++typedef int boolean;
++#define HAVE_BOOLEAN
++
+ #include "jpeglib.h"
+ #include "jerror.h"
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130208/d2dfb84f/attachment.html>
More information about the macports-changes
mailing list