From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 1 Feb 2019 13:15:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190201-pull-request' into... 
X-Git-Tag: v4.0.0-rc0~127
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190201-pull-request' into staging

ui: fix build with SDL disabled, drop SDL1 support.

# gpg: Signature made Fri 01 Feb 2019 12:30:47 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20190201-pull-request:
  ui: remove support for SDL1.2 in favour of SDL2
  hw/display/milkymist-tmu2: Move inlined code from header to source
  hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL
  configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
  hw/display: Move Milkymist specific hardware out of common-obj list

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f