summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-05-15 20:52:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-15 22:08:04 +0100
commite5f9a2cbe7f9ace072f0eaf1f9d51886a70c561b (patch)
tree461ae26697f0306e9f3afab832bcbcb118da5fc5
parent0cf9ef0bf1e50f80234ab4d8972b4c240e28eb8a (diff)
downloadpoky-e5f9a2cbe7f9ace072f0eaf1f9d51886a70c561b.tar.gz
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. (From OE-Core rev: d557edc559c8b77083edee2bd4178e24aaf5211c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb4
1 files 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 06490aa934..266bd42467 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"
13PROVIDES = "virtual/libsdl" 13PROVIDES = "virtual/libsdl"
14 14
15DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 15DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
16 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender libglu', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
18 tslib" 18 tslib"
19DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" 19DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
20 20