<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120378] trunk/dports/graphics/tiff</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120378">120378</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-05-25 07:38:27 -0700 (Sun, 25 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre> * prevent the use of X11, especially X11 OpenGL (should fix #43642)
* allow OpenGL to be used even when X11 is not being used
* remove obsolete configure arguments
* apply slightly less invasive patch to solve #41280</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicstiffPortfile">trunk/dports/graphics/tiff/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicstifffilespatchacincludem4diff">trunk/dports/graphics/tiff/files/patch-acinclude.m4.diff</a></li>
<li><a href="#trunkdportsgraphicstifffilespatchconfigureacdiff">trunk/dports/graphics/tiff/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgraphicstifffilespatchtiffgtcdiff">trunk/dports/graphics/tiff/files/patch-tiffgt.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicstifffilespatchint64diff">trunk/dports/graphics/tiff/files/patch-int64.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicstiffPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/tiff/Portfile (120377 => 120378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/tiff/Portfile 2014-05-25 10:58:33 UTC (rev 120377)
+++ trunk/dports/graphics/tiff/Portfile 2014-05-25 14:38:27 UTC (rev 120378)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx">
</span><span class="cx"> name tiff
</span><span class="cx"> version 4.0.3
</span><del>-# skip revision 3
-revision 2
</del><ins>+revision 4
</ins><span class="cx"> categories graphics
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="lines">@@ -49,9 +48,17 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><del>-patchfiles patch-int64.diff
</del><ins>+# first patch fixes two problems
+# have typedefs be consistent with OSX headers (see http://trac.macports.org/ticket/41280)
+# prevent configure script from assuming that if we don't want X11, then we don't want OpenGL either
+# prevent tiff viewer from displaying a blank screen (see http://bugzilla.maptools.org/show_bug.cgi?id=2401)
+# prevent configure script from finding X11 OpenGL (e.g. mesa & freeglut)
+patchfiles patch-configure.ac.diff \
+ patch-tiffgt.c.diff \
+ patch-acinclude.m4.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --disable-jbig \
</span><ins>+ --with-x=no \
</ins><span class="cx"> --with-docdir=${prefix}/share/doc/${name} \
</span><span class="cx"> --with-jpeg-include-dir=${prefix}/include \
</span><span class="cx"> --with-jpeg-lib-dir=${prefix}/lib \
</span><span class="lines">@@ -65,17 +72,10 @@
</span><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-platform macosx {
- # Tiger does not have 64-bit OpenGL.
- if {${os.major} > 8 || (![variant_isset universal] && ![string match *64* $build_arch])
- || ([variant_isset universal] && ![string match *64* $universal_archs])} {
- configure.args-append --with-apple-opengl-framework
- }
-}
-
</del><span class="cx"> minimum_xcodeversions {9 3.1}
</span><span class="cx">
</span><span class="cx"> # tools/tiffgt.c incorrectly uses HAVE_APPLE_OPENGL_FRAMEWORK rather than HAVE_OPENGL_GL_H
</span><ins>+# see http://bugzilla.maptools.org/show_bug.cgi?id=2363
</ins><span class="cx"> configure.cppflags-append \
</span><span class="cx"> -DHAVE_APPLE_OPENGL_FRAMEWORK
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicstifffilespatchacincludem4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/tiff/files/patch-acinclude.m4.diff (0 => 120378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/tiff/files/patch-acinclude.m4.diff (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-acinclude.m4.diff 2014-05-25 14:38:27 UTC (rev 120378)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- m4/acinclude.m4.orig 2014-05-25 05:30:58.000000000 -0700
++++ m4/acinclude.m4 2010-07-08 09:10:23.000000000 -0700
+@@ -266,7 +266,7 @@
+ CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}"
+ ax_save_LIBS="${LIBS}"
+ LIBS=""
+-ax_check_libs="-lopengl32 -lGL"
++ax_check_libs="-lopengl32"
+ for ax_lib in ${ax_check_libs}; do
+ AS_IF([test X$ax_compiler_ms = Xyes],
+ [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
+@@ -402,7 +402,7 @@
+ [AX_CHECK_GLU_PROGRAM],
+ [ax_cv_check_glu_libglu=yes],
+ [LIBS=""
+-ax_check_libs="-lglu32 -lGLU"
++ax_check_libs="-lglu32"
+ for ax_lib in ${ax_check_libs}; do
+ AS_IF([test X$ax_compiler_ms = Xyes],
+ [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
+@@ -540,7 +540,7 @@
+ CPPFLAGS="${GLUT_CFLAGS} ${CPPFLAGS}"
+ ax_save_LIBS="${LIBS}"
+ LIBS=""
+-ax_check_libs="-lglut32 -lglut"
++ax_check_libs="-lglut32"
+ for ax_lib in ${ax_check_libs}; do
+ AS_IF([test X$ax_compiler_ms = Xyes],
+ [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`],
</ins></span></pre></div>
<a id="trunkdportsgraphicstifffilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/tiff/files/patch-configure.ac.diff (0 => 120378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/tiff/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-configure.ac.diff 2014-05-25 14:38:27 UTC (rev 120378)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+--- configure.ac.orig 2012-09-22 09:05:24.000000000 -0700
++++ configure.ac 2014-05-25 07:13:21.000000000 -0700
+@@ -270,13 +270,13 @@
+ AC_MSG_CHECKING(for signed 64-bit type)
+ INT64_T='none'
+ INT64_FORMAT='none'
+-if test $ac_cv_sizeof_signed_long -eq 8
++if test $ac_cv_sizeof_signed_long_long -eq 8
+ then
+- INT64_T='signed long'
++ INT64_T='signed long long'
+ INT64_FORMAT='"%ld"'
+-elif test $ac_cv_sizeof_signed_long_long -eq 8
++elif test $ac_cv_sizeof_signed_long -eq 8
+ then
+- INT64_T='signed long long'
++ INT64_T='signed long'
+ case "${host_os}" in
+ mingw32*)
+ # MinGW32 understands 'long long', but uses printf from WIN32 CRT
+@@ -296,13 +296,13 @@
+ AC_MSG_CHECKING(for unsigned 64-bit type)
+ UINT64_T='none'
+ UINT64_FORMAT='none'
+-if test $ac_cv_sizeof_unsigned_long -eq 8
++if test $ac_cv_sizeof_unsigned_long_long -eq 8
+ then
+- UINT64_T='unsigned long'
++ UINT64_T='unsigned long long'
+ UINT64_FORMAT='"%lu"'
+-elif test $ac_cv_sizeof_unsigned_long_long -eq 8
++elif test $ac_cv_sizeof_unsigned_long -eq 8
+ then
+- UINT64_T='unsigned long long'
++ UINT64_T='unsigned long'
+ case "${host_os}" in
+ mingw32*)
+ # MinGW32 understands 'unsigned long long', but uses printf from WIN32 CRT
+@@ -823,7 +823,7 @@
+ dnl AX_CHECK_GLUT sets GLUT_CFLAGS & GLUT_LIBS
+ AX_CHECK_GLUT
+
+-if test "$no_x" != "yes" -a "$no_gl" != "yes" \
++if test "$no_gl" != "yes" \
+ -a "$no_glu" != "yes" -a "$no_glut" != "yes" ; then
+ HAVE_OPENGL=yes
+ fi
</ins></span></pre></div>
<a id="trunkdportsgraphicstifffilespatchint64diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/tiff/files/patch-int64.diff (120377 => 120378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/tiff/files/patch-int64.diff 2014-05-25 10:58:33 UTC (rev 120377)
+++ trunk/dports/graphics/tiff/files/patch-int64.diff 2014-05-25 14:38:27 UTC (rev 120378)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-http://trac.macports.org/ticket/41280
-http://bugzilla.maptools.org/show_bug.cgi?id=2464
-
-This is patch that tries to fix the most urgest problem of incompatible 64-bit integer types with minimal possible changes.
-Ideally the problem should be fixed upstream in a proper way with more radical changes.
-
---- configure.orig
-+++ configure
-@@ -17042,7 +17042,7 @@ fi
- $as_echo "$INT64_T" >&6; }
-
- cat >>confdefs.h <<_ACEOF
--#define TIFF_INT64_T $INT64_T
-+#define TIFF_INT64_T int64_t
- _ACEOF
-
-
-@@ -17076,7 +17076,7 @@ fi
- $as_echo "$UINT64_T" >&6; }
-
- cat >>confdefs.h <<_ACEOF
--#define TIFF_UINT64_T $UINT64_T
-+#define TIFF_UINT64_T uint64_t
- _ACEOF
-
-
---- configure.ac.orig
-+++ configure.ac
-@@ -290,7 +290,7 @@ fi
-
-
- AC_MSG_RESULT($INT64_T)
--AC_DEFINE_UNQUOTED(TIFF_INT64_T,$INT64_T,[Signed 64-bit type])
-+AC_DEFINE_UNQUOTED(TIFF_INT64_T,[int64_t],[Signed 64-bit type])
- AC_DEFINE_UNQUOTED(TIFF_INT64_FORMAT,$INT64_FORMAT,[Signed 64-bit type formatter])
-
- AC_MSG_CHECKING(for unsigned 64-bit type)
-@@ -314,7 +314,7 @@ then
- esac
- fi
- AC_MSG_RESULT($UINT64_T)
--AC_DEFINE_UNQUOTED(TIFF_UINT64_T,$UINT64_T,[Unsigned 64-bit type])
-+AC_DEFINE_UNQUOTED(TIFF_UINT64_T,[uint64_t],[Unsigned 64-bit type])
- AC_DEFINE_UNQUOTED(TIFF_UINT64_FORMAT,$UINT64_FORMAT,[Unsigned 64-bit type formatter])
-
- # Determine TIFF equivalent of ssize_t
---- libtiff/tif_config.h.in.orig
-+++ libtiff/tif_config.h.in
-@@ -1,5 +1,7 @@
- /* libtiff/tif_config.h.in. Generated from configure.ac by autoheader. */
-
-+#include <stdint.h>
-+
- /* Define if building universal (internal helper macro) */
- #undef AC_APPLE_UNIVERSAL_BUILD
-
---- libtiff/tiffconf.h.in.orig
-+++ libtiff/tiffconf.h.in
-@@ -7,6 +7,8 @@
- #ifndef _TIFFCONF_
- #define _TIFFCONF_
-
-+#include <stdint.h>
-+
- /* Signed 16-bit type */
- #undef TIFF_INT16_T
-
</del></span></pre></div>
<a id="trunkdportsgraphicstifffilespatchtiffgtcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/tiff/files/patch-tiffgt.c.diff (0 => 120378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/tiff/files/patch-tiffgt.c.diff (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-tiffgt.c.diff 2014-05-25 14:38:27 UTC (rev 120378)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- tools/tiffgt.c.orig 2010-07-08 09:10:24.000000000 -0700
++++ tools/tiffgt.c 2014-05-24 23:11:39.000000000 -0700
+@@ -287,6 +287,7 @@
+ raster_draw(void)
+ {
+ glDrawPixels(img.width, img.height, GL_RGBA, GL_UNSIGNED_BYTE, (const GLvoid *) raster);
++ glFlush();
+ }
+
+ static void
</ins></span></pre>
</div>
</div>
</body>
</html>