The following changes since commit e8977901b79fb678f288dd372261b640bbeccd0d:
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request'
into staging (2019-01-31 15:40:39 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/ui-20190201-pull-request
for you to fetch changes up to 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4:
ui: remove support for SDL1.2 in favour of SDL2 (2019-02-01 11:59:12 +0100)
----------------------------------------------------------------
ui: fix build with SDL disabled, drop SDL1 support.
----------------------------------------------------------------
Daniel P. Berrangé (1):
ui: remove support for SDL1.2 in favour of SDL2
Philippe Mathieu-Daudé (4):
hw/display: Move Milkymist specific hardware out of common-obj list
configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of
X11
hw/display/milkymist-tmu2: Explicit the dependency to both X11 /
OpenGL
hw/display/milkymist-tmu2: Move inlined code from header to source
configure | 70 +--
hw/lm32/milkymist-hw.h | 63 ---
include/hw/display/milkymist_tmu2.h | 41 ++
ui/sdl_zoom.h | 25 -
ui/sdl_zoom_template.h | 219 --------
hw/display/milkymist-tmu2.c | 49 ++
hw/lm32/milkymist.c | 1 +
ui/sdl.c | 1027 -----------------------------------
ui/sdl_zoom.c | 93 ----
MAINTAINERS | 1 +
default-configs/lm32-softmmu.mak | 2 +-
hw/display/Makefile.objs | 8 +-
qemu-deprecated.texi | 9 -
ui/Makefile.objs | 5 -
14 files changed, 114 insertions(+), 1499 deletions(-)
create mode 100644 include/hw/display/milkymist_tmu2.h
delete mode 100644 ui/sdl_zoom.h
delete mode 100644 ui/sdl_zoom_template.h
delete mode 100644 ui/sdl.c
delete mode 100644 ui/sdl_zoom.c
--
2.9.3