mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

eglinfo: upgrade SRCREV to 223817ee3798

Browse Source 
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>
This commit is contained in:
Roman Stratiienko
2018-12-27 14:38:48 +02:00
committed by Richard Purdie
parent aa83cb5264
commit e059e94704
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/eglinfo/eglinfo.inc
+1 -1
View File
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
file://0001-Check-for-libegl-using-pkg-config.patch \
"
SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de"
SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10"
CVE_PRODUCT = "eglinfo"
meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
+4 -5
View File
@@ -1,4 +1,4 @@
From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001
From 99a5784d33ad5e0e6fa00338d2732cbccad7661c 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
@@ -14,10 +14,10 @@ Upstream-Status: Submitted
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/wscript b/wscript
index fcbb55b..cece8bf 100644
index 195e247..0f6ec53 100644
--- a/wscript
+++ b/wscript
@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform):
@@ -177,9 +177,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
@@ -30,5 +30,4 @@ index fcbb55b..cece8bf 100644
conf.env['WITH_APIS'] = []
if check_gles2(conf):
--
2.7.0
2.19.1
meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch
+16 -11
View File
@@ -1,22 +1,25 @@
From 58d51d941d3f4dfa38be18282d3e285d76d9020d Mon Sep 17 00:00:00 2001
From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Aug 2018 15:46:53 -0700
Subject: [PATCH] Check for libegl using pkg-config
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
[Roman: patch has been rebased to 223817ee3798 ("Add Wayland support")
trivial merge conflicts resolved]
Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com>
---
wscript | 1 +
1 file changed, 1 insertion(+)
wscript | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Index: git/wscript
===================================================================
--- git.orig/wscript
+++ git/wscript
@@ -160,14 +160,9 @@ def configure_raspberrypi_device(conf, p
conf.env['PLATFORM_USELIBS'] += ["X11"]
elif platform == "fb":
conf.env['PLATFORM_SOURCE'] = ['src/platform_fb_raspberrypi.cpp']
diff --git a/wscript b/wscript
index 0f6ec53..401f62e 100644
--- a/wscript
+++ b/wscript
@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform):
else:
conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform)
return
- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
+ conf.check_cfg(package='egl', args='--libs --cflags')
import os
@@ -29,3 +32,5 @@ Index: git/wscript
conf.env['WITH_APIS'] = []
if check_gles2(conf):
conf.env['WITH_APIS'] += ['GLES1', 'GLES2']
--
2.19.1