[v5] Make Pixman an optional dependency

[PATCH v5 14/19] ui/gtk: -display gtk requires PIXMAN

marcandre.lureau@redhat.com posted 19 patches 2 years ago

Diff against v2 v3 v4 v6 v7 v8
Download mbox

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Dr. David Alan Gilbert" <dave@treblig.org>, Peter Maydell <peter.maydell@linaro.org>, BALATON Zoltan <balaton@eik.bme.hu>, "Michael S. Tsirkin" <mst@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>

There is a newer version of this series

Expand all Fold all

[PATCH v5 14/19] ui/gtk: -display gtk requires PIXMAN

Posted by marcandre.lureau@redhat.com 2 years ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 3d6e41d1fb..dbc7af091c 100644
--- a/meson.build
+++ b/meson.build
@@ -1507,7 +1507,11 @@ gtkx11 = not_found
 vte = not_found
 have_gtk_clipboard = get_option('gtk_clipboard').enabled()
 
-if not get_option('gtk').auto() or have_system
+if get_option('gtk') \
+             .disable_auto_if(not have_system) \
+             .require(pixman.found(),
+                      error_message: 'cannot enable GTK if pixman is not available') \
+             .allowed()
   gtk = dependency('gtk+-3.0', version: '>=3.22.0',
                    method: 'pkg-config',
                    required: get_option('gtk'))
-- 
2.41.0

Re: [PATCH v5 14/19] ui/gtk: -display gtk requires PIXMAN

Posted by Thomas Huth 2 years ago

On 23/10/2023 13.30, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   meson.build | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 3d6e41d1fb..dbc7af091c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1507,7 +1507,11 @@ gtkx11 = not_found
>   vte = not_found
>   have_gtk_clipboard = get_option('gtk_clipboard').enabled()
>   
> -if not get_option('gtk').auto() or have_system
> +if get_option('gtk') \
> +             .disable_auto_if(not have_system) \
> +             .require(pixman.found(),
> +                      error_message: 'cannot enable GTK if pixman is not available') \
> +             .allowed()
>     gtk = dependency('gtk+-3.0', version: '>=3.22.0',
>                      method: 'pkg-config',
>                      required: get_option('gtk'))

Reviewed-by: Thomas Huth <thuth@redhat.com>