Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 May 2020 10:00:12 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r536960 - in head/benchmarks/glmark2: . files
Message-ID:  <202005291000.04TA0Ci1046021@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Fri May 29 10:00:12 2020
New Revision: 536960
URL: https://svnweb.freebsd.org/changeset/ports/536960

Log:
  - Update to version 2020.04, first release in many years (unfortunately,
    it was tagged just before the commit 06e4728 which fixed building with
    Python 3.x, point GH_TAGNAME to it instead of pulling a patch)
  - Drop explicit `python:build' from USES list, because `waf' implies it
  - Add missing USE_XORG and put `xorg' on USES list
  - For the time being, don't force C++14 while C++11 is sufficient until
    the code really starts using new features (see GitHub commit a6bbc01)
  
  PR:		246793
  Submitted by:	David Schlachter

Deleted:
  head/benchmarks/glmark2/files/
Modified:
  head/benchmarks/glmark2/Makefile
  head/benchmarks/glmark2/distinfo
  head/benchmarks/glmark2/pkg-plist

Modified: head/benchmarks/glmark2/Makefile
==============================================================================
--- head/benchmarks/glmark2/Makefile	Fri May 29 09:32:49 2020	(r536959)
+++ head/benchmarks/glmark2/Makefile	Fri May 29 10:00:12 2020	(r536960)
@@ -2,23 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	glmark2
-PORTVERSION=	2014.03
-PORTREVISION=	1
+PORTVERSION=	2020.04
 CATEGORIES=	benchmarks
-MASTER_SITES=	https://launchpadlibrarian.net/169075003/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Benchmark for OpenGL (ES) 2.0
 
 LICENSE=	GPLv3
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
-
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		gl jpeg localbase:ldflags pkgconfig python:2.7,build waf
+USES=		compiler:c++11-lang gl jpeg localbase:ldflags pkgconfig \
+		waf xorg
+USE_XORG=	x11
 USE_GL=		egl gl glesv2
+USE_GITHUB=	yes
+GH_TAGNAME=	06e4728
 CONFIGURE_ARGS=	--with-flavors=x11-gl,x11-glesv2 --no-opt --no-debug
 
 PORTDOCS=	NEWS
@@ -26,6 +25,7 @@ PORTDOCS=	NEWS
 OPTIONS_DEFINE=	DOCS
 
 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

Modified: head/benchmarks/glmark2/distinfo
==============================================================================
--- head/benchmarks/glmark2/distinfo	Fri May 29 09:32:49 2020	(r536959)
+++ head/benchmarks/glmark2/distinfo	Fri May 29 10:00:12 2020	(r536960)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1394537514
-SHA256 (glmark2-2014.03.tar.gz) = bded41aaf918ce062d9b81e42cc5be943e6a80bc4ff9d046983b96102c3df6b5
-SIZE (glmark2-2014.03.tar.gz) = 7801401
+TIMESTAMP = 1588522805
+SHA256 (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = d0f09a9c84560c66f174a3e1c0ab65d92f9b4b35476cd526c4aae4efc0645091
+SIZE (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = 9364467

Modified: head/benchmarks/glmark2/pkg-plist
==============================================================================
--- head/benchmarks/glmark2/pkg-plist	Fri May 29 09:32:49 2020	(r536959)
+++ head/benchmarks/glmark2/pkg-plist	Fri May 29 10:00:12 2020	(r536960)
@@ -1,7 +1,7 @@
 bin/glmark2
 bin/glmark2-es2
-man/man1/glmark2.1.gz
-man/man1/glmark2-es2.1.gz
+share/man/man1/glmark2.1.gz
+share/man/man1/glmark2-es2.1.gz
 %%DATADIR%%/models/asteroid-high.3ds
 %%DATADIR%%/models/asteroid-low.3ds
 %%DATADIR%%/models/bunny.obj
@@ -9,6 +9,7 @@ man/man1/glmark2-es2.1.gz
 %%DATADIR%%/models/cube.3ds
 %%DATADIR%%/models/horse.3ds
 %%DATADIR%%/models/jellyfish.jobj
+%%DATADIR%%/shaders/README.shaders
 %%DATADIR%%/shaders/buffer-wireframe.frag
 %%DATADIR%%/shaders/buffer-wireframe.vert
 %%DATADIR%%/shaders/bump-height.frag
@@ -75,7 +76,6 @@ man/man1/glmark2-es2.1.gz
 %%DATADIR%%/shaders/loop.vert
 %%DATADIR%%/shaders/pulsar-light.vert
 %%DATADIR%%/shaders/pulsar.vert
-%%DATADIR%%/shaders/README.shaders
 %%DATADIR%%/shaders/shadow.frag
 %%DATADIR%%/shaders/shadow.vert
 %%DATADIR%%/shaders/terrain-blur.frag



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005291000.04TA0Ci1046021>