[PATCH] meson.build: Allow to disable OSS again

[PATCH] meson.build: Allow to disable OSS again

[Thomas Huth]

If sys/soundcard.h is available, it is currently not possible to
disable OSS with the --disable-oss or --without-default-features
configure switches. Improve the check in meson.build to fix this.

Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index ed92454cab..0d7917db6a 100644
--- a/meson.build
+++ b/meson.build
@@ -915,7 +915,7 @@ if liblzfse.found() and not cc.links('''
 endif
 
 oss = not_found
-if not get_option('oss').auto() or have_system
+if get_option('oss').enabled() or (get_option('oss').auto() and have_system)
   if not cc.has_header('sys/soundcard.h')
     # not found
   elif targetos == 'netbsd'
-- 
2.27.0

Re: [PATCH] meson.build: Allow to disable OSS again

[Philippe Mathieu-Daudé]

On 10/29/21 09:13, Thomas Huth wrote:
> If sys/soundcard.h is available, it is currently not possible to
> disable OSS with the --disable-oss or --without-default-features
> configure switches. Improve the check in meson.build to fix this.
> 
> Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

>  oss = not_found
> -if not get_option('oss').auto() or have_system
> +if get_option('oss').enabled() or (get_option('oss').auto() and have_system)

Shouldn't this be 'if have_system and (enabled or auto)' ?

>    if not cc.has_header('sys/soundcard.h')
>      # not found
>    elif targetos == 'netbsd'
> 

Re: [PATCH] meson.build: Allow to disable OSS again

[Thomas Huth]

On 29/10/2021 11.32, Philippe Mathieu-Daudé wrote:
> On 10/29/21 09:13, Thomas Huth wrote:
>> If sys/soundcard.h is available, it is currently not possible to
>> disable OSS with the --disable-oss or --without-default-features
>> configure switches. Improve the check in meson.build to fix this.
>>
>> Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson")
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   meson.build | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
>>   oss = not_found
>> -if not get_option('oss').auto() or have_system
>> +if get_option('oss').enabled() or (get_option('oss').auto() and have_system)
> 
> Shouldn't this be 'if have_system and (enabled or auto)' ?

It depends whether we want to allow "--disable-system --enable-oss" or not, 
I guess ;-)

Honestly, I don't have a preference. But maybe we could also simply use 'if 
have_system and not disabled' instead, which would then be the shortest 
solution?

  Thomas

Re: [PATCH] meson.build: Allow to disable OSS again

[Philippe Mathieu-Daudé]

On 11/2/21 08:45, Thomas Huth wrote:
> On 29/10/2021 11.32, Philippe Mathieu-Daudé wrote:
>> On 10/29/21 09:13, Thomas Huth wrote:
>>> If sys/soundcard.h is available, it is currently not possible to
>>> disable OSS with the --disable-oss or --without-default-features
>>> configure switches. Improve the check in meson.build to fix this.
>>>
>>> Fixes: 87430d5b13 ("configure, meson: move audio driver detection to
>>> Meson")
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   meson.build | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>>   oss = not_found
>>> -if not get_option('oss').auto() or have_system
>>> +if get_option('oss').enabled() or (get_option('oss').auto() and
>>> have_system)
>>
>> Shouldn't this be 'if have_system and (enabled or auto)' ?
> 
> It depends whether we want to allow "--disable-system --enable-oss" or
> not, I guess ;-)

When is that useful?

> Honestly, I don't have a preference. But maybe we could also simply use
> 'if have_system and not disabled' instead, which would then be the
> shortest solution?

This is clearer indeed.