[PATCH] conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native

[PATCH] conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native

[Ross Burton]

Ubuntu 15.10 and Debian testing can't build qemu-native against the host libsdl.
Now that libsdl-native is buildable, comment out the ASSUME_PROVIDED which meant
it wouldn't be used.

[ YOCTO #8553 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/conf/local.conf.sample | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 3ae24ab..42647c4 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -201,12 +201,12 @@ BB_DISKMON_DIRS = "\
 # Qemu configuration
 #
 # By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
+# seen. The two lines below enable the SDL backend too. By default libsdl-native will
+# be built, if you want to use your host's libSDL instead of the minimal libsdl built
+# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
 PACKAGECONFIG_append_pn-qemu-native = " sdl"
 PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-ASSUME_PROVIDED += "libsdl-native"
-
+#ASSUME_PROVIDED += "libsdl-native"
 
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
-- 
2.6.4

Re: [PATCH] conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

On 19 December 2015 at 04:50, Khem Raj <raj.khem@gmail.com> wrote:

> Can this be applied to oe-core as well
>

Yes.  To be honest I thought oe-core still defaulted to headless qemu. :)

Ross

[-- Attachment #2: Type: text/html, Size: 546 bytes --]

Re: [PATCH] conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1726 bytes --]

Can this be applied to oe-core as well
On Dec 18, 2015 9:01 AM, "Ross Burton" <ross.burton@intel.com> wrote:

> Ubuntu 15.10 and Debian testing can't build qemu-native against the host
> libsdl.
> Now that libsdl-native is buildable, comment out the ASSUME_PROVIDED which
> meant
> it wouldn't be used.
>
> [ YOCTO #8553 ]
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta-yocto/conf/local.conf.sample | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/meta-yocto/conf/local.conf.sample
> b/meta-yocto/conf/local.conf.sample
> index 371349d..7a0dde5 100644
> --- a/meta-yocto/conf/local.conf.sample
> +++ b/meta-yocto/conf/local.conf.sample
> @@ -223,11 +223,12 @@ BB_DISKMON_DIRS = "\
>  # Qemu configuration
>  #
>  # By default qemu will build with a builtin VNC server where graphical
> output can be
> -# seen. The two lines below enable the SDL backend too. This assumes
> there is a
> -# libsdl library available on your build system.
> +# seen. The two lines below enable the SDL backend too. By default
> libsdl-native will
> +# be built, if you want to use your host's libSDL instead of the minimal
> libsdl built
> +# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
>  PACKAGECONFIG_append_pn-qemu-native = " sdl"
>  PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
> -ASSUME_PROVIDED += "libsdl-native"
> +#ASSUME_PROVIDED += "libsdl-native"
>
>
>  # CONF_VERSION is increased each time build/conf/ changes incompatibly
> and is used to
> --
> 2.6.4
>
> --
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>

[-- Attachment #2: Type: text/html, Size: 2276 bytes --]

[PATCH] conf/local.conf.sample: comment out ASSUME_PROVIDED=libsdl-native

[Ross Burton]

Ubuntu 15.10 and Debian testing can't build qemu-native against the host libsdl.
Now that libsdl-native is buildable, comment out the ASSUME_PROVIDED which meant
it wouldn't be used.

[ YOCTO #8553 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-yocto/conf/local.conf.sample | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 371349d..7a0dde5 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -223,11 +223,12 @@ BB_DISKMON_DIRS = "\
 # Qemu configuration
 #
 # By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. This assumes there is a
-# libsdl library available on your build system.
+# seen. The two lines below enable the SDL backend too. By default libsdl-native will
+# be built, if you want to use your host's libSDL instead of the minimal libsdl built
+# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
 PACKAGECONFIG_append_pn-qemu-native = " sdl"
 PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-ASSUME_PROVIDED += "libsdl-native"
+#ASSUME_PROVIDED += "libsdl-native"
 
 
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-- 
2.6.4