From f6344f20e3aed640b3218438e69c0b641e58d630 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 20 Dec 2016 04:12:27 -0800 Subject: glew: build for EGL in non-X11 distros The glew 2.0.0 release added support for building for EGL: http://glew.sourceforge.net/log.html Add PACKAGECONFIG options for 'opengl' (ie the previous default, with dependencies on opengl and X11) and 'egl-gles2', which depends on EGL and GLESv2 and allow glew to be built for non-X11 distros. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-graphics/glew/glew_2.0.0.bb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/meta/recipes-graphics/glew/glew_2.0.0.bb b/meta/recipes-graphics/glew/glew_2.0.0.bb index 489dd7c8f7..1c93ca07b6 100644 --- a/meta/recipes-graphics/glew/glew_2.0.0.bb +++ b/meta/recipes-graphics/glew/glew_2.0.0.bb @@ -2,12 +2,9 @@ SUMMARY = "OpenGL extension loading library" DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." HOMEPAGE = "http://glew.sourceforge.net/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" -SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" -DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" - SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://no-strip.patch" @@ -19,12 +16,18 @@ UPSTREAM_CHECK_REGEX = "/glew/(?P(\d+[\.\-_]*)+)/" inherit lib_package pkgconfig distro_features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'egl-gles2', d)}" + +# The opengl and egl-XXX options are exclusive, enable only one. +PACKAGECONFIG[opengl] = "SYSTEM='linux',,virtual/libx11 virtual/libgl libglu libxext libxi libxmu" +PACKAGECONFIG[egl-gles2] = "SYSTEM='linux-egl' GLEW_NO_GLU='-DGLEW_NO_GLU' LDFLAGS.GL='-lEGL -lGLESv2',,virtual/egl virtual/libgles2" -# Override SYSTEM to avoid calling config.guess, we're cross-compiling. Pass -# our CFLAGS via POPT as that's the optimisation variable and safely -# overwritten. -EXTRA_OEMAKE = "SYSTEM='linux' \ +# Override SYSTEM (via PACKAGECONFIG_CONFARGS) to avoid calling config.guess, +# we're cross-compiling. Pass our CFLAGS via POPT as that's the optimisation +# variable and safely overwritten. +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} \ CC='${CC}' LD='${CC}' STRIP='' \ LDFLAGS.EXTRA='${LDFLAGS}' \ POPT='${CFLAGS}' \ -- cgit 1.2.3-korg