diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2012-10-20 19:21:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-23 12:28:33 +0100 |
commit | 72d7f8dc2736518a6f1f1d3538b20615ef43505e (patch) | |
tree | f877d54f12e7557246be2530ca2625b7fb1b3698 /meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |
parent | 8255558613883aa5dcfba63bab20c283a242a166 (diff) | |
download | poky-72d7f8dc2736518a6f1f1d3538b20615ef43505e.tar.gz |
libsdl: fix inconditional alsa disabling.
Without that fix ALSA is inconditionally disabled,
reguardless of the fact that alsa is in the distribution
feature or not.
This patch has been tested on the om-gta04 target with both
alsa distribution feature enabled(libsdl can then play sound),
and disabled(it fails to play some sound trough alsa).
(From OE-Core rev: b635e47a2b8b711d5ddae3b3e5a5656402aee845)
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
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/libsdl_1.2.15.bb')
-rw-r--r-- | meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 4 |
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 b05840a2fc..d5c127d2c5 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -18,7 +18,7 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | |||
18 | tslib" | 18 | tslib" |
19 | DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" | 19 | DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" |
20 | 20 | ||
21 | PR = "r0" | 21 | PR = "r1" |
22 | 22 | ||
23 | SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ | 23 | SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ |
24 | file://configure_tweak.patch \ | 24 | file://configure_tweak.patch \ |
@@ -47,7 +47,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads | |||
47 | --disable-pulseaudio" | 47 | --disable-pulseaudio" |
48 | 48 | ||
49 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 49 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" |
50 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib," | 50 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," |
51 | 51 | ||
52 | PARALLEL_MAKE = "" | 52 | PARALLEL_MAKE = "" |
53 | 53 | ||