mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

glmark2: Upgrade to 2017.07 release

Browse Source 
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>
This commit is contained in:
Nicolas Dechesne
2017-08-01 14:11:36 +02:00
committed by Martin Jansa
parent 84911f27b6
commit 04c3bc04cd
2 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch
-34
View File
@@ -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
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+3 -4
View File
@@ -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"