[48175] trunk/dports/graphics/tiff
mcalhoun at macports.org
mcalhoun at macports.org
Sun Mar 15 18:55:43 PDT 2009
Revision: 48175
http://trac.macports.org/changeset/48175
Author: mcalhoun at macports.org
Date: 2009-03-15 18:55:43 -0700 (Sun, 15 Mar 2009)
Log Message:
-----------
tiff: Use muniversal PortGroup so that tiff builds correctly with 32/64-bit universal.
Fixes #18801 (maintainer timeout).
Should also fix #18076.
Modified Paths:
--------------
trunk/dports/graphics/tiff/Portfile
Added Paths:
-----------
trunk/dports/graphics/tiff/files/patch-configure.diff
Removed Paths:
-------------
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 2009-03-16 01:52:26 UTC (rev 48174)
+++ trunk/dports/graphics/tiff/Portfile 2009-03-16 01:55:43 UTC (rev 48175)
@@ -1,10 +1,11 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
name tiff
version 3.8.2
-revision 2
+revision 3
categories graphics
maintainers waqar at macports.org
description Library and tools for dealing with Tag Image File Format
@@ -31,6 +32,9 @@
sha1 549e67b6a15b42bfcd72fe17cda7c9a198a393eb \
rmd160 1b4d825e3be08764e953fc58246d0c25ab4dd17d
+# Turn on OpenGL with --with-apple-opengl-framework.
+patchfiles patch-configure.diff
+
depends_lib port:jpeg port:zlib
test.run yes
@@ -54,13 +58,18 @@
}
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"
+ if { ![variant_isset universal] } {
+ configure.args-append --with-apple-opengl-framework
+ } else {
+ # Tiger does not have 64-bit OpenGL.
+ if { ${os.major} > 8 } {
+ configure.args-append --with-apple-opengl-framework
+ } else {
+ global merger_configure_args
+ array set merger_configure_args {
+ ppc --with-apple-opengl-framework
+ i386 --with-apple-opengl-framework
+ }
}
}
}
Added: trunk/dports/graphics/tiff/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-configure.diff (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-configure.diff 2009-03-16 01:55:43 UTC (rev 48175)
@@ -0,0 +1,12 @@
+--- configure.orig 2006-03-23 09:44:47.000000000 -0500
++++ configure 2009-03-11 19:02:08.000000000 -0400
+@@ -19976,6 +19976,9 @@
+ fi
+
+
++if test "X$with_apple_opengl_framework" = "Xyes"; then
++ HAVE_OPENGL=yes
++fi
+
+ if test "$HAVE_OPENGL" = "yes"; then
+ HAVE_OPENGL_TRUE=
Deleted: trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff 2009-03-16 01:52:26 UTC (rev 48174)
+++ trunk/dports/graphics/tiff/files/patch-universal-post-configure.diff 2009-03-16 01:55:43 UTC (rev 48175)
@@ -1,60 +0,0 @@
---- 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
Deleted: trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff 2009-03-16 01:52:26 UTC (rev 48174)
+++ trunk/dports/graphics/tiff/files/patch-universal-pre-configure.diff 2009-03-16 01:55:43 UTC (rev 48175)
@@ -1,41 +0,0 @@
---- 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/20090315/14cc88f5/attachment.html>
More information about the macports-changes
mailing list