[oe-commits] [openembedded-core] 03/19: libsdl: depends on libglu when both x11 and opengl

[git at git.openembedded.org]

rpurdie pushed a commit to branch fido
in repository openembedded-core.

commit 45a6ae4cf6b2684ee7e58b8a85f44eb0031fa2b4
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Tue Sep 15 19:28:46 2015 -0700

    libsdl: depends on libglu when both x11 and opengl
    
    The libglu requires both opengl (depends on virtual/libgl) and x11
    (needs libGL.so which is provided by mesa when x11 in DISTRO_FEATURES),
    so let libsdl depends on libglu when both x11 and opengl in
    DISTRO_FEATURES.
    
    (From OE-Core master rev: b33e927096292f22f1bd9b2b0f633a6d645fc1eb)
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
---
 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 266bd42..c0d5c6a 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -13,8 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 PROVIDES = "virtual/libsdl"
 
 DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
            ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', '', d)} \
            tslib"
 DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.