diff options
Diffstat (limited to 'meta-oe/recipes-benchmark')
-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 439508102..000000000 --- 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 @@ | |||
1 | From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001 | ||
2 | From: Yong Gan <b45748@freescale.com> | ||
3 | Date: Tue, 27 Oct 2015 18:15:20 +0800 | ||
4 | Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window | ||
5 | destroyed. | ||
6 | |||
7 | Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12] | ||
8 | |||
9 | Signed-off-by: Yong Gan <b45748@freescale.com> | ||
10 | |||
11 | --- | ||
12 | src/native-state-wayland.cpp | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp | ||
16 | index 41fc743..cdcdf34 100644 | ||
17 | --- a/src/native-state-wayland.cpp | ||
18 | +++ b/src/native-state-wayland.cpp | ||
19 | @@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland() | ||
20 | wl_shell_surface_destroy(window_->shell_surface); | ||
21 | if (window_->opaque_reqion) | ||
22 | wl_region_destroy(window_->opaque_reqion); | ||
23 | - if (window_->surface) | ||
24 | - wl_surface_destroy(window_->surface); | ||
25 | if (window_->native) | ||
26 | wl_egl_window_destroy(window_->native); | ||
27 | + if (window_->surface) | ||
28 | + wl_surface_destroy(window_->surface); | ||
29 | delete window_; | ||
30 | } | ||
31 | |||
32 | -- | ||
33 | 1.9.1 | ||
34 | |||
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 85d7bf16e..4c5e0567b 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" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
9 | file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" | 9 | file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" |
10 | 10 | ||
11 | DEPENDS = "libpng jpeg" | 11 | DEPENDS = "libpng jpeg udev" |
12 | 12 | ||
13 | PV = "2014.03+${SRCPV}" | 13 | PV = "2017.07+${SRCPV}" |
14 | 14 | ||
15 | COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" | 15 | COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ | 17 | SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ |
18 | file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ | 18 | file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ |
19 | file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \ | ||
20 | file://Fix-configure-for-sqrt-check.patch \ | 19 | file://Fix-configure-for-sqrt-check.patch \ |
21 | " | 20 | " |
22 | SRCREV = "9b1070fe9c5cf908f323909d3c8cbed08022abe8" | 21 | SRCREV = "182dcbffe5c8483eadff025b429ee1aacc69c6c2" |
23 | 22 | ||
24 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
25 | 24 | ||