diff --git a/portage/win32libs/tiff/tiff-4.0.7-20161202.diff b/portage/win32libs/tiff/tiff-4.0.7-20161202.diff new file mode 100644 index 000000000..a5034bc98 --- /dev/null +++ b/portage/win32libs/tiff/tiff-4.0.7-20161202.diff @@ -0,0 +1,18 @@ +diff -Nrub tiff-4.0.7/CMakeLists.txt.old tiff-4.0.7/CMakeLists.txt +--- tiff-4.0.7/CMakeLists.txt.old Fri Dec 2 11:57:44 2016 ++++ tiff-4.0.7/CMakeLists.txt Fri Dec 2 11:58:09 2016 +@@ -467,12 +467,12 @@ + HOST_BIG_ENDIAN HAVE_IEEEFP) + + # Large file support +-if (UNIX) ++#if (UNIX) + # This might not catch every possibility catered for by + # AC_SYS_LARGEFILE. + add_definitions(-D_FILE_OFFSET_BITS=64) + set(FILE_OFFSET_BITS 64) +-endif() ++#endif() + + # Documentation install directory (default to cmake project docdir) + set(LIBTIFF_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}") diff --git a/portage/win32libs/tiff/tiff.py b/portage/win32libs/tiff/tiff.py index b2c2b4d79..8c8d0cbfa 100644 --- a/portage/win32libs/tiff/tiff.py +++ b/portage/win32libs/tiff/tiff.py @@ -1,29 +1,31 @@ import info from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - for ver in ['3.9.2', '4.0.3', '4.0.4']: + for ver in ['3.9.2', '4.0.3', '4.0.4', '4.0.7']: self.targets[ ver ] = "http://download.osgeo.org/libtiff/tiff-" + ver + ".tar.gz" self.targetInstSrc[ ver ] = "tiff-" + ver self.patchToApply['3.9.2'] = [( 'tiff-3.9.2-20100418.diff', 1 )] self.patchToApply['4.0.3'] = [('tiff-4.0.3-rename-test.diff', 1), ( 'tiff-4.0.3-20130124.diff', 1 )] self.patchToApply['4.0.4'] = [( 'tiff-4.0.4-20130124.diff', 1 )] + if compiler.isMinGW(): + self.patchToApply['4.0.7'] = [( 'tiff-4.0.7-20161202.diff', 1 )] self.targetDigests['3.9.2'] = '5c054d31e350e53102221b7760c3700cf70b4327' self.targetDigests['4.0.3'] = '652e97b78f1444237a82cbcfe014310e776eb6f0' self.shortDescription = "a library to manipulate TIFF image files" - self.defaultTarget = '4.0.4' + self.defaultTarget = '4.0.7' def setDependencies( self ): self.dependencies['win32libs/zlib'] = 'default' self.dependencies['win32libs/libjpeg-turbo'] = 'default' self.buildDependencies['virtual/base'] = 'default' class Package(CMakePackageBase): def __init__( self, **args ): CMakePackageBase.__init__( self ) # both examples and tests can be run here self.subinfo.options.configure.defines = "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF"