View | Details | Raw Unified | Return to bug 246793
Collapse All | Expand All

(-)benchmarks/glmark2/Makefile (-6 / +6 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	glmark2
4
PORTNAME=	glmark2
5
PORTVERSION=	2014.03
5
PORTVERSION=	2020.04
6
PORTREVISION=	1
6
PORTREVISION=	1
7
CATEGORIES=	benchmarks
7
CATEGORIES=	benchmarks
8
MASTER_SITES=	https://launchpadlibrarian.net/169075003/
9
8
10
MAINTAINER=	danfe@FreeBSD.org
9
MAINTAINER=	danfe@FreeBSD.org
11
COMMENT=	Benchmark for OpenGL (ES) 2.0
10
COMMENT=	Benchmark for OpenGL (ES) 2.0
Lines 12-24 Link Here
12
11
13
LICENSE=	GPLv3
12
LICENSE=	GPLv3
14
13
15
DEPRECATED=	Uses deprecated version of python
16
EXPIRATION_DATE=	2020-09-15
17
18
LIB_DEPENDS=	libpng.so:graphics/png
14
LIB_DEPENDS=	libpng.so:graphics/png
19
15
20
USES=		gl jpeg localbase:ldflags pkgconfig python:2.7,build waf
16
USES=		gl jpeg localbase:ldflags pkgconfig python:3.7,build waf
21
USE_GL=		egl gl glesv2
17
USE_GL=		egl gl glesv2
18
USE_GITHUB=	yes
19
GH_ACCOUNT=	glmark2
20
GH_PROJECT=	glmark2
21
GH_TAGNAME=	06e4728
22
CONFIGURE_ARGS=	--with-flavors=x11-gl,x11-glesv2 --no-opt --no-debug
22
CONFIGURE_ARGS=	--with-flavors=x11-gl,x11-glesv2 --no-opt --no-debug
23
23
24
PORTDOCS=	NEWS
24
PORTDOCS=	NEWS
(-)benchmarks/glmark2/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1394537514
1
TIMESTAMP = 1590628851
2
SHA256 (glmark2-2014.03.tar.gz) = bded41aaf918ce062d9b81e42cc5be943e6a80bc4ff9d046983b96102c3df6b5
2
SHA256 (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = d0f09a9c84560c66f174a3e1c0ab65d92f9b4b35476cd526c4aae4efc0645091
3
SIZE (glmark2-2014.03.tar.gz) = 7801401
3
SIZE (glmark2-glmark2-2020.04-06e4728_GH0.tar.gz) = 9364467
(-)benchmarks/glmark2/files/patch-wscript (-35 / +15 lines)
Lines 1-37 Link Here
1
--- wscript.orig	2014-03-11 08:50:10 UTC
1
--- wscript.orig	2020-05-27 21:25:57.844452000 -0400
2
+++ wscript
2
+++ wscript	2020-05-27 21:33:26.550831000 -0400
3
@@ -87,14 +87,8 @@ def configure(ctx):
3
@@ -160,10 +160,10 @@
4
     for (lib, uselib) in req_libs:
5
         ctx.check_cxx(lib = lib, uselib_store = uselib)
6
 
4
 
7
-    # Check required functions
5
 def configure_linux(ctx):
8
-    req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])]
6
     # Check required headers
9
-    for func, header, uselib in req_funcs:
7
-    req_headers = ['stdlib.h', 'string.h', 'stdint.h', 'stdio.h', 'dlfcn.h',
10
-        ctx.check_cxx(function_name = func, header_name = header,
8
-                   'unistd.h', 'jpeglib.h', 'math.h', 'string.h']
11
-                      uselib = uselib, mandatory = True)
9
-    for header in req_headers:
12
-
10
-        ctx.check_cc(header_name = header, auto_add_header_name = True, mandatory = True)
13
     # Check for a supported version of libpng
11
+    #req_headers = ['stdlib.h', 'string.h', 'stdint.h', 'stdio.h', 'dlfcn.h',
14
-    supp_png_pkgs = (('libpng12', '1.2'), ('libpng15', '1.5'),)
12
+    #              'unistd.h', 'jpeglib.h', 'math.h', 'string.h']
15
+    supp_png_pkgs = (('libpng12', '1.2'), ('libpng16', '1.6'),)
13
+    #for header in req_headers:
16
     have_png = False
