On Wed, Aug 30, 2023 at 05:55:26PM +0200, Philippe Mathieu-Daudé wrote:
> On 30/8/23 17:48, Philippe Mathieu-Daudé wrote:
> > On 30/8/23 11:38, marcandre.lur...@redhat.com wrote:
> > > From: Marc-André Lureau <marcandre.lur...@redhat.com>
> > >
> > > Set CONFIG_PIXMAN accordinly.
> > >
> > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> > > ---
> > > meson.build | 6 ++++--
> > > Kconfig.host | 3 +++
> > > meson_options.txt | 2 ++
> > > 3 files changed, 9 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meson.build b/meson.build
> > > index 98e68ef0b1..3bd7046099 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -836,8 +836,8 @@ if 'ust' in get_option('trace_backends')
> > > method: 'pkg-config')
> > > endif
> > > pixman = not_found
> > > -if have_system or have_tools
> > > - pixman = dependency('pixman-1', required: have_system,
> > > version:'>=0.21.8',
> > > +if not get_option('pixman').auto() or have_system or have_tools
> > > + pixman = dependency('pixman-1', required: get_option('pixman'),
> > > version:'>=0.21.8',
> > > method: 'pkg-config')
>
>
> > > diff --git a/meson_options.txt b/meson_options.txt
> > > index aaea5ddd77..89654fd77d 100644
> > > --- a/meson_options.txt
> > > +++ b/meson_options.txt
> > > @@ -216,6 +216,8 @@ option('l2tpv3', type : 'feature', value : 'auto',
> > > description: 'l2tpv3 network backend support')
> > > option('netmap', type : 'feature', value : 'auto',
> > > description: 'netmap network backend support')
> > > +option('pixman', type : 'feature', value : 'auto',
> > > + description: 'pixman support')
> > > option('slirp', type: 'feature', value: 'auto',
> > > description: 'libslirp user mode network backend support')
> > > option('vde', type : 'feature', value : 'auto',
> >
> > Apparently missing:
> >
> > -- >8 --
> > diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> > index 9da3fe299b..16957ea9f0 100644
> > --- a/scripts/meson-buildoptions.sh
> > +++ b/scripts/meson-buildoptions.sh
> > @@ -146,6 +146,7 @@ meson_options_help() {
> > printf "%s\n" ' pa PulseAudio sound support'
> > printf "%s\n" ' parallels parallels image format support'
> > printf "%s\n" ' pipewire PipeWire sound support'
> > + printf "%s\n" ' pixman pixman support'
> > printf "%s\n" ' png PNG support with libpng'
> > printf "%s\n" ' pvrdma Enable PVRDMA support'
> > printf "%s\n" ' qcow1 qcow1 image format support'
> > @@ -397,6 +398,8 @@ _meson_option_parse() {
> > --disable-parallels) printf "%s" -Dparallels=disabled ;;
> > --enable-pipewire) printf "%s" -Dpipewire=enabled ;;
> > --disable-pipewire) printf "%s" -Dpipewire=disabled ;;
> > + --enable-pixman) printf "%s" -Dpixman=enabled ;;
> > + --disable-pixman) printf "%s" -Dpixman=disabled ;;
> > --with-pkgversion=*) quote_sh "-Dpkgversion=$2" ;;
> > --enable-png) printf "%s" -Dpng=enabled ;;
> > --disable-png) printf "%s" -Dpng=disabled ;;
> > ---
>
> Many files fail to build when using --disable-pixman here:
I guess meson.build ought to (temporarily) report an
eror if pixman is missing and/or explicitly disabled,
which is then removed in the next patch that actually
makes it work.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
