summaryrefslogtreecommitdiffstats
path: root/package/glmark2
diff options
context:
space:
mode:
Diffstat (limited to 'package/glmark2')
-rw-r--r--package/glmark2/Config.in6
-rw-r--r--package/glmark2/glmark2.hash2
-rw-r--r--package/glmark2/glmark2.mk4
3 files changed, 9 insertions, 3 deletions
diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
index c8380b1d34..addd7a906e 100644
--- a/package/glmark2/Config.in
+++ b/package/glmark2/Config.in
@@ -10,11 +10,17 @@ config BR2_PACKAGE_GLMARK2_GL
depends on BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_MESA3D_DRI_DRIVER
+comment "glmark2 needs a toolchain w/ C++, gcc >= 4.9"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d"
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_INSTALL_LIBSTDCPP
depends on !BR2_PACKAGE_GLMARK2_GL && !BR2_PACKAGE_GLMARK2_EGL_GLES
config BR2_PACKAGE_GLMARK2
bool "glmark2"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
depends on BR2_PACKAGE_GLMARK2_GL || BR2_PACKAGE_GLMARK2_EGL_GLES
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBPNG
diff --git a/package/glmark2/glmark2.hash b/package/glmark2/glmark2.hash
index 7868b37d9d..92c53e5410 100644
--- a/package/glmark2/glmark2.hash
+++ b/package/glmark2/glmark2.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 421bdb87ed8c04a25f60816c7754d45e91a45136f5489df59d74001c159882b8 glmark2-fa71af2dfab711fac87b9504b6fc9862f44bf72a.tar.gz
+sha256 ea59bd267a88e2c773423eec43f7cb90b0ca1c369762e836dec575ebdcdcc012 glmark2-7215c0f337dae0b232535549c37fca441747a891.tar.gz
diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk
index e35e36a4e6..c7cefeb16c 100644
--- a/package/glmark2/glmark2.mk
+++ b/package/glmark2/glmark2.mk
@@ -4,9 +4,9 @@
#
################################################################################
-GLMARK2_VERSION = fa71af2dfab711fac87b9504b6fc9862f44bf72a
+GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891
GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION))
-GLMARK2_LICENSE = GPLv3+ SGIv1
+GLMARK2_LICENSE = GPLv3+, SGIv1
GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \
$(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \
OpenPOWER on IntegriCloud