meta-digi: do not use system libsdl-native
Using native libsdl from the system is showing problems in newer versions of some operating systems (e.g. ubuntu 15.10). The default in Yocto 2.0 has changed to build a native libsdl and use it instead of the one in the system. This commit synchronizes the config templates to the latest in Yocto 2.0. https://jira.digi.com/browse/DEL-2586 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
parent
a2aaa26e50
commit
ef3d1ab94f
|
|
@ -247,11 +247,12 @@ BB_DISKMON_DIRS = "\
|
||||||
# Qemu configuration
|
# Qemu configuration
|
||||||
#
|
#
|
||||||
# By default qemu will build with a builtin VNC server where graphical output can be
|
# 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
|
# seen. The two lines below enable the SDL backend too. By default libsdl-native will
|
||||||
# libsdl library available on your build system.
|
# 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-qemu-native = " sdl"
|
||||||
PACKAGECONFIG_append_pn-nativesdk-qemu = " 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
|
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
|
||||||
|
|
|
||||||
|
|
@ -232,11 +232,12 @@ BB_DISKMON_DIRS = "\
|
||||||
# Qemu configuration
|
# Qemu configuration
|
||||||
#
|
#
|
||||||
# By default qemu will build with a builtin VNC server where graphical output can be
|
# 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
|
# seen. The two lines below enable the SDL backend too. By default libsdl-native will
|
||||||
# libsdl library available on your build system.
|
# 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-qemu-native = " sdl"
|
||||||
PACKAGECONFIG_append_pn-nativesdk-qemu = " 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
|
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
|
||||||
|
|
|
||||||
|
|
@ -232,11 +232,12 @@ BB_DISKMON_DIRS = "\
|
||||||
# Qemu configuration
|
# Qemu configuration
|
||||||
#
|
#
|
||||||
# By default qemu will build with a builtin VNC server where graphical output can be
|
# 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
|
# seen. The two lines below enable the SDL backend too. By default libsdl-native will
|
||||||
# libsdl library available on your build system.
|
# 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-qemu-native = " sdl"
|
||||||
PACKAGECONFIG_append_pn-nativesdk-qemu = " 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
|
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue