summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-14 09:32:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:44:33 +0100
commitd5ad78e5daf88aed645cdd0aa0307308e224ae54 (patch)
tree33415204950f5d912a9dcddc5bdab7a37f2a8304
parent7b5cfa730e7266656b9c78204e9b1630fe76fcb5 (diff)
downloadpoky-d5ad78e5daf88aed645cdd0aa0307308e224ae54.tar.gz
eglinfo: Fix build with raspberrypi with userland graphics driver
Let pkgconfig figure out headers and libraries instead of manually forcing waf to do it. (From OE-Core rev: 283026adda7c184e213dacd7f4e42678c304866a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/eglinfo/eglinfo.inc3
-rw-r--r--meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch31
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
index 8e7d9bddda..c8f0e897bf 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/meta/recipes-graphics/eglinfo/eglinfo.inc
@@ -8,6 +8,7 @@ DEPENDS = "virtual/egl"
8 8
9SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \ 9SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
10 file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ 10 file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
11 file://0001-Check-for-libegl-using-pkg-config.patch \
11 " 12 "
12SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" 13SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de"
13 14
@@ -15,7 +16,7 @@ CVE_PRODUCT = "eglinfo"
15 16
16S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
17 18
18inherit waf distro_features_check 19inherit waf distro_features_check pkgconfig
19# depends on virtual/egl 20# depends on virtual/egl
20REQUIRED_DISTRO_FEATURES ?= "opengl" 21REQUIRED_DISTRO_FEATURES ?= "opengl"
21 22
diff --git a/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch b/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
new file mode 100644
index 0000000000..0289ac228c
--- /dev/null
+++ b/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
@@ -0,0 +1,31 @@
1From 58d51d941d3f4dfa38be18282d3e285d76d9020d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Aug 2018 15:46:53 -0700
4Subject: [PATCH] Check for libegl using pkg-config
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 wscript | 1 +
10 1 file changed, 1 insertion(+)
11
12Index: git/wscript
13===================================================================
14--- git.orig/wscript
15+++ git/wscript
16@@ -160,14 +160,9 @@ def configure_raspberrypi_device(conf, p
17 conf.env['PLATFORM_USELIBS'] += ["X11"]
18 elif platform == "fb":
19 conf.env['PLATFORM_SOURCE'] = ['src/platform_fb_raspberrypi.cpp']
20- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
21+ conf.check_cfg(package='egl', args='--libs --cflags')
22 import os
23 sysroot = conf.options.sysroot + conf.options.prefix
24- std_include_path = os.path.join(sysroot, 'include')
25- vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads')
26- vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux')
27- 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'):
28- conf.fatal('Check if --prefix and --sysroot are set correctly.')
29 conf.env['WITH_APIS'] = []
30 if check_gles2(conf):
31 conf.env['WITH_APIS'] += ['GLES1', 'GLES2']