summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-13 16:20:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-22 23:42:54 +0000
commit41c85bcf121ecaeae8097c9874fda51d8a4f2b4a (patch)
treea957adac144a76e42790b85efd474974bbab7ec5
parentcdb858caadd81d3bdc9ea3fd596e3eab84ec2d81 (diff)
downloadopenembedded-core-contrib-41c85bcf121ecaeae8097c9874fda51d8a4f2b4a.tar.gz
openembedded-core-contrib-41c85bcf121ecaeae8097c9874fda51d8a4f2b4a.tar.bz2
openembedded-core-contrib-41c85bcf121ecaeae8097c9874fda51d8a4f2b4a.zip
eglinfo: Fix build on raspberrypi
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-graphics/eglinfo/eglinfo.inc4
-rw-r--r--meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch34
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
index fb891755db..d0c0c27619 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/meta/recipes-graphics/eglinfo/eglinfo.inc
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c"
DEPENDS = "virtual/egl"
-SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master"
+SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
+ file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
+ "
SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
new file mode 100644
index 0000000000..ca9f55c189
--- /dev/null
+++ b/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
@@ -0,0 +1,34 @@
+From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 13 Jan 2016 16:08:22 -0800
+Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers
+
+bcm_host.h is in standard includedir in sysroot
+add that to header search paths.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ wscript | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index fcbb55b..cece8bf 100644
+--- a/wscript
++++ b/wscript
+@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform):
+ conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
+ import os
+ sysroot = conf.options.sysroot + conf.options.prefix
++ std_include_path = os.path.join(sysroot, 'include')
+ vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads')
+ vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux')
+- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'):
++ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'):
+ conf.fatal('Check if --prefix and --sysroot are set correctly.')
+ conf.env['WITH_APIS'] = []
+ if check_gles2(conf):
+--
+2.7.0
+