diff options
author | Trevor Woerner <twoerner@gmail.com> | 2020-12-11 00:13:26 -0500 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-12-10 22:33:58 -0800 |
commit | 936f2380bb5112721eec2db46eb35b5600ac28de (patch) | |
tree | c16454b130cadf7bc198ad07d2b9be2e10ade796 /meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | |
parent | 38ef5f5bf04fe174f954fe9a837a0cbe02eb278c (diff) | |
download | meta-openembedded-936f2380bb5112721eec2db46eb35b5600ac28de.tar.gz |
glmark2: revert to previous behaviour
- use "drm-gles2" as the default PACKAGECONFIG outside of any defined
DISTRO_FEATURES
- use a version string that includes the full date of the latest git change
(not just: <year>.<month>)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark/glmark2/glmark2_git.bb')
-rw-r--r-- | meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 46634634d..44bce9fb5 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | |||
11 | DEPENDS = "libpng jpeg udev" | 11 | DEPENDS = "libpng jpeg udev" |
12 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native', '', d)}" | 12 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native', '', d)}" |
13 | 13 | ||
14 | PV = "2020.11+${SRCPV}" | 14 | PV = "20201114+${SRCPV}" |
15 | 15 | ||
16 | SRC_URI = " \ | 16 | SRC_URI = " \ |
17 | git://github.com/glmark2/glmark2.git;protocol=https \ | 17 | git://github.com/glmark2/glmark2.git;protocol=https \ |
@@ -26,9 +26,10 @@ inherit waf pkgconfig features_check | |||
26 | 26 | ||
27 | ANY_OF_DISTRO_FEATURES = "opengl dispmanx" | 27 | ANY_OF_DISTRO_FEATURES = "opengl dispmanx" |
28 | 28 | ||
29 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2 drm-gles2', '', d)} \ | 29 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \ |
30 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2 drm-gles2', '', d)} \ | 30 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \ |
31 | ${@bb.utils.contains('DISTRO_FEATURES', 'dispmanx', 'dispmanx', '', d)} \ | 31 | ${@bb.utils.contains('DISTRO_FEATURES', 'dispmanx', 'dispmanx', '', d)} \ |
32 | drm-gles2 \ | ||
32 | " | 33 | " |
33 | 34 | ||
34 | PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" | 35 | PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" |