diff options
Diffstat (limited to 'meta-oe/recipes-benchmark/glmark2/glmark2_git.bb')
| -rw-r--r-- | meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index b72ced06ad..0b61d6ed62 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -1,45 +1,45 @@ SUMMARY = "OpenGL (ES) 2.0 benchmark" DESCRIPTION = "glmark2 is a benchmark for OpenGL (ES) 2.0. \ It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0." -HOMEPAGE = "https://launchpad.net/glmark2" -BUGTRACKER = "https://bugs.launchpad.net/glmark2" +HOMEPAGE = "https://github.com/glmark2/glmark2" +BUGTRACKER = "https://github.com/glmark2/glmark2/issues" -LICENSE = "GPLv3+ & SGIv1" +LICENSE = "GPL-3.0-or-later & SGI-1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" DEPENDS = "libpng jpeg udev" +DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-native wayland-protocols', '', d)}" -PV = "2017.07+${SRCPV}" +PV = "2023.01" -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;branch=master \ + file://0001-fix-dispmanx-build.patch \ + file://0002-run-dispmanx-fullscreen.patch \ + file://0003-GLVisualConfig-By-default-don-t-care-about-the-stenc.patch \ +" +SRCREV = "42e3d8fe3aa88743ef90348138f643f7b04a9237" S = "${WORKDIR}/git" -inherit waf pkgconfig distro_features_check - -REQUIRED_DISTRO_FEATURES += "opengl" +inherit meson pkgconfig features_check -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl x11-gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ - drm-gl drm-gles2" +ANY_OF_DISTRO_FEATURES = "opengl dispmanx" -# Enable C++11 features -CXXFLAGS += "-std=c++11" +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" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" -PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm" -PACKAGECONFIG[drm-gles2] = ",,virtual/libgles2 libdrm" +PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm virtual/libgbm" +PACKAGECONFIG[drm-gles2] = ",,virtual/libgles2 libdrm virtual/libgbm" PACKAGECONFIG[wayland-gl] = ",,virtual/libgl wayland" PACKAGECONFIG[wayland-gles2] = ",,virtual/libgles2 wayland" +PACKAGECONFIG[dispmanx] = ",,virtual/libgles2 virtual/libx11" python __anonymous() { packageconfig = (d.getVar("PACKAGECONFIG") or "").split() @@ -56,7 +56,9 @@ python __anonymous() { flavors.append("drm-glesv2") if "drm-gl" in packageconfig: flavors.append("drm-gl") + if "dispmanx" in packageconfig: + flavors = ["dispmanx-glesv2"] if flavors: - d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors)) + d.appendVar("EXTRA_OEMESON", " -Dflavors=%s" % ",".join(flavors)) } |