aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2020-12-11 00:13:26 -0500
committerKhem Raj <raj.khem@gmail.com>2020-12-10 22:33:58 -0800
commit936f2380bb5112721eec2db46eb35b5600ac28de (patch)
treec16454b130cadf7bc198ad07d2b9be2e10ade796
parent38ef5f5bf04fe174f954fe9a837a0cbe02eb278c (diff)
downloadmeta-openembedded-contrib-936f2380bb5112721eec2db46eb35b5600ac28de.tar.gz
meta-openembedded-contrib-936f2380bb5112721eec2db46eb35b5600ac28de.tar.bz2
meta-openembedded-contrib-936f2380bb5112721eec2db46eb35b5600ac28de.zip
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>
-rw-r--r--meta-oe/recipes-benchmark/glmark2/glmark2_git.bb7
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 46634634d2..44bce9fb5f 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 \
DEPENDS = "libpng jpeg udev"
DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native', '', d)}"
-PV = "2020.11+${SRCPV}"
+PV = "20201114+${SRCPV}"
SRC_URI = " \
git://github.com/glmark2/glmark2.git;protocol=https \
@@ -26,9 +26,10 @@ inherit waf pkgconfig features_check
ANY_OF_DISTRO_FEATURES = "opengl dispmanx"
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2 drm-gles2', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2 drm-gles2', '', d)} \
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'dispmanx', 'dispmanx', '', d)} \
+ drm-gles2 \
"
PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11"