summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-11-09 15:28:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 13:51:01 (GMT)
commit9c8d335a1e0dd7e76b189a9b34b77bb99f121e9e (patch)
treec89968ef8b5a12003e30ac69261a6e10392adc4d /meta/recipes-graphics/libsdl
parent240d256d46611ccdcfceccc743b145f2f300d05f (diff)
downloadpoky-9c8d335a1e0dd7e76b189a9b34b77bb99f121e9e.tar.gz
libsdl: enable alsa based on PACKAGECONFIG and respect DISTRO_FEATURES
(From OE-Core rev: 6b1afd1d21a565b8cbb8e5c0579a1ba9299591f1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 057f764..e1bf2ce 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -12,7 +12,7 @@ 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 alsa-lib tslib" 15DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
16DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" 16DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
17 17
18PR = "r1" 18PR = "r1"
@@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
29inherit autotools binconfig pkgconfig 29inherit autotools binconfig pkgconfig
30 30
31EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ 31EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
32 --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \ 32 --enable-file --disable-oss --disable-esd --disable-arts \
33 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ 33 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
34 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ 34 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
35 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ 35 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
@@ -40,6 +40,9 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
40 --disable-video-picogui --disable-video-qtopia --enable-dlopen \ 40 --disable-video-picogui --disable-video-qtopia --enable-dlopen \
41 --disable-rpath" 41 --disable-rpath"
42 42
43PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
44PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
45
43PARALLEL_MAKE = "" 46PARALLEL_MAKE = ""
44 47
45EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" 48EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"