From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCHv2 5/5] qemu: use sdl2 instead of sdl1
Date: Fri, 11 May 2018 19:21:03 +0000 [thread overview]
Message-ID: <20180511192103.7581-5-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <20180511192103.7581-1-Martin.Jansa@gmail.com>
* sdl1 since qemu-2.12.0 depends on x11 in DISTRO_FEATURES, switch to sdl2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-devtools/qemu/qemu.inc | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 9010a04792..8169e55e69 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -74,11 +74,11 @@ do_install_append() {
# END of qemu-mips workaround
PACKAGECONFIG ??= " \
- fdt sdl kvm \
- ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
- "
-PACKAGECONFIG_class-native ??= "fdt alsa kvm"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
+ fdt sdl sdl2 kvm \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
+"
+PACKAGECONFIG_class-native ??= "fdt sdl sdl2 alsa kvm"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl sdl2 kvm"
# Handle distros such as CentOS 5 32-bit that do not have kvm support
PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
@@ -87,6 +87,9 @@ PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/includ
PACKAGECONFIG_remove_darwin = "kvm"
PACKAGECONFIG_remove_mingw32 = "kvm"
+# sdl1 can be used only together with x11 in DISTRO_FEATURES, because since:
+# https://github.com/qemu/qemu/commit/2ec78706d188df7d3dab43d07b19b05ef7800a44
+# it explicitly includes X11/Xlib.h for all gtk, sdl1 UI backends
PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl"
PACKAGECONFIG[sdl2] = "--with-sdlabi=2.0,--with-sdlabi=1.2,libsdl2"
PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr,"
--
2.17.0
next prev parent reply other threads:[~2018-05-11 19:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-02 14:37 [PATCH 1/3] json-c: upgrade to 0.13.1 Martin Jansa
2018-05-02 14:37 ` [PATCH 2/3] qemu: upgrade to 2.12.0 Martin Jansa
2018-05-02 20:44 ` Alistair Francis
2018-05-09 15:38 ` Burton, Ross
2018-05-10 21:32 ` Alistair Francis
2018-05-11 19:20 ` [PATCHv2 1/5] libsdl2: allow to build native and nativesdk Martin Jansa
2018-05-11 19:21 ` [PATCHv2 2/5] qemu: upgrade to 2.12.0 Martin Jansa
2018-05-11 23:17 ` Alistair Francis
2018-05-11 19:21 ` [PATCHv2 3/5] qemu: refresh patches with devtool Martin Jansa
2018-05-11 23:18 ` Alistair Francis
2018-05-11 19:21 ` [PATCHv2 4/5] qemu: add PACKAGECONFIG for virglrenderer, sdl2, usb-redir and spice Martin Jansa
2018-05-13 20:05 ` Burton, Ross
2018-05-14 16:12 ` Martin Jansa
2018-05-11 19:21 ` Martin Jansa [this message]
2018-05-11 23:22 ` [PATCHv2 5/5] qemu: use sdl2 instead of sdl1 Alistair Francis
2018-05-11 23:20 ` [PATCHv2 1/5] libsdl2: allow to build native and nativesdk Alistair Francis
2018-05-18 21:58 ` [PATCH 2/3] qemu: upgrade to 2.12.0 Burton, Ross
2018-05-29 9:10 ` Martin Jansa
2018-05-29 12:56 ` Martin Jansa
2018-05-29 20:40 ` Martin Jansa
2018-05-29 23:14 ` Alistair Francis
2018-05-30 2:16 ` Khem Raj
2018-05-30 16:35 ` Alistair Francis
2018-05-31 15:41 ` Martin Jansa
2018-06-01 0:00 ` Alistair Francis
2018-06-01 6:37 ` Martin Jansa
2018-06-01 9:08 ` Martin Jansa
2018-05-02 14:37 ` [PATCH 3/3] qemu: refresh patches with devtool Martin Jansa
2018-05-02 20:45 ` Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180511192103.7581-5-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.