[oe-commits] Ross Burton : Revert "libsdl: depends on libglu when x11"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: d557edc559c8b77083edee2bd4178e24aaf5211c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d557edc559c8b77083edee2bd4178e24aaf5211c

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri May 15 20:52:10 2015 +0100

Revert "libsdl: depends on libglu when x11"

This patch was incorrect, GLU depends on GLX (and so X) but you can build SDL
with X11 and without GL.

This reverts commit f744f0b18c22daf8bdab837ba8096760b1ce00b8.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 06490aa..266bd42 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -13,8 +13,8 @@ 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', '', d)} \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender libglu', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
            tslib"
 DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"