14
+    #    ctx.check_cc(header_name = header, auto_add_header_name = True, mandatory = True)
17
     for (pkg, atleast) in supp_png_pkgs:
18
         try:
19
@@ -123,7 +117,7 @@ def configure(ctx):
20
         ctx.check_cfg(package = pkg, uselib_store = uselib,
21
                       args = '--cflags --libs', mandatory = mandatory)
22
 
15
 
23
-    ctx.env.append_unique('CXXFLAGS', '-Werror -Wall -Wextra -Wnon-virtual-dtor'.split(' '))
16
     # Check for required libs
24
+    ctx.env.append_unique('CXXFLAGS', '-Wall -Wextra -Wnon-virtual-dtor'.split(' '))
17
     req_libs = [('m', 'm'), ('jpeg', 'jpeg')]
25
 
26
     # Prepend -O# and -g flags so that they can be overriden by the
27
     # CFLAGS environment variable
28
@@ -132,6 +126,9 @@ def configure(ctx):
29
     if Options.options.debug:
30
         ctx.env.prepend_value('CXXFLAGS', '-g')
31
 
32
+    # Fix manpages path for FreeBSD
33
+    ctx.env.MANDIR = '%s/man' % ctx.env.PREFIX
34
+
35
     ctx.env.HAVE_EXTRAS = False
36
     if Options.options.extras_path is not None:
37
         ctx.env.HAVE_EXTRAS = True
(-)benchmarks/glmark2/pkg-plist (-3 / +3 lines)
Lines 1-7 Link Here
1
bin/glmark2
1
bin/glmark2
2
bin/glmark2-es2
2
bin/glmark2-es2
3
man/man1/glmark2.1.gz
4
man/man1/glmark2-es2.1.gz
5
%%DATADIR%%/models/asteroid-high.3ds
3
%%DATADIR%%/models/asteroid-high.3ds
6
%%DATADIR%%/models/asteroid-low.3ds
4
%%DATADIR%%/models/asteroid-low.3ds
7
%%DATADIR%%/models/bunny.obj
5
%%DATADIR%%/models/bunny.obj
Lines 9-14 Link Here
9
%%DATADIR%%/models/cube.3ds
7
%%DATADIR%%/models/cube.3ds
10
%%DATADIR%%/models/horse.3ds
8
%%DATADIR%%/models/horse.3ds
11
%%DATADIR%%/models/jellyfish.jobj
9
%%DATADIR%%/models/jellyfish.jobj
10
%%DATADIR%%/shaders/README.shaders
12
%%DATADIR%%/shaders/buffer-wireframe.frag
11
%%DATADIR%%/shaders/buffer-wireframe.frag
13
%%DATADIR%%/shaders/buffer-wireframe.vert
12
%%DATADIR%%/shaders/buffer-wireframe.vert
14
%%DATADIR%%/shaders/bump-height.frag
13
%%DATADIR%%/shaders/bump-height.frag
Lines 75-81 Link Here
75
%%DATADIR%%/shaders/loop.vert
74
%%DATADIR%%/shaders/loop.vert
76
%%DATADIR%%/shaders/pulsar-light.vert
75
%%DATADIR%%/shaders/pulsar-light.vert
77
%%DATADIR%%/shaders/pulsar.vert
76
%%DATADIR%%/shaders/pulsar.vert
78
%%DATADIR%%/shaders/README.shaders
79
%%DATADIR%%/shaders/shadow.frag
77
%%DATADIR%%/shaders/shadow.frag
80
%%DATADIR%%/shaders/shadow.vert
78
%%DATADIR%%/shaders/shadow.vert
81
%%DATADIR%%/shaders/terrain-blur.frag
79
%%DATADIR%%/shaders/terrain-blur.frag
Lines 136-138 Link Here
136
%%DATADIR%%/textures/terrain-backgrounddetailed6.jpg
134
%%DATADIR%%/textures/terrain-backgrounddetailed6.jpg
137
%%DATADIR%%/textures/terrain-grasslight-512-nm.jpg
135
%%DATADIR%%/textures/terrain-grasslight-512-nm.jpg
138
%%DATADIR%%/textures/terrain-grasslight-512.jpg
136
%%DATADIR%%/textures/terrain-grasslight-512.jpg
137
share/man/man1/glmark2-es2.1.gz
138
share/man/man1/glmark2.1.gz

Return to bug 246793