Changeset 120378


Ignore:
Timestamp:
May 25, 2014, 2:38:27 PM (6 years ago)
Author:
mcalhoun@…
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
Location:
trunk/dports/graphics/tiff
Files:
3 added
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/tiff/Portfile

    r120230 r120378  
    88name                tiff
    99version             4.0.3
    10 # skip revision 3
    11 revision            2
     10revision            4
    1211categories          graphics
    1312platforms           darwin
     
    5049autoreconf.args     -fvi
    5150
    52 patchfiles          patch-int64.diff
     51# first patch fixes two problems
     52#     have typedefs be consistent with OSX headers (see http://trac.macports.org/ticket/41280)
     53#     prevent configure script from assuming that if we don't want X11, then we don't want OpenGL either
     54# prevent tiff viewer from displaying a blank screen (see http://bugzilla.maptools.org/show_bug.cgi?id=2401)
     55# prevent configure script from finding X11 OpenGL (e.g. mesa & freeglut)
     56patchfiles          patch-configure.ac.diff  \
     57                    patch-tiffgt.c.diff      \
     58                    patch-acinclude.m4.diff
    5359
    5460configure.args      --disable-jbig \
     61                    --with-x=no \
    5562                    --with-docdir=${prefix}/share/doc/${name} \
    5663                    --with-jpeg-include-dir=${prefix}/include \
     
    6673use_parallel_build  yes
    6774
    68 platform macosx {
    69     # Tiger does not have 64-bit OpenGL.
    70     if {${os.major} > 8 || (![variant_isset universal] && ![string match *64* $build_arch])
    71         || ([variant_isset universal] && ![string match *64* $universal_archs])} {
    72         configure.args-append   --with-apple-opengl-framework
    73     }
    74 }
    75 
    7675minimum_xcodeversions {9 3.1}
    7776
    7877# tools/tiffgt.c incorrectly uses HAVE_APPLE_OPENGL_FRAMEWORK rather than HAVE_OPENGL_GL_H
     78# see http://bugzilla.maptools.org/show_bug.cgi?id=2363
    7979configure.cppflags-append \
    8080                    -DHAVE_APPLE_OPENGL_FRAMEWORK
Note: See TracChangeset for help on using the changeset viewer.