As discussed in [1], SDL recipe makes the wrong assumption that 'opengl' in DISTRO_FEATURES implies GL/GLX. However 'opengl' could also mean GLES/EGL, and the recipe fails to build in such situations. So we add a PACKAGECONFIG option for opengl so that the build can be made to work on gles/egl with a simple .bbappend.
The default PACKAGECONFIG is set to the same value as previously, e.g. 'gl' is enabled if 'opengl' is found in DISTRO_FEATURES. [1] http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088735.html Signed-off-by: Nicolas Dechesne <nicolas.deche...@linaro.org> --- meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4b4ff63..492e228 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" PROVIDES = "virtual/libsdl" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ tslib" DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" @@ -40,15 +39,22 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers --disable-xbios --disable-gem --disable-video-dummy \ --enable-input-events --enable-input-tslib --enable-pthreads \ ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ --disable-rpath \ --disable-pulseaudio" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ +" + PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," +# SDL wrongly assumes that opengl means GL/GLX, when using GLES/EGL, do: +# PACKAGECONFIG_remove = "gl" in .bbappend +# or PACKAGECONFIG_remove_pn-libdsl = "gl" in .conf +PACKAGECONFIG[gl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PARALLEL_MAKE = "" -- 1.8.5.3 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core