| Message ID | 20231106072313.1742543-1-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
Hi On Mon, Nov 6, 2023 at 11:24 AM <marcandre.lureau@redhat.com> wrote: > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > The following changes since commit d762bf97931b58839316b68a570eecc6143c9e3e: > > Merge tag 'pull-target-arm-20231102' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-11-03 10:04:12 +0800) > > are available in the Git repository at: > > https://gitlab.com/marcandre.lureau/qemu.git tags/pixman-pull-request > > for you to fetch changes up to 3055379992496c8ff6a02d46dcc5a1337be72499: > > build-sys: make pixman actually optional (2023-11-06 10:25:05 +0400) > > ---------------------------------------------------------------- > Make Pixman an optional dependency > > ---------------------------------------------------------------- > > Marc-André Lureau (23): > build-sys: add a "pixman" feature > build-sys: drop needless warning pragmas for old pixman > ui: compile out some qemu-pixman functions when !PIXMAN > ui: add pixman-minimal.h > vl: drop needless -spice checks > qemu-options: define -vnc only #ifdef CONFIG_VNC > vl: simplify display_remote logic > vl: move display early init before default devices > ui/console: allow to override the default VC > ui/vc: console-vc requires PIXMAN > qmp/hmp: disable screendump if PIXMAN is missing > virtio-gpu: replace PIXMAN for region/rect test > ui/console: when PIXMAN is unavailable, don't draw placeholder msg > vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN > ui/gl: opengl doesn't require PIXMAN > ui/vnc: VNC requires PIXMAN > ui/spice: SPICE/QXL requires PIXMAN > ui/gtk: -display gtk requires PIXMAN > ui/dbus: do not require PIXMAN > arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN > hw/sm501: allow compiling without PIXMAN > hw/display: make ATI_VGA depend on PIXMAN > build-sys: make pixman actually optional > > configs/devices/mips64el-softmmu/default.mak | 3 +- > meson.build | 25 ++- > qapi/ui.json | 3 +- > include/ui/console.h | 2 + > include/ui/pixman-minimal.h | 195 +++++++++++++++++++ > include/ui/qemu-pixman.h | 15 +- > include/ui/rect.h | 59 ++++++ > hw/display/sm501.c | 46 +++-- > hw/display/vhost-user-gpu.c | 2 + > hw/display/virtio-gpu.c | 30 ++- > system/vl.c | 84 ++++---- > ui/console-vc-stubs.c | 33 ++++ > ui/console.c | 19 ++ > ui/dbus-listener.c | 90 ++++++--- > ui/qemu-pixman.c | 6 + > ui/ui-hmp-cmds.c | 2 + > ui/ui-qmp-cmds.c | 2 + > ui/vnc-stubs.c | 12 -- > Kconfig.host | 3 + > hmp-commands.hx | 2 + > hw/arm/Kconfig | 3 +- > hw/display/Kconfig | 10 +- > hw/display/meson.build | 4 +- > hw/mips/Kconfig | 2 + > meson_options.txt | 2 + > qemu-options.hx | 2 + > scripts/meson-buildoptions.sh | 3 + > ui/meson.build | 22 +-- > 28 files changed, 542 insertions(+), 139 deletions(-) > create mode 100644 include/ui/pixman-minimal.h > create mode 100644 include/ui/rect.h > create mode 100644 ui/console-vc-stubs.c > > -- > 2.41.0 > I realize a bit late that it also requires this, for some reason: diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 5d40795c0b..c120b784aa 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -34,6 +34,7 @@ config FULOONG bool default y if MIPS64 select PCI_BONITO + select VT82C686 depends on ATI_VGA sending V2
From: Marc-André Lureau <marcandre.lureau@redhat.com> The following changes since commit d762bf97931b58839316b68a570eecc6143c9e3e: Merge tag 'pull-target-arm-20231102' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-11-03 10:04:12 +0800) are available in the Git repository at: https://gitlab.com/marcandre.lureau/qemu.git tags/pixman-pull-request for you to fetch changes up to 3055379992496c8ff6a02d46dcc5a1337be72499: build-sys: make pixman actually optional (2023-11-06 10:25:05 +0400) ---------------------------------------------------------------- Make Pixman an optional dependency ---------------------------------------------------------------- Marc-André Lureau (23): build-sys: add a "pixman" feature build-sys: drop needless warning pragmas for old pixman ui: compile out some qemu-pixman functions when !PIXMAN ui: add pixman-minimal.h vl: drop needless -spice checks qemu-options: define -vnc only #ifdef CONFIG_VNC vl: simplify display_remote logic vl: move display early init before default devices ui/console: allow to override the default VC ui/vc: console-vc requires PIXMAN qmp/hmp: disable screendump if PIXMAN is missing virtio-gpu: replace PIXMAN for region/rect test ui/console: when PIXMAN is unavailable, don't draw placeholder msg vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN ui/gl: opengl doesn't require PIXMAN ui/vnc: VNC requires PIXMAN ui/spice: SPICE/QXL requires PIXMAN ui/gtk: -display gtk requires PIXMAN ui/dbus: do not require PIXMAN arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN hw/sm501: allow compiling without PIXMAN hw/display: make ATI_VGA depend on PIXMAN build-sys: make pixman actually optional configs/devices/mips64el-softmmu/default.mak | 3 +- meson.build | 25 ++- qapi/ui.json | 3 +- include/ui/console.h | 2 + include/ui/pixman-minimal.h | 195 +++++++++++++++++++ include/ui/qemu-pixman.h | 15 +- include/ui/rect.h | 59 ++++++ hw/display/sm501.c | 46 +++-- hw/display/vhost-user-gpu.c | 2 + hw/display/virtio-gpu.c | 30 ++- system/vl.c | 84 ++++---- ui/console-vc-stubs.c | 33 ++++ ui/console.c | 19 ++ ui/dbus-listener.c | 90 ++++++--- ui/qemu-pixman.c | 6 + ui/ui-hmp-cmds.c | 2 + ui/ui-qmp-cmds.c | 2 + ui/vnc-stubs.c | 12 -- Kconfig.host | 3 + hmp-commands.hx | 2 + hw/arm/Kconfig | 3 +- hw/display/Kconfig | 10 +- hw/display/meson.build | 4 +- hw/mips/Kconfig | 2 + meson_options.txt | 2 + qemu-options.hx | 2 + scripts/meson-buildoptions.sh | 3 + ui/meson.build | 22 +-- 28 files changed, 542 insertions(+), 139 deletions(-) create mode 100644 include/ui/pixman-minimal.h create mode 100644 include/ui/rect.h create mode 100644 ui/console-vc-stubs.c