From 9c8d335a1e0dd7e76b189a9b34b77bb99f121e9e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 9 Nov 2011 16:28:19 +0100 Subject: libsdl: enable alsa based on PACKAGECONFIG and respect DISTRO_FEATURES (From OE-Core rev: 6b1afd1d21a565b8cbb8e5c0579a1ba9299591f1) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/libsdl') diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 057f7643b9..e1bf2ce672 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" PROVIDES = "virtual/libsdl" -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib" +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib" DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" PR = "r1" @@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642 inherit autotools binconfig pkgconfig EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ - --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \ + --enable-file --disable-oss --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ --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 --disable-video-picogui --disable-video-qtopia --enable-dlopen \ --disable-rpath" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib," + PARALLEL_MAKE = "" EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" -- cgit v1.2.3-54-g00ecf