mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
aa83cb5264
commit
e059e94704
@@ -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-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
|
||||||
file://0001-Check-for-libegl-using-pkg-config.patch \
|
file://0001-Check-for-libegl-using-pkg-config.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de"
|
SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10"
|
||||||
|
|
||||||
CVE_PRODUCT = "eglinfo"
|
CVE_PRODUCT = "eglinfo"
|
||||||
|
|
||||||
|
|||||||
+4
-5
@@ -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>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Wed, 13 Jan 2016 16:08:22 -0800
|
Date: Wed, 13 Jan 2016 16:08:22 -0800
|
||||||
Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers
|
Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers
|
||||||
@@ -14,10 +14,10 @@ Upstream-Status: Submitted
|
|||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/wscript b/wscript
|
diff --git a/wscript b/wscript
|
||||||
index fcbb55b..cece8bf 100644
|
index 195e247..0f6ec53 100644
|
||||||
--- a/wscript
|
--- a/wscript
|
||||||
+++ b/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')
|
conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
|
||||||
import os
|
import os
|
||||||
sysroot = conf.options.sysroot + conf.options.prefix
|
sysroot = conf.options.sysroot + conf.options.prefix
|
||||||
@@ -30,5 +30,4 @@ index fcbb55b..cece8bf 100644
|
|||||||
conf.env['WITH_APIS'] = []
|
conf.env['WITH_APIS'] = []
|
||||||
if check_gles2(conf):
|
if check_gles2(conf):
|
||||||
--
|
--
|
||||||
2.7.0
|
2.19.1
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Mon, 13 Aug 2018 15:46:53 -0700
|
Date: Mon, 13 Aug 2018 15:46:53 -0700
|
||||||
Subject: [PATCH] Check for libegl using pkg-config
|
Subject: [PATCH] Check for libegl using pkg-config
|
||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
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 +
|
wscript | 7 +------
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||||
|
|
||||||
Index: git/wscript
|
diff --git a/wscript b/wscript
|
||||||
===================================================================
|
index 0f6ec53..401f62e 100644
|
||||||
--- git.orig/wscript
|
--- a/wscript
|
||||||
+++ git/wscript
|
+++ b/wscript
|
||||||
@@ -160,14 +160,9 @@ def configure_raspberrypi_device(conf, p
|
@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform):
|
||||||
conf.env['PLATFORM_USELIBS'] += ["X11"]
|
else:
|
||||||
elif platform == "fb":
|
conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform)
|
||||||
conf.env['PLATFORM_SOURCE'] = ['src/platform_fb_raspberrypi.cpp']
|
return
|
||||||
- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
|
- conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
|
||||||
+ conf.check_cfg(package='egl', args='--libs --cflags')
|
+ conf.check_cfg(package='egl', args='--libs --cflags')
|
||||||
import os
|
import os
|
||||||
@@ -29,3 +32,5 @@ Index: git/wscript
|
|||||||
conf.env['WITH_APIS'] = []
|
conf.env['WITH_APIS'] = []
|
||||||
if check_gles2(conf):
|
if check_gles2(conf):
|
||||||
conf.env['WITH_APIS'] += ['GLES1', 'GLES2']
|
conf.env['WITH_APIS'] += ['GLES1', 'GLES2']
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|||||||
Reference in New Issue
Block a user