[120378] trunk/dports/graphics/tiff
mcalhoun at macports.org
mcalhoun at macports.org
Sun May 25 07:38:27 PDT 2014
Revision: 120378
https://trac.macports.org/changeset/120378
Author: mcalhoun at macports.org
Date: 2014-05-25 07:38:27 -0700 (Sun, 25 May 2014)
Log Message:
-----------
* 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
Modified Paths:
--------------
trunk/dports/graphics/tiff/Portfile
Added Paths:
-----------
trunk/dports/graphics/tiff/files/patch-acinclude.m4.diff
trunk/dports/graphics/tiff/files/patch-configure.ac.diff
trunk/dports/graphics/tiff/files/patch-tiffgt.c.diff
Removed Paths:
-------------
trunk/dports/graphics/tiff/files/patch-int64.diff
Modified: trunk/dports/graphics/tiff/Portfile
===================================================================
--- 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)
@@ -7,8 +7,7 @@
name tiff
version 4.0.3
-# skip revision 3
-revision 2
+revision 4
categories graphics
platforms darwin
license BSD
@@ -49,9 +48,17 @@
use_autoreconf yes
autoreconf.args -fvi
-patchfiles patch-int64.diff
+# 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
configure.args --disable-jbig \
+ --with-x=no \
--with-docdir=${prefix}/share/doc/${name} \
--with-jpeg-include-dir=${prefix}/include \
--with-jpeg-lib-dir=${prefix}/lib \
@@ -65,17 +72,10 @@
use_parallel_build yes
-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
- }
-}
-
minimum_xcodeversions {9 3.1}
# tools/tiffgt.c incorrectly uses HAVE_APPLE_OPENGL_FRAMEWORK rather than HAVE_OPENGL_GL_H
+# see http://bugzilla.maptools.org/show_bug.cgi?id=2363
configure.cppflags-append \
-DHAVE_APPLE_OPENGL_FRAMEWORK
Added: trunk/dports/graphics/tiff/files/patch-acinclude.m4.diff
===================================================================
--- 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)
@@ -0,0 +1,29 @@
+--- 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/'`],
Added: trunk/dports/graphics/tiff/files/patch-configure.ac.diff
===================================================================
--- 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)
@@ -0,0 +1,47 @@
+--- 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
Deleted: trunk/dports/graphics/tiff/files/patch-int64.diff
===================================================================
--- 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)
@@ -1,67 +0,0 @@
-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
-
Added: trunk/dports/graphics/tiff/files/patch-tiffgt.c.diff
===================================================================
--- 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)
@@ -0,0 +1,10 @@
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140525/a2b26dc1/attachment.html>
More information about the macports-changes
mailing list