svn commit: r565490 - head/benchmarks/glmark2

[Alexey Dokuchaev]

Author: danfe
Date: Wed Feb 17 09:44:46 2021
New Revision: 565490
URL: https://svnweb.freebsd.org/changeset/ports/565490

Log:
  - Update `benchmarks/glmark2' to version 2021.02
  - Gargage-collect patches integrated upstream
  - Now really requires C++14-capable compiler, so
    stop trying to force C++11
  - Disable Wayland flavor and mark it as BROKEN
  
  Reported by:	portscout

Modified:
  head/benchmarks/glmark2/Makefile
  head/benchmarks/glmark2/distinfo

Modified: head/benchmarks/glmark2/Makefile
==============================================================================
--- head/benchmarks/glmark2/Makefile	Wed Feb 17 09:38:29 2021	(r565489)
+++ head/benchmarks/glmark2/Makefile	Wed Feb 17 09:44:46 2021	(r565490)
@@ -2,14 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	glmark2
-PORTVERSION=	2020.04
-PORTREVISION=	1
+PORTVERSION=	2021.02
 CATEGORIES=	benchmarks
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	c50755b5a193.patch:-p1 # https://github.com/glmark2/glmark2/issues/125
-PATCHFILES+=	ca6e78769306.patch:-p1 # https://github.com/glmark2/glmark2/issues/125
-
 MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	Benchmark for OpenGL (ES) 2.0
 
@@ -17,11 +12,9 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		compiler:c++11-lang gl jpeg localbase:ldflags pkgconfig \
-		waf
+USES=		compiler:c++14-lang gl jpeg localbase:ldflags pkgconfig waf
 USE_GL=		egl gl glesv2
 USE_GITHUB=	yes
-GH_TAGNAME=	06e4728
 CONFIGURE_ARGS=	--with-flavors=${PLATFORMS:ts,} --no-opt --no-debug
 
 PORTDOCS=	NEWS
@@ -29,9 +22,11 @@ PORTDOCS=	NEWS
 OPTIONS_DEFINE=	DOCS
 OPTIONS_MULTI=	PLATFORM
 OPTIONS_MULTI_PLATFORM=	DRM WAYLAND X11
-OPTIONS_DEFAULT=DRM WAYLAND X11
+OPTIONS_DEFAULT=DRM X11
 OPTIONS_SUB=	yes
 
+WAYLAND_BROKEN=	../src/native-state-wayland.cpp:26:10: fatal error: 'linux/input.h' file not found
+
 PLATFORM_DESC=		Window systems
 
 DRM_DESC=		KMS console support
@@ -49,10 +44,7 @@ X11_USE=		XORG=x11
 X11_VARS=		PLATFORMS+="x11-gl x11-glesv2"
 
 post-patch:
-	@${REINPLACE_CMD} -e '/-std=c++/s,14,11,' ${WRKSRC}/wscript
 	@${REINPLACE_CMD} -e "/lib/s/, 'dl'//" ${WRKSRC}/src/wscript_build
-	@${REINPLACE_CMD} -e 's/GLMARK_VERSION/ &/' \
-		${WRKSRC}/src/native-state-x11.cpp
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/benchmarks/glmark2/distinfo
==============================================================================
--- head/benchmarks/glmark2/distinfo	Wed Feb 17 09:38:29 2021	(r565489)
+++ head/benchmarks/glmark2/distinfo	Wed Feb 17 09:44:46 2021	(r565490)
@@ -1,7 +1,3 @@
-TIMESTAMP = 1588522805
-SHA256 (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = d0f09a9c84560c66f174a3e1c0ab65d92f9b4b35476cd526c4aae4efc0645091
-SIZE (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = 9364467
-SHA256 (c50755b5a193.patch) = 821772f1db7c6cd3f97112aa18d46ab194235914ab607e88a389c3a093cb42e7
-SIZE (c50755b5a193.patch) = 1305
-SHA256 (ca6e78769306.patch) = ef1b6d35422d236a84196550115007c65b355e80f0ac04134a55d68144c831e9
-SIZE (ca6e78769306.patch) = 879
+TIMESTAMP = 1613396420
+SHA256 (glmark2-glmark2-2021.02_GH0.tar.gz) = bebadb78c13aea5e88ed892e5563101ccb745b75f1dc86a8fc7229f00d78cbf1
+SIZE (glmark2-glmark2-2021.02_GH0.tar.gz) = 9369477