diff options
| author | Pariksheet Nanda <pnanda@umich.edu> | 2024-06-06 12:05:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 18:05:29 +0200 |
| commit | a25655446ae3584939e8f31ad649b499d10ba630 (patch) | |
| tree | 8c31d5db43b7679df7b835b0ddc8a7cad61fd208 | |
| parent | cf3d59bb2e05bcb3a3195c82f886425cb91a18af (diff) | |
| download | spack-a25655446ae3584939e8f31ad649b499d10ba630.tar.gz spack-a25655446ae3584939e8f31ad649b499d10ba630.tar.bz2 spack-a25655446ae3584939e8f31ad649b499d10ba630.tar.xz spack-a25655446ae3584939e8f31ad649b499d10ba630.zip | |
libtiff: add v4.6.0 and default disable opengl (Fixes #44545) (#44546)
* libtiff: add v4.6.0 and default disable opengl (#44545)
* libtiff: Fix typo in CMake key
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* libtiff: Broader description of OpenGL variant
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* libtiff: reformat using spack style black recommendation
* libtiff: couple opengl flag with autotools
---------
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/libtiff/package.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 8bd59a30f6..b3b5f45823 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -40,6 +40,7 @@ class Libtiff(CMakePackage, AutotoolsPackage): license("libtiff") + version("4.6.0", sha256="88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a") version("4.5.1", sha256="d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b") version("4.5.0", sha256="c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464") version("4.4.0", sha256="917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed") @@ -55,6 +56,14 @@ class Libtiff(CMakePackage, AutotoolsPackage): version("4.0.4", sha256="8cb1d90c96f61cdfc0bcf036acc251c9dbe6320334da941c7a83cfe1576ef890") version("3.9.7", sha256="f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a") + # GUI + variant( + "opengl", + default=False, + description="use OpenGL (required for tiffgt viewer)", + when="@4.5,4.7:", + ) + # Internal codecs variant("ccitt", default=True, description="support for CCITT Group 3 & 4 algorithms") variant("packbits", default=True, description="support for Macintosh PackBits algorithm") @@ -118,6 +127,7 @@ class CMakeBuilder(CMakeBuilder): def cmake_args(self): args = [self.define_from_variant(var) for var in VARIANTS] args.append("-Dsphinx=OFF") + args += [self.define_from_variant("tiff-opengl", "opengl")] args += [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] args += [self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")] @@ -135,6 +145,7 @@ class AutotoolsBuilder(AutotoolsBuilder): args.append("--disable-sphinx") + args.extend(self.enable_or_disable("opengl")) args.extend(self.enable_or_disable("shared")) args.extend(self.with_or_without("pic")) |