diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-09-15 19:28:46 -0700 |
|---|---|---|
| committer |   Joshua Lock <joshua.g.lock@intel.com> | 2016-05-06 15:51:14 +0100 |
| commit | 45a6ae4cf6b2684ee7e58b8a85f44eb0031fa2b4 (patch) | |
| tree | 089b3e589e92ab1c1d8039053f0691701fb23b29 | |
| parent | 961a9de0e918526bc8c880ea1d35db16b55f500a (diff) | |
| download | openembedded-core-45a6ae4cf6b2684ee7e58b8a85f44eb0031fa2b4.tar.gz | |
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@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
| -rw-r--r-- | meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 266bd42467..c0d5c6a969 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)}" |