Re: [PATCH 07/34] configure, meson: move OpenGL check to meson

[Paolo Bonzini]

Il 20 aprile 2022 18:13:30 CEST, "Marc-André Lureau" 
<marcandre.lureau@gmail.com> ha scritto:
>> -if config_host.has_key('CONFIG_OPENGL')
>> +softmmu_ss.add(opengl)
>>
>
>I guess this line is superfluous

It's needed for the include path, iirc.

Paolo

>
>
>> +if opengl.found()
>>    opengl_ss = ss.source_set()
>>    opengl_ss.add(gbm)
>> -  opengl_ss.add(when: [opengl, pixman, 'CONFIG_OPENGL'],
>> +  opengl_ss.add(when: [opengl, pixman],
>>                 if_true: files('shader.c', 'console-gl.c',
>> 'egl-helpers.c', 'egl-context.c'))
>>    ui_modules += {'opengl' : opengl_ss}
>>  endif
>>
>> -if config_host.has_key('CONFIG_OPENGL') and gbm.found()
>> +if opengl.found() and gbm.found()
>>    egl_headless_ss = ss.source_set()
>> -  egl_headless_ss.add(when: [opengl, gbm, pixman, 'CONFIG_OPENGL'],
>> +  egl_headless_ss.add(when: [opengl, gbm, pixman],
>>                        if_true: files('egl-headless.c'))
>>    ui_modules += {'egl-headless' : egl_headless_ss}
>>  endif
>> @@ -98,8 +99,8 @@ if gtk.found()
>>    gtk_ss = ss.source_set()
>>    gtk_ss.add(gtk, vte, pixman, files('gtk.c', 'gtk-clipboard.c'))
>>    gtk_ss.add(when: x11, if_true: files('x_keymap.c'))
>> -  gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true:
>> files('gtk-gl-area.c'))
>> -  gtk_ss.add(when: [x11, opengl, 'CONFIG_OPENGL'], if_true:
>> files('gtk-egl.c'))
>> +  gtk_ss.add(when: opengl, if_true: files('gtk-gl-area.c'))
>> +  gtk_ss.add(when: [x11, opengl], if_true: files('gtk-egl.c'))
>>    ui_modules += {'gtk' : gtk_ss}
>>  endif
>>
>> @@ -112,7 +113,7 @@ if sdl.found()
>>      'sdl2-input.c',
>>      'sdl2.c',
>>    ))
>> -  sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c'))
>> +  sdl_ss.add(when: opengl, if_true: files('sdl2-gl.c'))
>>    sdl_ss.add(when: x11, if_true: files('x_keymap.c'))
>>    ui_modules += {'sdl' : sdl_ss}
>>  endif
>> --
>> 2.35.1
>>
>>
>>
>>
>Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>