Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 13 Aug 2018 15:46:53 -0700 |
| 4 | Subject: [PATCH] Check for libegl using pkg-config |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 8 | [Roman: patch has been rebased to 223817ee3798 ("Add Wayland support") |
| 9 | trivial merge conflicts resolved] |
| 10 | Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 11 | --- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 12 | wscript | 7 +------ |
| 13 | 1 file changed, 1 insertion(+), 6 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 14 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 15 | diff --git a/wscript b/wscript |
| 16 | index 0f6ec53..401f62e 100644 |
| 17 | --- a/wscript |
| 18 | +++ b/wscript |
| 19 | @@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform): |
| 20 | else: |
| 21 | conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform) |
| 22 | return |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 23 | - conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') |
| 24 | + conf.check_cfg(package='egl', args='--libs --cflags') |
| 25 | import os |
| 26 | sysroot = conf.options.sysroot + conf.options.prefix |
| 27 | - std_include_path = os.path.join(sysroot, 'include') |
| 28 | - vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') |
| 29 | - vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') |
| 30 | - 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'): |
| 31 | - conf.fatal('Check if --prefix and --sysroot are set correctly.') |
| 32 | conf.env['WITH_APIS'] = [] |
| 33 | if check_gles2(conf): |
| 34 | conf.env['WITH_APIS'] += ['GLES1', 'GLES2'] |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 35 | -- |
| 36 | 2.19.1 |