diff options
author | Ross Burton <ross.burton@intel.com> | 2019-02-06 16:15:19 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-06 08:19:13 -0800 |
commit | 7baf5c36360bb628f4421095b958225c7e6ab487 (patch) | |
tree | 558f02192ba2fed2de30848ff17cdb1713d4c807 /meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | |
parent | f6e0ee746b633a2632980221d02ff704c524e7b4 (diff) | |
download | meta-openembedded-contrib-7baf5c36360bb628f4421095b958225c7e6ab487.tar.gz |
glmark2: update to current git
Remove two patches merged upstream. The other patch isn't required so can be
deleted.
Remove explicit --std=c++11 as the wscript adds --std=c++14 now.
Change PV to contain the full date just in case we want to update more than once
a month.
Signed-off-by: Ross Burton <ross.burton@intel.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 | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 99050e7047..7ed5cd0281 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,16 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "2017.07+${SRCPV}" +PV = "20190205+${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://Fix-configure-for-sqrt-check.patch \ - file://0001-Fix-clang-warnings.patch \ - " -SRCREV = "ed20c633f1926d1dd78e3e89043c85a81302cbe6" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" +SRCREV = "0c90dd48df43a6b0db1d9aabca6298240f4968f7" S = "${WORKDIR}/git" @@ -31,9 +27,6 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ drm-gl drm-gles2" -# Enable C++11 features -CXXFLAGS += "-std=c++11" - PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm virtual/libgbm" |