[OE-core] [PATCH][oe-core 14/22] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES

[Richard Purdie]

On Wed, 2011-11-16 at 00:45 +0100, Martin Jansa wrote:
> On Fri, Nov 11, 2011 at 05:28:50PM +0100, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> > ---
> >  meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |   10 +++++++---
> >  1 files changed, 7 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > index 17a3103..2f49f16 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 = "virtual/libx11 libxext libxrandr libxrender tslib"
> >  DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
> 
> As Saul reported PACKAGECONFIG adds build time depends not only to
> DEPENDS but they also ends in DEPENDS_virtclass-nativesdk and nothing
> provides virtual/libgl-nativesdk. So I've resend this patch changing
> only alsa handling to PACKAGECONFIG and keeping opengl as it was.
> 
> Cheers,
> 
> >  PR = "r1"
> > @@ -29,17 +29,21 @@ 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 \
> >                  --disable-video-xbios --disable-video-gem --disable-video-dummy \
> >                  --enable-input-events --enable-input-tslib --enable-pthreads \
> > -		${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> >  		--disable-video-svga \
> >                  --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> >                  --disable-rpath"
> >  
> > +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
> > +                   ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
> > +PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl,"
> > +

What we could do is have a 
PACKAGECONFIG_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 
or something like that.

Cheers,

Richard