From a7eeb9c20e23811df87a488f45ff5239761c9e53 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 23 Dec 2020 11:55:30 +0000 Subject: [PATCH] glmark2: update to latest git and move build to meson --- packages/graphics/glmark2/package.mk | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/packages/graphics/glmark2/package.mk b/packages/graphics/glmark2/package.mk index 05ea644f1f..5f85aaaa5b 100644 --- a/packages/graphics/glmark2/package.mk +++ b/packages/graphics/glmark2/package.mk @@ -2,31 +2,18 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glmark2" -PKG_VERSION="7632c2e2677ef01e44af758823c2fffcced22524" -PKG_SHA256="c0fb0fb2f62d05f229466a4c1cbb902816595b0a5ed860de46f763533c515e6c" +PKG_VERSION="784aca755a469b144acf3cae180b6e613b7b057a" +PKG_SHA256="787dd7de05c795c7c42694e648b5c6418e4b395fc460ea349d1d35d493469356" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/glmark2/glmark2" PKG_URL="https://github.com/glmark2/glmark2/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark" -PKG_TOOLCHAIN="manual" if [ "$OPENGLES_SUPPORT" = "yes" ]; then PKG_DEPENDS_TARGET+=" $OPENGLES" - PKG_CONFIGURE_OPTS_TARGET="--with-flavors=drm-glesv2" + PKG_MESON_OPTS_TARGET="-Dflavors=drm-glesv2" elif [ "$OPENGL_SUPPORT" = "yes" ]; then PKG_DEPENDS_TARGET+=" $OPENGL" - PKG_CONFIGURE_OPTS_TARGET="--with-flavors=drm-gl" + PKG_MESON_OPTS_TARGET="-Dflavors=drm-gl" fi - -configure_target() { - ./waf configure $PKG_CONFIGURE_OPTS_TARGET --prefix=/usr -} - -make_target() { - ./waf -} - -makeinstall_target() { - ./waf install --destdir=$INSTALL -}