Re: [OE-core] [PATCHv2 5/5] qemu: use sdl2 instead of sdl1

2018-05-11 Thread Alistair Francis 
On Fri, May 11, 2018 at 12:21 PM, Martin Jansa  wrote:
> * sdl1 since qemu-2.12.0 depends on x11 in DISTRO_FEATURES, switch to sdl2
>
> Signed-off-by: Martin Jansa 

Reviewed-by: Alistair Francis 

Alistair

> ---
>  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
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 5/5] qemu: use sdl2 instead of sdl1

2018-05-11 Thread Martin Jansa 
* sdl1 since qemu-2.12.0 depends on x11 in DISTRO_FEATURES, switch to sdl2

Signed-off-by: Martin Jansa 
---
 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

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core