[v1] meson: Add `libtiff` option to control libtiff dependency

26056 diff mbox series

Previously it was not possible to disable libtiff usage if it was
detected. Fix that by adding a meson feature option.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 meson_options.txt    | 5 +++++
 src/apps/meson.build | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Barnabás Pőcze <barnabas.pocze@ideasonboard.com> writes:

> Previously it was not possible to disable libtiff usage if it was
> detected. Fix that by adding a meson feature option.
>
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> ---
>  meson_options.txt    | 5 +++++
>  src/apps/meson.build | 2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meson_options.txt b/meson_options.txt
> index 58cf52ad1..8ad0de118 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -62,6 +62,11 @@ option('libdw',
>          value : 'auto',
>          description : 'Enable libdw integration for backtrace symbolization')
>  
> +option('libtiff',
> +        type : 'feature',
> +        value : 'auto',
> +        description : 'Enable libtiff integration the cam and qcam applications for creating DNG files')

"... *in* the cam and qcam ..."?

> +
>  option('libunwind',
>          type : 'feature',
>          value : 'auto',
> diff --git a/src/apps/meson.build b/src/apps/meson.build
> index af632b9a7..63ef6f173 100644
> --- a/src/apps/meson.build
> +++ b/src/apps/meson.build
> @@ -10,7 +10,7 @@ if not libevent.found()
>      libevent = dependency('libevent_pthreads', required : opt_lc_compliance)
>  endif
>  
> -libtiff = dependency('libtiff-4', required : false)
> +libtiff = dependency('libtiff-4', required : get_option('libtiff'))
>  
>  subdir('common')

2026. 01. 30. 15:01 keltezéssel, Milan Zamazal írta:
> Barnabás Pőcze <barnabas.pocze@ideasonboard.com> writes:
> 
>> Previously it was not possible to disable libtiff usage if it was
>> detected. Fix that by adding a meson feature option.
>>
>> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
>> ---
>>   meson_options.txt    | 5 +++++
>>   src/apps/meson.build | 2 +-
>>   2 files changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/meson_options.txt b/meson_options.txt
>> index 58cf52ad1..8ad0de118 100644
>> --- a/meson_options.txt
>> +++ b/meson_options.txt
>> @@ -62,6 +62,11 @@ option('libdw',
>>           value : 'auto',
>>           description : 'Enable libdw integration for backtrace symbolization')
>>   
>> +option('libtiff',
>> +        type : 'feature',
>> +        value : 'auto',
>> +        description : 'Enable libtiff integration the cam and qcam applications for creating DNG files')
> 
> "... *in* the cam and qcam ..."?

Yes... I have only noticed after sending it, but it is fixed now.


> 
>> +
>>   option('libunwind',
>>           type : 'feature',
>>           value : 'auto',
>> diff --git a/src/apps/meson.build b/src/apps/meson.build
>> index af632b9a7..63ef6f173 100644
>> --- a/src/apps/meson.build
>> +++ b/src/apps/meson.build
>> @@ -10,7 +10,7 @@ if not libevent.found()
>>       libevent = dependency('libevent_pthreads', required : opt_lc_compliance)
>>   endif
>>   
>> -libtiff = dependency('libtiff-4', required : false)
>> +libtiff = dependency('libtiff-4', required : get_option('libtiff'))
>>   
>>   subdir('common')
>