Disable X11 output support for target and nativesdk if x11 is not in DISTRO_FEATURES.
Fixes [YOCTO #2020] Signed-off-by: Paul Eggleton <[email protected]> --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 5b87f39..62a2d1f 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb @@ -12,10 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" PROVIDES = "virtual/libsdl" -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib" -DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ + tslib" +DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}" -PR = "r5" +PR = "r6" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://configure_tweak.patch \ @@ -32,11 +34,12 @@ inherit autotools lib_package binconfig pkgconfig EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --disable-oss --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ - --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ + --disable-mintaudio --disable-nasm --disable-video-dga \ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ --enable-input-events --enable-input-tslib --enable-pthreads \ ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-dlopen \ --disable-rpath \ -- 1.7.5.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
