diff options
| author | Glenn Johnson <glenn-johnson@uiowa.edu> | 2022-02-01 04:09:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 11:09:50 +0100 |
| commit | a3f0c3ca930e2b386fdcf8f294ff28ec2fa8e6f3 (patch) | |
| tree | 01b11faa3a765ce80be20bd5b4865b272dfc7e75 | |
| parent | ab2187780bbba1f0c3b29a6b5d52d009eb4c6f7a (diff) | |
| download | spack-a3f0c3ca930e2b386fdcf8f294ff28ec2fa8e6f3.tar.gz spack-a3f0c3ca930e2b386fdcf8f294ff28ec2fa8e6f3.tar.bz2 spack-a3f0c3ca930e2b386fdcf8f294ff28ec2fa8e6f3.tar.xz spack-a3f0c3ca930e2b386fdcf8f294ff28ec2fa8e6f3.zip | |
saga-gis: tweak dependencies and deprecate some versions (#28677)
- deprecate versions 2 and 3
- set needed opencv variants
- adjust proj constraint
- patch header path for opencv
| -rw-r--r-- | var/spack/repos/builtin/packages/saga-gis/package.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/saga-gis/package.py b/var/spack/repos/builtin/packages/saga-gis/package.py index c3303a4fa3..b08fefa2c8 100644 --- a/var/spack/repos/builtin/packages/saga-gis/package.py +++ b/var/spack/repos/builtin/packages/saga-gis/package.py @@ -31,11 +31,10 @@ class SagaGis(AutotoolsPackage, SourceforgePackage): version('5.0.0', branch='release-5.0.0') version('4.1.0', branch='release-4.1.0') version('4.0.0', branch='release-4.0.0') - version('4.0.0', branch='release-4.0.0') - version('3.0.0', branch='release-3.0.0') - version('2.3-lts', branch='release-2-3-lts') - version('2.3.1', branch='release-2-3-1') - version('2.3.0', branch='release-2-3-0') + version('3.0.0', branch='release-3.0.0', deprecated=True) + version('2.3-lts', branch='release-2-3-lts', deprecated=True) + version('2.3.1', branch='release-2-3-1', deprecated=True) + version('2.3.0', branch='release-2-3-0', deprecated=True) variant('gui', default=True, description='Build GUI and interactive SAGA tools') variant('odbc', default=True, description='Build with ODBC support') @@ -66,12 +65,11 @@ class SagaGis(AutotoolsPackage, SourceforgePackage): # SAGA-GIS requires projects.h from proj depends_on('proj') # https://sourceforge.net/p/saga-gis/bugs/271/ - depends_on('proj@:5', when='@:7.2') + depends_on('proj@:5', when='@:7.3') # Saga-Gis depends on legacy opencv API removed in opencv 4.x - depends_on('opencv@:3', when='+opencv') - # Set jpeg provider (similar to #8133) - depends_on('libjpeg', when='+opencv') + depends_on('opencv@:3.4.6+jpeg+video+objdetect+ml+openmp+photo', when='+opencv') + depends_on('jpeg', when='+opencv') # Set hl variant due to similar issue #7145 depends_on('hdf5+hl') @@ -89,6 +87,15 @@ class SagaGis(AutotoolsPackage, SourceforgePackage): configure_directory = "saga-gis" + def patch(self): + if '+opencv' in self.spec: + opencv_dir = self.spec['opencv'].prefix + opencv_makefile = join_path('saga-gis', 'src', 'tools', 'imagery', + 'imagery_opencv', 'Makefile.am') + + filter_file(r"/usr(/include/opencv)", r"{0}\1".format(opencv_dir), + opencv_makefile) + def configure_args(self): args = [] args += self.enable_or_disable('gui') |