aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen2/recipes-graphics/wayland
diff options
context:
space:
mode:
authorManuel Bachmann <mbc@iot.bzh>2016-01-28 09:10:59 +0000
committerManuel Bachmann <mbc@iot.bzh>2016-01-28 11:46:31 +0000
commit294ed7df5328269d9f763adccb331f407bbbe651 (patch)
tree172d049b8b9aa5922335c0e0590a22c6e6289d91 /meta-rcar-gen2/recipes-graphics/wayland
parent047d1f920d892edf807156f3dbbc5184e90734aa (diff)
r-car m2: Revert "EGL_NO_DISPLAY workaroud", update libegl
The previous workaround will not not be necessary anymore to run Weston 1.8.0 on Porter, once we update the Renesas- specific libegl. This reverts commit d76a274af819a7cff4ef5c70de459de7bc68755a. This updates libegl. Change-Id: Ie8bedd0c6a47d05e9c5ec86ec63f035ac61dbb84 Signed-off-by: Manuel Bachmann <mbc@iot.bzh>
Diffstat (limited to 'meta-rcar-gen2/recipes-graphics/wayland')
-rw-r--r--meta-rcar-gen2/recipes-graphics/wayland/libegl.bb2
-rw-r--r--meta-rcar-gen2/recipes-graphics/wayland/weston/weston-workaround-for-egl-no-display.patch27
-rw-r--r--meta-rcar-gen2/recipes-graphics/wayland/weston_1.8.0.bbappend8
3 files changed, 1 insertions, 36 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb b/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb
index 49076a4..5f29449 100644
--- a/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb
+++ b/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "(r8a7790|r8a7791|r8a7793|r8a7794)"
RPROVIDES_${PN} = "${@base_contains("DISTRO_FEATURES", "wayland", "libEGL.so", "", d)}"
PROVIDES = "${@base_contains("DISTRO_FEATURES", "wayland", "virtual/egl", "", d)}"
-SRCREV = "ee4bce93878d02a144ae6ebfba1eff28fe9b4442"
+SRCREV = "02b559098042a0aeb9ac63eece547868a140fa46"
SRC_URI = "git://github.com/thayama/libegl;protocol=git;branch=master \
file://0001-libegl-Remove-duplicate-header-files-of-gles-user-mo.patch"
diff --git a/meta-rcar-gen2/recipes-graphics/wayland/weston/weston-workaround-for-egl-no-display.patch b/meta-rcar-gen2/recipes-graphics/wayland/weston/weston-workaround-for-egl-no-display.patch
deleted file mode 100644
index 3133d2f..0000000
--- a/meta-rcar-gen2/recipes-graphics/wayland/weston/weston-workaround-for-egl-no-display.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/gl-renderer.c 2016-01-27 08:49:43.328882567 +0000
-+++ b/src/gl-renderer.c 2016-01-27 08:56:31.807915324 +0000
-@@ -2127,7 +2127,11 @@
- {
- const char *extensions;
-
-+#ifndef EGL_DRIVER_NO_EGL_NO_DISPLAY_SUPPORT
- extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
-+#else
-+ extensions = NULL;
-+#endif
- if (!extensions) {
- weston_log("Retrieving EGL client extension string failed.\n");
- return;
-@@ -2246,8 +2250,12 @@
- char s[64];
-
- if (!extensions) {
-+#ifndef EGL_DRIVER_NO_EGL_NO_DISPLAY_SUPPORT
- extensions = (const char *) eglQueryString(
- EGL_NO_DISPLAY, EGL_EXTENSIONS);
-+#else
-+ extensions = NULL;
-+#endif
-
- if (!extensions)
- return 0;
diff --git a/meta-rcar-gen2/recipes-graphics/wayland/weston_1.8.0.bbappend b/meta-rcar-gen2/recipes-graphics/wayland/weston_1.8.0.bbappend
deleted file mode 100644
index 383c844..0000000
--- a/meta-rcar-gen2/recipes-graphics/wayland/weston_1.8.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-# EGL driver does not support the EGL_NO_DISPLAY query parameter
-SRC_URI += " \
- file://weston-workaround-for-egl-no-display.patch \
- "
-
-CPPFLAGS_append = " -DEGL_DRIVER_NO_EGL_NO_DISPLAY_SUPPORT=1"