[37397] trunk/dports/graphics/tiff

[ryandesign at macports.org]

Revision: 37397
          http://trac.macosforge.org/projects/macports/changeset/37397
Author:   ryandesign at macports.org
Date:     2008-06-05 23:26:37 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
tiff: fix endian issues apparent in PowerPC half of universal binary. Fixes #13946 (maintainer timeout)

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

Added Paths:
-----------
    trunk/dports/graphics/tiff/files/
    trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff
    trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff

Modified: trunk/dports/graphics/tiff/Portfile
===================================================================
--- trunk/dports/graphics/tiff/Portfile	2008-06-06 03:01:34 UTC (rev 37396)
+++ trunk/dports/graphics/tiff/Portfile	2008-06-06 06:26:37 UTC (rev 37397)
@@ -4,7 +4,7 @@
 
 name		tiff
 version		3.8.2
-revision    1
+revision	2
 categories	graphics
 maintainers	waqar at macports.org
 description	Library and tools for dealing with Tag Image File Format
@@ -55,6 +55,14 @@
 
 platform macosx {
     configure.args-append   --with-apple-opengl-framework
+    if {[variant_isset universal]} {
+        patchfiles-append patch-universal-pre-configure.diff
+    }
+    post-configure {
+        if {[variant_isset universal]} {
+            system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-universal-post-configure.diff"
+        }
+    }
 }
 
 platform darwin 9 {

Added: trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff	                        (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff	2008-06-06 06:26:37 UTC (rev 37397)
@@ -0,0 +1,60 @@
+--- libtiff/tif_config.h	2008-06-06 00:01:22.000000000 -0500
++++ libtiff/tif_config.h	2008-06-06 00:08:55.000000000 -0500
+@@ -139,10 +139,18 @@
+ 
+ /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+    (Intel) */
+- at HOST_BIGENDIAN@
++#ifdef __BIG_ENDIAN__
++#define HOST_BIGENDIAN 1
++#else
++#define HOST_BIGENDIAN 0
++#endif
+ 
+ /* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+- at HOST_FILLORDER@
++#ifdef __BIG_ENDIAN__
++#define HOST_FILLORDER FILLORDER_MSB2LSB
++#else
++#define HOST_FILLORDER FILLORDER_LSB2MSB
++#endif
+ 
+ /* Support JPEG compression (requires IJG JPEG library) */
+ #define JPEG_SUPPORT 1
+@@ -231,7 +239,11 @@
+ 
+ /* Define to 1 if your processor stores words with the most significant byte
+    first (like Motorola and SPARC, unlike Intel and VAX). */
+- at WORDS_BIGENDIAN@
++#ifdef __BIG_ENDIAN__
++#define WORDS_BIGENDIAN 1
++#else
++#undef WORDS_BIGENDIAN
++#endif
+ 
+ /* Define to 1 if the X Window System is missing or not being used. */
+ /* #undef X_DISPLAY_MISSING */
+--- libtiff/tiffconf.h	2008-06-06 00:01:22.000000000 -0500
++++ libtiff/tiffconf.h	2008-06-06 00:09:15.000000000 -0500
+@@ -30,11 +30,19 @@
+ #define HAVE_IEEEFP 1
+ 
+ /* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+- at HOST_FILLORDER@
++#ifdef __BIG_ENDIAN__
++#define HOST_FILLORDER FILLORDER_MSB2LSB
++#else
++#define HOST_FILLORDER FILLORDER_LSB2MSB
++#endif
+ 
+ /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+    (Intel) */
+- at HOST_BIGENDIAN@
++#ifdef __BIG_ENDIAN__
++#define HOST_BIGENDIAN 1
++#else
++#define HOST_BIGENDIAN 0
++#endif
+ 
+ /* Support CCITT Group 3 & 4 algorithms */
+ #define CCITT_SUPPORT 1

Added: trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff	                        (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff	2008-06-06 06:26:37 UTC (rev 37397)
@@ -0,0 +1,41 @@
+--- libtiff/tif_config.h.in	2006-01-23 12:22:32.000000000 -0600
++++ libtiff/tif_config.h.in	2008-06-05 23:57:37.000000000 -0500
+@@ -138,10 +138,10 @@
+ 
+ /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+    (Intel) */
+-#undef HOST_BIGENDIAN
++ at HOST_BIGENDIAN@
+ 
+ /* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+-#undef HOST_FILLORDER
++ at HOST_FILLORDER@
+ 
+ /* Support JPEG compression (requires IJG JPEG library) */
+ #undef JPEG_SUPPORT
+@@ -230,7 +230,7 @@
+ 
+ /* Define to 1 if your processor stores words with the most significant byte
+    first (like Motorola and SPARC, unlike Intel and VAX). */
+-#undef WORDS_BIGENDIAN
++ at WORDS_BIGENDIAN@
+ 
+ /* Define to 1 if the X Window System is missing or not being used. */
+ #undef X_DISPLAY_MISSING
+diff -ru tiff-3.8.2-orig/libtiff/tiffconf.h.in tiff-3.8.2/libtiff/tiffconf.h.in
+--- libtiff/tiffconf.h.in	2005-12-27 05:28:23.000000000 -0600
++++ libtiff/tiffconf.h.in	2008-06-05 23:57:47.000000000 -0500
+@@ -29,11 +29,11 @@
+ #undef HAVE_IEEEFP
+ 
+ /* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
+-#undef HOST_FILLORDER
++ at HOST_FILLORDER@
+ 
+ /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
+    (Intel) */
+-#undef HOST_BIGENDIAN
++ at HOST_BIGENDIAN@
+ 
+ /* Support CCITT Group 3 & 4 algorithms */
+ #undef CCITT_SUPPORT

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080605/2f7ec9a2/attachment-0001.htm