From 1039caabed335c08309760f7489f674d3424c2c3 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 22 Aug 2022 11:05:06 -0700 Subject: crunch: add new package (#31980) --- var/spack/repos/builtin/packages/crunch/package.py | 24 ++++++++++++++++++++++ var/spack/repos/builtin/packages/gdal/package.py | 5 ++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/crunch/package.py diff --git a/var/spack/repos/builtin/packages/crunch/package.py b/var/spack/repos/builtin/packages/crunch/package.py new file mode 100644 index 0000000000..fb29221fa8 --- /dev/null +++ b/var/spack/repos/builtin/packages/crunch/package.py @@ -0,0 +1,24 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Crunch(CMakePackage): + """Advanced DXTc texture compression and transcoding library.""" + + homepage = "https://github.com/BinomialLLC/crunch" + # The original repo does not have any build system or installation instructions. This package + # was added primarily as a possible dependency of GDAL. The following fork was created by the + # maintainer of GDAL and includes several additional commits to add a CMake build system and + # fix compilation bugs. If these commits are ever merged into upstream, we can switch to that. + git = "https://github.com/rouault/crunch.git" + + # No stable releases since 2012 + version("master", branch="build_fixes") + + depends_on("cmake@3.5:", type="build") + + conflicts("platform=darwin") diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 36f86d2eef..f52e9d4501 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -222,9 +222,9 @@ class Gdal(CMakePackage): depends_on("arrow", when="+arrow") depends_on("c-blosc", when="+blosc") depends_on("brunsli", when="+brunsli") - # depends_on('bsb', when='+bdb') + # depends_on('bsb', when='+bsb') depends_on("cfitsio", when="+cfitsio") - # depends_on('crunch', when='+crnlib') + depends_on("crunch", when="+crnlib") depends_on("curl", when="+curl") depends_on("cryptopp", when="+cryptopp") depends_on("libdeflate", when="+deflate") @@ -355,7 +355,6 @@ class Gdal(CMakePackage): # TODO: add packages for the following dependencies conflicts("+bsb") - conflicts("+crnlib") conflicts("+dods") conflicts("+ecw") conflicts("+epsilon") -- cgit v1.2.3-60-g2f50