From 82e31bc4de7398c4f04397dea625f74388b287ce Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 6 Mar 2012 09:03:04 -0800 Subject: [PATCH] libsdl: add DirectFB support * Use conditional dependencies for DirectFB, like it's already done for OpenGL and X11. (From OE-Core rev: 29ba15af6b4a85687bd487779ec2ea2be80644dc) Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 62a2d1f..5c9e645 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb @@ -12,12 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" PROVIDES = "virtual/libsdl" -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + ${@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 = "r6" +PR = "r7" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://configure_tweak.patch \ @@ -35,9 +36,10 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-file --disable-oss --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ --disable-mintaudio --disable-nasm --disable-video-dga \ - --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ + --disable-video-fbcon --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', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ ${@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 \ -- 2.7.4