summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-23 15:31:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 17:01:45 (GMT)
commitef36dc896d57c8c002222224ac468ac87ef9963e (patch)
tree5f6c881b89c843b5f4d56ffd93e0bfa39496b438 /meta/recipes-graphics/libsdl
parent189a854e8deff6c6ffa3f1e22725a038ec83471f (diff)
downloadpoky-ef36dc896d57c8c002222224ac468ac87ef9963e.tar.gz
libsdl: allow building without x11
Disable X11 output support for target and nativesdk if x11 is not in DISTRO_FEATURES. Fixes [YOCTO #2020] (From OE-Core rev: 506e4c9b05d61f126fff112d7c111902d5c9fac5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl')
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.14.bb11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 5b87f39..62a2d1f 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -12,10 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
12 12
13PROVIDES = "virtual/libsdl" 13PROVIDES = "virtual/libsdl"
14 14
15DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib" 15DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
16DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" 16 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
17 tslib"
18DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}"
17 19
18PR = "r5" 20PR = "r6"
19 21
20SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 22SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
21 file://configure_tweak.patch \ 23 file://configure_tweak.patch \
@@ -32,11 +34,12 @@ inherit autotools lib_package binconfig pkgconfig
32EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ 34EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
33 --enable-file --disable-oss --disable-esd --disable-arts \ 35 --enable-file --disable-oss --disable-esd --disable-arts \
34 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ 36 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
35 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ 37 --disable-mintaudio --disable-nasm --disable-video-dga \
36 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ 38 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
37 --disable-video-xbios --disable-video-gem --disable-video-dummy \ 39 --disable-video-xbios --disable-video-gem --disable-video-dummy \
38 --enable-input-events --enable-input-tslib --enable-pthreads \ 40 --enable-input-events --enable-input-tslib --enable-pthreads \
39 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ 41 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
42 ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
40 --disable-video-svga \ 43 --disable-video-svga \
41 --disable-video-picogui --disable-video-qtopia --enable-dlopen \ 44 --disable-video-picogui --disable-video-qtopia --enable-dlopen \
42 --disable-rpath \ 45 --disable-rpath \