From 72d7f8dc2736518a6f1f1d3538b20615ef43505e Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 20 Oct 2012 19:21:54 +0200 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/libsdl/libsdl_1.2.15.bb') 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)} \ tslib" DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" -PR = "r0" +PR = "r1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://configure_tweak.patch \ @@ -47,7 +47,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --disable-pulseaudio" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib," +PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," PARALLEL_MAKE = "" -- cgit v1.2.3-54-g00ecf