hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

saga-gis: tweak dependencies and deprecate some versions (#28677)

Browse source 
- deprecate versions 2 and 3
- set needed opencv variants
- adjust proj constraint
- patch header path for opencv
This commit is contained in:
Glenn Johnson 2022-02-01 04:09:50 -06:00 committed by GitHub
parent ab2187780b
commit a3f0c3ca93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
var/spack/repos/builtin/packages/saga-gis/package.py
View file

@ -31,11 +31,10 @@ class SagaGis(AutotoolsPackage, SourceforgePackage):
version('5.0.0', branch='release-5.0.0') version('5.0.0', branch='release-5.0.0')
version('4.1.0', branch='release-4.1.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('4.0.0', branch='release-4.0.0') version('3.0.0', branch='release-3.0.0', deprecated=True)
version('3.0.0', branch='release-3.0.0') version('2.3-lts', branch='release-2-3-lts', deprecated=True)
version('2.3-lts', branch='release-2-3-lts') version('2.3.1', branch='release-2-3-1', deprecated=True)
version('2.3.1', branch='release-2-3-1') version('2.3.0', branch='release-2-3-0', deprecated=True)
version('2.3.0', branch='release-2-3-0')
variant('gui', default=True, description='Build GUI and interactive SAGA tools') variant('gui', default=True, description='Build GUI and interactive SAGA tools')
variant('odbc', default=True, description='Build with ODBC support') variant('odbc', default=True, description='Build with ODBC support')
@ -66,12 +65,11 @@ class SagaGis(AutotoolsPackage, SourceforgePackage):
# SAGA-GIS requires projects.h from proj # SAGA-GIS requires projects.h from proj
depends_on('proj') depends_on('proj')
# https://sourceforge.net/p/saga-gis/bugs/271/ # 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 # Saga-Gis depends on legacy opencv API removed in opencv 4.x
depends_on('opencv@:3', when='+opencv') depends_on('opencv@:3.4.6+jpeg+video+objdetect+ml+openmp+photo', when='+opencv')
# Set jpeg provider (similar to #8133) depends_on('jpeg', when='+opencv')
depends_on('libjpeg', when='+opencv')
# Set hl variant due to similar issue #7145 # Set hl variant due to similar issue #7145
depends_on('hdf5+hl') depends_on('hdf5+hl')
@ -89,6 +87,15 @@ class SagaGis(AutotoolsPackage, SourceforgePackage):
configure_directory = "saga-gis" 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): def configure_args(self):
args = [] args = []
args += self.enable_or_disable('gui') args += self.enable_or_disable('gui')