diff options
author | Ross Burton <ross.burton@intel.com> | 2013-09-16 18:06:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 19:26:17 +0100 |
commit | f5a3a4bc33109181c741a2e66c13d0b45566e8fa (patch) | |
tree | 8187e373fb03c9f6aa78ea255d2640e433b5d18f /meta | |
parent | 4e10c45d7c61ac1ccf8b53ef525ca03d3d458bba (diff) | |
download | openembedded-core-f5a3a4bc33109181c741a2e66c13d0b45566e8fa.tar.gz openembedded-core-f5a3a4bc33109181c741a2e66c13d0b45566e8fa.tar.bz2 openembedded-core-f5a3a4bc33109181c741a2e66c13d0b45566e8fa.zip |
mesa-gl: add GL-only Mesa recipe
Some machines have hardware-specific GL drivers that do EGL and GLES (many ARM
boards). Others have their own EGL/GLES drivers and provide a Mesa DRI driver
(EMGD). Previously adding Mesa, for software GL/GLX rendering in the first case
and hardware GLX in the second, involved bbappends and changing Mesa to be
machine-specific.
By adding a just-GL Mesa the machine definition can combine it with the hardware
drivers cleanly.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/security_flags.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/seperatebuilddir.inc | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb | 11 |
3 files changed, 13 insertions, 0 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 2858e46c8a..e313be67b1 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -28,6 +28,7 @@ SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index 5bd0ab44f4..21d828fa03 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc @@ -442,6 +442,7 @@ B_pn-menu-cache = "${SEPB}" B_pn-mesa-demos = "${SEPB}" # src/mapi/mapi/stub.c:51:39: error: 'MAPI_TABLE_NUM_DYNAMIC' undeclared here (not in a function) B_pn-mesa = "${SEPB}" +B_pn-mesa-gl = "${SEPB}" B_pn-minicom = "${SEPB}" # Not automake, no external tree support #B_pn-mkelfimage = "${SEPB}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb new file mode 100644 index 0000000000..0e9dbb5f4f --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb @@ -0,0 +1,11 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/mesa" + +PROVIDES = "virtual/libgl virtual/mesa" + +PACKAGECONFIG ??= "dri ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" |