summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Stratiienko <roman.stratiienko@globallogic.com>2018-12-27 14:38:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-03 21:16:00 +0000
commite059e94704bbac2248558d574ea98771a0591c6d (patch)
tree443344bba4ae45c45630a8da5b9d0be661f3d176
parentaa83cb5264554dd1963042f905688afc796e98d0 (diff)
downloadpoky-e059e94704bbac2248558d574ea98771a0591c6d.tar.gz
eglinfo: upgrade SRCREV to 223817ee3798
SRCREV upgraded to 223817ee3798 ("Add Wayland support") Additional patches rebased to this version (From OE-Core rev: 50691151e916b1cdb9291f0f0bd913f2f79acfcd) Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/eglinfo/eglinfo.inc2
-rw-r--r--meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch9
-rw-r--r--meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch27
3 files changed, 21 insertions, 17 deletions
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
index 07ad07220b..6dcb0c5a19 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/meta/recipes-graphics/eglinfo/eglinfo.inc
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
11 file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ 11 file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
12 file://0001-Check-for-libegl-using-pkg-config.patch \ 12 file://0001-Check-for-libegl-using-pkg-config.patch \
13 " 13 "
14SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" 14SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10"
15 15
16CVE_PRODUCT = "eglinfo" 16CVE_PRODUCT = "eglinfo"
17 17
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
index ca9f55c189..61327eb36b 100644
--- 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
@@ -1,4 +1,4 @@
1From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001 1From 99a5784d33ad5e0e6fa00338d2732cbccad7661c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 16:08:22 -0800 3Date: Wed, 13 Jan 2016 16:08:22 -0800
4Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers 4Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers
@@ -14,10 +14,10 @@ Upstream-Status: Submitted
14 1 file changed, 2 insertions(+), 1 deletion(-) 14 1 file changed, 2 insertions(+), 1 deletion(-)
15 15
16diff --git a/wscript b/wscript 16diff --git a/wscript b/wscript
17index fcbb55b..cece8bf 100644 17index 195e247..0f6ec53 100644
18--- a/wscript 18--- a/wscript
19+++ b/wscript 19+++ b/wscript
20@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform): 20@@ -177,9 +177,10 @@ def configure_raspberrypi_device(conf, platform):
21 conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') 21 conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
22 import os 22 import os
23 sysroot = conf.options.sysroot + conf.options.prefix 23 sysroot = conf.options.sysroot + conf.options.prefix
@@ -30,5 +30,4 @@ index fcbb55b..cece8bf 100644
30 conf.env['WITH_APIS'] = [] 30 conf.env['WITH_APIS'] = []
31 if check_gles2(conf): 31 if check_gles2(conf):
32-- 32--
332.7.0 332.19.1
34
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
index 0289ac228c..572c8014ca 100644
--- 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
@@ -1,22 +1,25 @@
1From 58d51d941d3f4dfa38be18282d3e285d76d9020d Mon Sep 17 00:00:00 2001 1From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Aug 2018 15:46:53 -0700 3Date: Mon, 13 Aug 2018 15:46:53 -0700
4Subject: [PATCH] Check for libegl using pkg-config 4Subject: [PATCH] Check for libegl using pkg-config
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8[Roman: patch has been rebased to 223817ee3798 ("Add Wayland support")
9 trivial merge conflicts resolved]
10Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com>
8--- 11---
9 wscript | 1 + 12 wscript | 7 +------
10 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+), 6 deletions(-)
11 14
12Index: git/wscript 15diff --git a/wscript b/wscript
13=================================================================== 16index 0f6ec53..401f62e 100644
14--- git.orig/wscript 17--- a/wscript
15+++ git/wscript 18+++ b/wscript
16@@ -160,14 +160,9 @@ def configure_raspberrypi_device(conf, p 19@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform):
17 conf.env['PLATFORM_USELIBS'] += ["X11"] 20 else:
18 elif platform == "fb": 21 conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform)
19 conf.env['PLATFORM_SOURCE'] = ['src/platform_fb_raspberrypi.cpp'] 22 return
20- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') 23- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
21+ conf.check_cfg(package='egl', args='--libs --cflags') 24+ conf.check_cfg(package='egl', args='--libs --cflags')
22 import os 25 import os
@@ -29,3 +32,5 @@ Index: git/wscript
29 conf.env['WITH_APIS'] = [] 32 conf.env['WITH_APIS'] = []
30 if check_gles2(conf): 33 if check_gles2(conf):
31 conf.env['WITH_APIS'] += ['GLES1', 'GLES2'] 34 conf.env['WITH_APIS'] += ['GLES1', 'GLES2']
35--
362.19.1