diff options
| author |   Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2017-08-01 14:11:36 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:20:57 +0200 |
| commit | 04c3bc04cda280ee7cf01e7c179157931af7a4f2 (patch) | |
| tree | d3f0d9d5d1c891a24450be10648973bb126c5d1b /meta-oe | |
| parent | 84911f27b69a79d1c5e4d3ae8108bbb89d0ca55b (diff) | |
| download | meta-openembedded-contrib-04c3bc04cda280ee7cf01e7c179157931af7a4f2.tar.gz | |
glmark2: Upgrade to 2017.07 release
Upstream added new dependency on udev in
a7ae55d NativeStateDRM: Probe the DRM node path to use with udev
Patch removed since it was merged upstream in
5fcdba1 wayland: Fix destruction order of surface-related objects
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 7 |
2 files changed, 3 insertions, 38 deletions
diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch deleted file mode 100644 index 439508102a..0000000000 --- a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001 -From: Yong Gan <b45748@freescale.com> -Date: Tue, 27 Oct 2015 18:15:20 +0800 -Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window - destroyed. - -Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12] - -Signed-off-by: Yong Gan <b45748@freescale.com> - ---- - src/native-state-wayland.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp -index 41fc743..cdcdf34 100644 ---- a/src/native-state-wayland.cpp -+++ b/src/native-state-wayland.cpp -@@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland() - wl_shell_surface_destroy(window_->shell_surface); - if (window_->opaque_reqion) - wl_region_destroy(window_->opaque_reqion); -- if (window_->surface) -- wl_surface_destroy(window_->surface); - if (window_->native) - wl_egl_window_destroy(window_->native); -+ if (window_->surface) -+ wl_surface_destroy(window_->surface); - delete window_; - } - --- -1.9.1 - diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 85d7bf16e0..4c5e0567b9 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -8,18 +8,17 @@ LICENSE = "GPLv3+ & SGIv1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" -DEPENDS = "libpng jpeg" +DEPENDS = "libpng jpeg udev" -PV = "2014.03+${SRCPV}" +PV = "2017.07+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \ file://Fix-configure-for-sqrt-check.patch \ " -SRCREV = "9b1070fe9c5cf908f323909d3c8cbed08022abe8" +SRCREV = "182dcbffe5c8483eadff025b429ee1aacc69c6c2" S = "${WORKDIR}/git" |