Change dependencies to use virtual jpeg package (#12179)
This prevents conflicts between descendents that depend on an unintentional arbitrary jpeg implementation.
This commit is contained in:
parent
a3f6f52622
commit
3d0b5bd541
6 changed files with 6 additions and 6 deletions
|
@ -85,7 +85,7 @@ def url_for_version(self, version):
|
|||
depends_on('mpi', when='+user-lb')
|
||||
depends_on('mpi', when='+user-h5md')
|
||||
depends_on('hdf5', when='+user-h5md')
|
||||
depends_on('libjpeg', when='+jpeg')
|
||||
depends_on('jpeg', when='+jpeg')
|
||||
depends_on('libpng', when='+png')
|
||||
depends_on('ffmpeg', when='+ffmpeg')
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ class NcbiToolkit(AutotoolsPackage):
|
|||
|
||||
depends_on('boost@1.35.0:')
|
||||
depends_on('bzip2')
|
||||
depends_on('libjpeg')
|
||||
depends_on('jpeg')
|
||||
depends_on('libpng')
|
||||
depends_on('libtiff')
|
||||
depends_on('libxml2')
|
||||
|
|
|
@ -17,5 +17,5 @@ class RTiff(RPackage):
|
|||
|
||||
version('0.1-5', '5052990b8647c77d3e27bc0ecf064e0b')
|
||||
|
||||
depends_on("libjpeg")
|
||||
depends_on("jpeg")
|
||||
depends_on("libtiff")
|
||||
|
|
|
@ -27,7 +27,7 @@ class Vigra(CMakePackage):
|
|||
|
||||
depends_on('libtiff', when='+tiff')
|
||||
depends_on('libpng', when='+png')
|
||||
depends_on('libjpeg', when='+jpeg')
|
||||
depends_on('jpeg', when='+jpeg')
|
||||
depends_on('hdf5', when='+hdf5')
|
||||
depends_on('fftw', when='+fftw')
|
||||
depends_on('openexr', when='+exr')
|
||||
|
|
|
@ -18,5 +18,5 @@ class Virtualgl(CMakePackage):
|
|||
|
||||
version('2.5.2', '1a9f404f4a35afa9f56381cb33ed210c')
|
||||
|
||||
depends_on("libjpeg-turbo")
|
||||
depends_on("jpeg")
|
||||
depends_on("glu")
|
||||
|
|
|
@ -87,7 +87,7 @@ class Vtk(CMakePackage):
|
|||
depends_on('freetype')
|
||||
depends_on('glew')
|
||||
depends_on('hdf5')
|
||||
depends_on('libjpeg')
|
||||
depends_on('jpeg')
|
||||
depends_on('jsoncpp')
|
||||
depends_on('libxml2')
|
||||
depends_on('lz4')
|
||||
|
|
Loading…
Reference in a new issue