mbox

[PULL,v3,0/5] sdl patch queue.

Message ID 1426251503-14034-1-git-send-email-kraxel@redhat.com
State New
Headers show

Pull-request

git://git.kraxel.org/qemu tags/pull-sdl-20150312-2

Message

Gerd Hoffmann March 13, 2015, 12:58 p.m. UTC
Hi,

Misc stuff in the basket: sdl bugfixes, some preparing patches for the
upcoming opengl support in sdl2, x11 build improvement.

v2 fixes the clang build failure.
v3 (hopefully) fixes the osx build failure too.

please pull,
  Gerd

The following changes since commit ee74801035b0b5f1fdfd4e31d3a53f511f91c804:

  Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150311' into staging (2015-03-11 18:22:15 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-sdl-20150312-2

for you to fetch changes up to 43db7c3d484943f62019434d919367c9e3e4402a:

  pixman: add a bunch of PIXMAN_BE_* defines for 32bpp (2015-03-12 15:50:11 +0100)

----------------------------------------------------------------
misc ui patches, mostly sdl related.

----------------------------------------------------------------
Benjamin Herrenschmidt (2):
      sdl: Refresh debug statements
      sdl: Fix crash when calling sdl_switch() with NULL surface

Gerd Hoffmann (2):
      configure: opengl overhaul
      pixman: add a bunch of PIXMAN_BE_* defines for 32bpp

Jeremy White (1):
      Allow the use of X11 from a non standard location.

 configure                        | 59 +++++++++++++++++++++++-----------------
 default-configs/lm32-softmmu.mak |  2 +-
 hw/display/Makefile.objs         |  3 +-
 hw/lm32/milkymist-hw.h           |  4 +--
 include/sysemu/sysemu.h          |  1 +
 include/ui/qemu-pixman.h         | 16 +++++++++++
 ui/sdl.c                         | 27 ++++++++++++++++--
 vl.c                             |  1 +
 8 files changed, 81 insertions(+), 32 deletions(-)

Comments

Peter Maydell March 13, 2015, 3:18 p.m. UTC | #1
On 13 March 2015 at 12:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Misc stuff in the basket: sdl bugfixes, some preparing patches for the
> upcoming opengl support in sdl2, x11 build improvement.
>
> v2 fixes the clang build failure.
> v3 (hopefully) fixes the osx build failure too.
>
> please pull,
>   Gerd
>
> The following changes since commit ee74801035b0b5f1fdfd4e31d3a53f511f91c804:
>
>   Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150311' into staging (2015-03-11 18:22:15 +0000)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-sdl-20150312-2
>
> for you to fetch changes up to 43db7c3d484943f62019434d919367c9e3e4402a:
>
>   pixman: add a bunch of PIXMAN_BE_* defines for 32bpp (2015-03-12 15:50:11 +0100)
>
> ----------------------------------------------------------------
> misc ui patches, mostly sdl related.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM