mirror of https://github.com/GNOME/gimp.git
meson: libjpeg and libtiff are not optional dependencies!
This commit is contained in:
parent
3f59769120
commit
de91d84906
13
meson.build
13
meson.build
|
@ -648,17 +648,12 @@ MIMEtypes = [
|
|||
|
||||
|
||||
|
||||
libtiff = dependency('libtiff-4', required: get_option('tiff'))
|
||||
if libtiff.found()
|
||||
MIMEtypes += 'image/tiff'
|
||||
endif
|
||||
libtiff = dependency('libtiff-4')
|
||||
MIMEtypes += 'image/tiff'
|
||||
|
||||
|
||||
libjpeg = dependency('libjpeg', required: get_option('jpeg'))
|
||||
conf.set('HAVE_LIBJPEG', libjpeg.found())
|
||||
if libjpeg.found()
|
||||
MIMEtypes += 'image/jpeg'
|
||||
endif
|
||||
libjpeg = dependency('libjpeg')
|
||||
MIMEtypes += 'image/jpeg'
|
||||
|
||||
|
||||
zlib = dependency('zlib')
|
||||
|
|
|
@ -37,13 +37,11 @@ option('cairo-pdf', type: 'feature', value: 'auto', description: 'Cairo-
|
|||
option('ghostscript', type: 'feature', value: 'auto', description: 'Ghostscript support')
|
||||
option('gudev', type: 'feature', value: 'auto', description: 'Gudev support')
|
||||
option('heif', type: 'feature', value: 'auto', description: 'HEIF support')
|
||||
option('jpeg', type: 'feature', value: 'auto', description: 'Jpeg support')
|
||||
option('jpeg2000', type: 'feature', value: 'auto', description: 'Jpeg-2000 support')
|
||||
option('mng', type: 'feature', value: 'auto', description: 'Mng support')
|
||||
option('openexr', type: 'feature', value: 'auto', description: 'Openexr support')
|
||||
option('png', type: 'feature', value: 'auto', description: 'PNG support')
|
||||
option('print', type: 'boolean', value: true, description: 'Print support')
|
||||
option('tiff', type: 'feature', value: 'auto', description: 'TIFF support')
|
||||
option('webkit', type: 'feature', value: 'auto', description: 'Help browser and webpage plugins')
|
||||
option('webp', type: 'feature', value: 'auto', description: 'Webp support')
|
||||
option('wmf', type: 'feature', value: 'auto', description: 'Wmf support')
|
||||
|
|
Loading…
Reference in New Issue