qemu: switch to sdl2

Since version 2.12.0 and
e52c6ba341,
SDL 1.2 is deprecated so switch to SDL 2.0 as SDL 1.2 will be removed in
the last release of 2018

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2018-10-30 09:27:55 +01:00 committed by Peter Korsgaard
parent 8153ce21e7
commit 0646d67c1d
2 changed files with 7 additions and 5 deletions

View File

@ -118,13 +118,15 @@ comment "Frontends"
config BR2_PACKAGE_QEMU_SDL config BR2_PACKAGE_QEMU_SDL
bool "Enable SDL frontend" bool "Enable SDL frontend"
depends on BR2_PACKAGE_XORG7 depends on !BR2_STATIC_LIBS # sdl2
select BR2_PACKAGE_SDL select BR2_PACKAGE_SDL2
select BR2_PACKAGE_SDL_X11
help help
Say 'y' to enable the SDL frontend, that is, a graphical Say 'y' to enable the SDL frontend, that is, a graphical
window presenting the VM's display. window presenting the VM's display.
comment "SDL frontend needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
comment "Misc. features" comment "Misc. features"
config BR2_PACKAGE_QEMU_FDT config BR2_PACKAGE_QEMU_FDT

View File

@ -62,8 +62,8 @@ endif
ifeq ($(BR2_PACKAGE_QEMU_SDL),y) ifeq ($(BR2_PACKAGE_QEMU_SDL),y)
QEMU_OPTS += --enable-sdl QEMU_OPTS += --enable-sdl
QEMU_DEPENDENCIES += sdl QEMU_DEPENDENCIES += sdl2
QEMU_VARS += SDL_CONFIG=$(BR2_STAGING_DIR)/usr/bin/sdl-config QEMU_VARS += SDL2_CONFIG=$(BR2_STAGING_DIR)/usr/bin/sdl2-config
else else
QEMU_OPTS += --disable-sdl QEMU_OPTS += --disable-sdl
endif endif