diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch')
| -rw-r--r-- | poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch b/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch index 0289ac228c..572c8014ca 100644 --- a/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch +++ b/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch @@ -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 |