weston: check for both EGL and GLES
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Fri, 8 Apr 2016 13:42:37 +0000 (10:42 -0300)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 8 Apr 2016 20:11:32 +0000 (22:11 +0200)
The conditional is wrong, it was check for BR2_PACKAGE_MESA3D_OPENGL_ES
(correct, means GLESv2 support) and BR2_PACKAGE_MESA3D_OPENGL_GLES
(incorrect, there's no such symbol).
So now check for BR2_PACKAGE_MESA3D_OPENGL_EGL (EGL support) plus
BR2_PACKAGE_MESA3D_OPENGL_ES (GLESv2 support), both are required.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/weston/weston.mk

index 7aa21304fc02d1181fc7d1b1b4e0ed90b72f483c..e3088ffcad6ba4a2db491e0cbda958c76d47339d 100644 (file)
@@ -49,7 +49,7 @@ WESTON_CONF_OPTS += --disable-weston-launch
 endif
 
 # Needs wayland-egl, which normally only mesa provides
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES)$(BR2_PACKAGE_MESA3D_OPENGL_GLES),yy)
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)$(BR2_PACKAGE_MESA3D_OPENGL_ES),yy)
 WESTON_CONF_OPTS += --enable-egl
 WESTON_DEPENDENCIES += libegl
 else