On Mon, Nov 30, 2015 at 12:18:58PM +0000, Ross Burton wrote: > Use PACKAGECONFIG instead of using logic in DEPENDS and EXTRA_OECONF, adding > new > options for PulseAudio, tslib, DirectFB, OpenGL and X11. > > Disable tslib by default as the kernel event input subsystem is generally > used. > > SDL's OpenGL support requires X11 so check for both x11 and opengl, and merge > the dependencies. > > Finally enable native builds.
Why is this needed now? When it was needed for xbmc it was rejected (and I was carrying this in my branches since then): http://patchwork.openembedded.org/patch/63477/ more recently in: http://patchwork.openembedded.org/patch/105689/ > > Signed-off-by: Ross Burton <ross.bur...@intel.com> > --- > meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 31 > +++++++++++++-------------- > 1 file changed, 15 insertions(+), 16 deletions(-) > > diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb > b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb > index c0d5c6a..d8a99ef 100644 > --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb > +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb > @@ -12,13 +12,6 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" > > PROVIDES = "virtual/libsdl" > > -DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', > '', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'virtual/libgl', '', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 > libxext libxrandr libxrender', '', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', > '', d)} \ > - tslib" > -DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', > 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender > nativesdk-libxext', '', d)}" > - > PR = "r3" > > SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ > @@ -42,17 +35,23 @@ EXTRA_OECONF = "--disable-static --enable-cdrom > --enable-threads --enable-timers > --disable-mintaudio --disable-nasm --disable-video-dga \ > --disable-video-fbcon --disable-video-ps2gs > --disable-video-ps3 \ > --disable-xbios --disable-gem --disable-video-dummy \ > - --enable-input-events --enable-input-tslib --enable-pthreads > \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', > '--enable-video-directfb', '--disable-video-directfb', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > '--enable-video-opengl', '--disable-video-opengl', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', > '--enable-video-x11', '--disable-video-x11', d)} \ > + --enable-input-events --enable-pthreads \ > --disable-video-svga \ > --disable-video-picogui --disable-video-qtopia > --enable-sdl-dlopen \ > - --disable-rpath \ > - --disable-pulseaudio" > + --disable-rpath" > + > +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', > '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', > 'pulseaudio', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', > 'directfb', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'opengl', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', > d)}" > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', > '', d)}" > -PACKAGECONFIG[alsa] = "--enable-alsa > --disable-alsatest,--disable-alsa,alsa-lib," > +PACKAGECONFIG[alsa] = "--enable-alsa > --disable-alsatest,--disable-alsa,alsa-lib" > +PACKAGECONFIG[pulseaudio] = > "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" > +PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib" > +PACKAGECONFIG[directb] = "--enable-video-directfb, --disable-video-directfb, > directfb" > +PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, > virtual/libgl libglu" > +PACKAGECONFIG[x11] = "--enable-video-x11, --disable-video-x11, > virtual/libx11 libxext libxrandr libxrender" > > EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" > > @@ -65,4 +64,4 @@ do_configure_prepend() { > export SYSROOT=$PKG_CONFIG_SYSROOT_DIR > } > > -BBCLASSEXTEND = "nativesdk" > +BBCLASSEXTEND = "native nativesdk" > -- > 2.1.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
