meson.build: Group some entries in separate summary sections
cover meson.build: Group some entries in separate summary sections
For the average user, it is likely quite difficult which library is responsible for different features that QEMU supports. Let's make it a little bit easier for them and put some libraries into separate groups in the summary output of meson.
Thomas Huth (3):
meson.build: Group the UI entries in a separate summary section meson.build: Group the network backend entries in a separate summary
section
meson.build: Group the audio backend entries in a separate summary
section
meson.build | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/3 meson.build: Group the UI entries in a separate summary section
Let's make it easier for the users to spot UI-related entries in the summary of the meson output.
--- meson.build | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
meson.build +21 -14
@@ -4243,32 +4243,44 @@ summary_info += {'rng-none': get_option('rng_none')} summary_info += {'Linux keyring': have_keyring} summary(summary_info, bool_yn: true, section: 'Crypto') -# Libraries +# UI summary_info = {} if targetos == 'darwin' summary_info += {'Cocoa support': cocoa} - summary_info += {'vmnet.framework support': vmnet} endif summary_info += {'SDL support': sdl} summary_info += {'SDL image support': sdl_image} summary_info += {'GTK support': gtk} summary_info += {'pixman': pixman} summary_info += {'VTE support': vte} +summary_info += {'PNG support': png} +summary_info += {'VNC support': vnc} +if vnc.found() + summary_info += {'VNC SASL support': sasl} + summary_info += {'VNC JPEG support': jpeg} +endif +summary_info += {'spice protocol support': spice_protocol} +if spice_protocol.found() + summary_info += {' spice server support': spice} +endif +summary_info += {'curses support': curses} +summary_info += {'brlapi support': brlapi} +summary(summary_info, bool_yn: true, section: 'User interface') + +# Libraries +summary_info = {} +if targetos == 'darwin' + summary_info += {'vmnet.framework support': vmnet} +endif +summary_info = {} summary_info += {'slirp support': slirp} summary_info += {'libtasn1': tasn1} summary_info += {'PAM': pam} summary_info += {'iconv support': iconv} -summary_info += {'curses support': curses} summary_info += {'virgl support': virgl} summary_info += {'blkio support': blkio} summary_info += {'curl support': curl} summary_info += {'Multipath support': mpathpersist} -summary_info += {'PNG support': png} -summary_info += {'VNC support': vnc} -if vnc.found() - summary_info += {'VNC SASL support': sasl} - summary_info += {'VNC JPEG support': jpeg} -endif if targetos not in ['darwin', 'haiku', 'windows'] summary_info += {'OSS support': oss} summary_info += {'sndio support': sndio}
@@ -4283,7 +4295,6 @@ if targetos == 'linux' endif summary_info += {'Pipewire support': pipewire} summary_info += {'JACK support': jack} -summary_info += {'brlapi support': brlapi} summary_info += {'vde support': vde} summary_info += {'netmap support': have_netmap} summary_info += {'l2tpv3 support': have_l2tpv3}
@@ -4295,10 +4306,6 @@ summary_info += {'PVRDMA support': have_pvrdma} summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt} summary_info += {'libcap-ng support': libcap_ng} summary_info += {'bpf support': libbpf} -summary_info += {'spice protocol support': spice_protocol} -if spice_protocol.found() - summary_info += {' spice server support': spice} -endif summary_info += {'rbd support': rbd} summary_info += {'smartcard support': cacard} summary_info += {'U2F support': u2f}
Signature · 1 line
2.31.1
Re: [PATCH 1/3] meson.build: Group the UI entries in a separate summary section
Quoted 38 lines · Thomas Huth
Let's make it easier for the users to spot UI-related entries in the summary of the meson output.
Signed-off-by Thomas Huth <[email protected]>--- meson.build | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)meson.build +11
-2@@ -4243,32 +4243,44 @@ summary_info += {'rng-none': get_option('rng_none')} summary_info += {'Linux keyring': have_keyring} summary(summary_info, bool_yn: true, section: 'Crypto') -# Libraries +# UI summary_info = {} if targetos == 'darwin' summary_info += {'Cocoa support': cocoa} - summary_info += {'vmnet.framework support': vmnet} endif summary_info += {'SDL support': sdl} summary_info += {'SDL image support': sdl_image} summary_info += {'GTK support': gtk} summary_info += {'pixman': pixman} summary_info += {'VTE support': vte} +summary_info += {'PNG support': png} +summary_info += {'VNC support': vnc} +if vnc.found() + summary_info += {'VNC SASL support': sasl} + summary_info += {'VNC JPEG support': jpeg} +endif +summary_info += {'spice protocol support': spice_protocol} +if spice_protocol.found() + summary_info += {' spice server support': spice} +endif
meson.build summary_info += {'rng-none': get_option('rng_none')} · line 4275
Quoted 10 lines
meson.build +10
-0+summary_info += {'curses support': curses} +summary_info += {'brlapi support': brlapi} +summary(summary_info, bool_yn: true, section: 'User interface') + +# Libraries +summary_info = {} +if targetos == 'darwin' + summary_info += {'vmnet.framework support': vmnet} +endif +summary_info = {}
Conditional to dropping the previous line:
Quoted 37 lines
meson.build +0
-12summary_info += {'slirp support': slirp} summary_info += {'libtasn1': tasn1} summary_info += {'PAM': pam} summary_info += {'iconv support': iconv} -summary_info += {'curses support': curses} summary_info += {'virgl support': virgl} summary_info += {'blkio support': blkio} summary_info += {'curl support': curl} summary_info += {'Multipath support': mpathpersist} -summary_info += {'PNG support': png} -summary_info += {'VNC support': vnc} -if vnc.found() - summary_info += {'VNC SASL support': sasl} - summary_info += {'VNC JPEG support': jpeg} -endif if targetos not in ['darwin', 'haiku', 'windows'] summary_info += {'OSS support': oss} summary_info += {'sndio support': sndio}@@ -4283,7 +4295,6 @@ if targetos == 'linux' endif summary_info += {'Pipewire support': pipewire} summary_info += {'JACK support': jack} -summary_info += {'brlapi support': brlapi} summary_info += {'vde support': vde} summary_info += {'netmap support': have_netmap} summary_info += {'l2tpv3 support': have_l2tpv3}@@ -4295,10 +4306,6 @@ summary_info += {'PVRDMA support': have_pvrdma} summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt} summary_info += {'libcap-ng support': libcap_ng} summary_info += {'bpf support': libbpf} -summary_info += {'spice protocol support': spice_protocol} -if spice_protocol.found() - summary_info += {' spice server support': spice} -endif summary_info += {'rbd support': rbd} summary_info += {'smartcard support': cacard} summary_info += {'U2F support': u2f}
PATCH 2/3 meson.build: Group the network backend entries in a separate summary section
In reply to Thomas HuthLet's make it easier for the users to spot network-related entries in the summary of the meson output.
--- meson.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
meson.build +8 -5
@@ -4267,13 +4267,19 @@ summary_info += {'curses support': curses} summary_info += {'brlapi support': brlapi} summary(summary_info, bool_yn: true, section: 'User interface') -# Libraries +# Network backends summary_info = {} if targetos == 'darwin' summary_info += {'vmnet.framework support': vmnet} endif -summary_info = {} summary_info += {'slirp support': slirp} +summary_info += {'vde support': vde} +summary_info += {'netmap support': have_netmap} +summary_info += {'l2tpv3 support': have_l2tpv3} +summary(summary_info, bool_yn: true, section: 'Network backends') + +# Libraries +summary_info = {} summary_info += {'libtasn1': tasn1} summary_info += {'PAM': pam} summary_info += {'iconv support': iconv}
@@ -4295,9 +4301,6 @@ if targetos == 'linux' endif summary_info += {'Pipewire support': pipewire} summary_info += {'JACK support': jack} -summary_info += {'vde support': vde} -summary_info += {'netmap support': have_netmap} -summary_info += {'l2tpv3 support': have_l2tpv3} summary_info += {'Linux AIO support': libaio} summary_info += {'Linux io_uring support': linux_io_uring} summary_info += {'ATTR/XATTR support': libattr}
Signature · 1 line
2.31.1
Re: [PATCH 2/3] meson.build: Group the network backend entries in a separate summary section
Quoted 13 lines · Thomas Huth
Let's make it easier for the users to spot network-related entries in the summary of the meson output.
Signed-off-by Thomas Huth <[email protected]>--- meson.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)meson.build +0
-0
meson.build summary_info += {'curses support': curses} · line 4275
Quoted 10 lines
meson.build +1
-2@@ -4267,13 +4267,19 @@ summary_info += {'curses support': curses} summary_info += {'brlapi support': brlapi} summary(summary_info, bool_yn: true, section: 'User interface') -# Libraries +# Network backends summary_info = {} if targetos == 'darwin' summary_info += {'vmnet.framework support': vmnet} endif -summary_info = {}
Ah, this should be squashed in the previous patch.
Quoted 21 lines
meson.build +7
-3summary_info += {'slirp support': slirp} +summary_info += {'vde support': vde} +summary_info += {'netmap support': have_netmap} +summary_info += {'l2tpv3 support': have_l2tpv3} +summary(summary_info, bool_yn: true, section: 'Network backends') + +# Libraries +summary_info = {} summary_info += {'libtasn1': tasn1} summary_info += {'PAM': pam} summary_info += {'iconv support': iconv}@@ -4295,9 +4301,6 @@ if targetos == 'linux' endif summary_info += {'Pipewire support': pipewire} summary_info += {'JACK support': jack} -summary_info += {'vde support': vde} -summary_info += {'netmap support': have_netmap} -summary_info += {'l2tpv3 support': have_l2tpv3} summary_info += {'Linux AIO support': libaio} summary_info += {'Linux io_uring support': linux_io_uring} summary_info += {'ATTR/XATTR support': libattr}
Re: [PATCH 2/3] meson.build: Group the network backend entries in a separate summary section
Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 8 lines · Thomas Huth
Let's make it easier for the users to spot network-related entries in the summary of the meson output.
Signed-off-by Thomas Huth <[email protected]>---
meson.build | 13 ++++++++-----1 file changed, 8 insertions(+), 5 deletions(-)
Quoted 16 lines
Quoted 10 lines
meson.build +1
-1@@ -4267,13 +4267,19 @@ summary_info += {'curses support': curses} summary_info += {'brlapi support': brlapi} summary(summary_info, bool_yn: true, section: 'User interface') -# Libraries +# Network backends summary_info = {}Quoted 4 lines
if targetos == 'darwin'
summary_info+= {'vmnet.framework support': vmnet} endif
-summary_info = {}Ah, this should be squashed in the previous patch.
Drat, thanks for catching it!
Quoted 1 line
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
Thomas
Quoted 22 lines
Quoted 21 lines
summary_info+= {'slirp support': slirp}meson.build +7
-0+summary_info += {'vde support': vde} +summary_info += {'netmap support': have_netmap} +summary_info += {'l2tpv3 support': have_l2tpv3} +summary(summary_info, bool_yn: true, section: 'Network backends') + +# Libraries +summary_info = {}
summary_info+= {'libtasn1': tasn1}
summary_info+= {'PAM': pam}
summary_info+= {'iconv support': iconv}meson.build +0
-0@@ -4295,9 +4301,6 @@ if targetos == 'linux'endif
summary_info+= {'Pipewire support': pipewire}summary_info+= {'JACK support': jack}meson.build +0
-3-summary_info += {'vde support': vde} -summary_info += {'netmap support': have_netmap} -summary_info += {'l2tpv3 support': have_l2tpv3}
summary_info+= {'Linux AIO support': libaio}summary_info+= {'Linuxio_uringsupport':linux_io_uring}summary_info+= {'ATTR/XATTR support': libattr}
PATCH 3/3 meson.build: Group the audio backend entries in a separate summary section
In reply to Thomas HuthLet's make it easier for the users to spot audio-related entries in the summary of the meson output.
--- meson.build | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
meson.build +18 -14
@@ -4267,6 +4267,24 @@ summary_info += {'curses support': curses} summary_info += {'brlapi support': brlapi} summary(summary_info, bool_yn: true, section: 'User interface') +# Audio backends +summary_info = {} +if targetos not in ['darwin', 'haiku', 'windows'] + summary_info += {'OSS support': oss} + summary_info += {'sndio support': sndio} +elif targetos == 'darwin' + summary_info += {'CoreAudio support': coreaudio} +elif targetos == 'windows' + summary_info += {'DirectSound support': dsound} +endif +if targetos == 'linux' + summary_info += {'ALSA support': alsa} + summary_info += {'PulseAudio support': pulse} +endif +summary_info += {'Pipewire support': pipewire} +summary_info += {'JACK support': jack} +summary(summary_info, bool_yn: true, section: 'Audio backends') + # Network backends summary_info = {} if targetos == 'darwin'
@@ -4287,20 +4305,6 @@ summary_info += {'virgl support': virgl} summary_info += {'blkio support': blkio} summary_info += {'curl support': curl} summary_info += {'Multipath support': mpathpersist} -if targetos not in ['darwin', 'haiku', 'windows'] - summary_info += {'OSS support': oss} - summary_info += {'sndio support': sndio} -elif targetos == 'darwin' - summary_info += {'CoreAudio support': coreaudio} -elif targetos == 'windows' - summary_info += {'DirectSound support': dsound} -endif -if targetos == 'linux' - summary_info += {'ALSA support': alsa} - summary_info += {'PulseAudio support': pulse} -endif -summary_info += {'Pipewire support': pipewire} -summary_info += {'JACK support': jack} summary_info += {'Linux AIO support': libaio} summary_info += {'Linux io_uring support': linux_io_uring} summary_info += {'ATTR/XATTR support': libattr}
Signature · 1 line
2.31.1
Re: [PATCH 3/3] meson.build: Group the audio backend entries in a separate summary section
Quoted 7 lines · Thomas Huth
Let's make it easier for the users to spot audio-related entries in the summary of the meson output.
Signed-off-by Thomas Huth <[email protected]>--- meson.build | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
Quoted 12 lines · Thomas Huth
For the average user, it is likely quite difficult which library is responsible for different features that QEMU supports. Let's make it a little bit easier for them and put some libraries into separate groups in the summary output of meson.
Thomas Huth (3):
meson.build: Group the UI entries in a separate summary section meson.build: Group the network backend entries in a separate summary
section
meson.build: Group the audio backend entries in a separate summary
section
Quoted 3 lines
meson.build | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-)
r~
Paolo Bonzini
AppliedQueued, thanks.
Paolo