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:34:55 +0100 |
commit | 015cb13a67c672de30f5384dab5ab4b8db305281 (patch) | |
tree | 28ccf9d50f8592c87b8cefcc5ab2aec955023417 /meta/conf/distro | |
parent | 7303b67d33ce10445e5918f7f6fd36d1246e8df4 (diff) | |
download | poky-015cb13a67c672de30f5384dab5ab4b8db305281.tar.gz |
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.
(From OE-Core rev: f5a3a4bc33109181c741a2e66c13d0b45566e8fa)
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/conf/distro')
-rw-r--r-- | meta/conf/distro/include/security_flags.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/seperatebuilddir.inc | 1 |
2 files changed, 2 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}" | |||
28 | SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" | 28 | SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" |
29 | SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" | 29 | SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" |
30 | SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" | 30 | SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" |
31 | SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" | ||
31 | SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" | 32 | SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" |
32 | SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" | 33 | SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" |
33 | SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}" | 34 | 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}" | |||
442 | B_pn-mesa-demos = "${SEPB}" | 442 | B_pn-mesa-demos = "${SEPB}" |
443 | # src/mapi/mapi/stub.c:51:39: error: 'MAPI_TABLE_NUM_DYNAMIC' undeclared here (not in a function) | 443 | # src/mapi/mapi/stub.c:51:39: error: 'MAPI_TABLE_NUM_DYNAMIC' undeclared here (not in a function) |
444 | B_pn-mesa = "${SEPB}" | 444 | B_pn-mesa = "${SEPB}" |
445 | B_pn-mesa-gl = "${SEPB}" | ||
445 | B_pn-minicom = "${SEPB}" | 446 | B_pn-minicom = "${SEPB}" |
446 | # Not automake, no external tree support | 447 | # Not automake, no external tree support |
447 | #B_pn-mkelfimage = "${SEPB}" | 448 | #B_pn-mkelfimage = "${SEPB}" |