diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile index e3303910cab3..d747a631891f 100644 --- a/benchmarks/glmark2/Makefile +++ b/benchmarks/glmark2/Makefile @@ -1,51 +1,53 @@ PORTNAME= glmark2 -PORTVERSION= 2021.12 +PORTVERSION= 2023.01 CATEGORIES= benchmarks MAINTAINER= danfe@FreeBSD.org COMMENT= Benchmark for OpenGL (ES) 2.0 WWW= https://launchpad.net/glmark2 LICENSE= GPLv3 LIB_DEPENDS= libpng.so:graphics/png -USES= compiler:c++14-lang gl jpeg localbase:ldflags pkgconfig waf -USE_GL= egl gl glesv2 +USES= compiler:c++14-lang jpeg meson pkgconfig USE_GITHUB= yes -CONFIGURE_ARGS= --with-flavors=${PLATFORMS:ts,} --no-opt --no-debug +CONFIGURE_ARGS= -Dflavors=${PLATFORMS:ts,} PORTDOCS= NEWS OPTIONS_DEFINE= DOCS OPTIONS_MULTI= PLATFORM -OPTIONS_MULTI_PLATFORM= DRM WAYLAND X11 -OPTIONS_DEFAULT=DRM WAYLAND X11 +OPTIONS_MULTI_PLATFORM= DRM GBM WAYLAND X11 +OPTIONS_DEFAULT= DRM GBM WAYLAND X11 OPTIONS_SUB= yes PLATFORM_DESC= Window systems DRM_DESC= KMS console support DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm +DRM_USES= gl DRM_USE= GL=gbm DRM_VARS= PLATFORMS+="drm-gl drm-glesv2" +GBM_DESC= GBM offscreen rendering +GBM_USES= gl +GBM_USE= GL=gbm +GBM_VARS= PLATFORMS+="gbm-gl gbm-glesv2" + WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ wayland-protocols>=1.12:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_VARS= PLATFORMS+="wayland-gl wayland-glesv2" -X11_USES= xorg +X11_USES= localbase xorg X11_USE= XORG=x11 -X11_VARS= PLATFORMS+="x11-gl x11-glesv2" - -post-patch: - @${REINPLACE_CMD} -e "/lib/s/, 'dl'//" ${WRKSRC}/src/wscript_build +X11_VARS= PLATFORMS+="x11-gl x11-glesv2 x11-gl-egl" post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/benchmarks/glmark2/distinfo b/benchmarks/glmark2/distinfo index c6b4e81b168d..81c63163f63c 100644 --- a/benchmarks/glmark2/distinfo +++ b/benchmarks/glmark2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640270771 -SHA256 (glmark2-glmark2-2021.12_GH0.tar.gz) = 9f111284b2ef1d3fce91928e249e6ca00796a036831b063a549a0f3b03557a95 -SIZE (glmark2-glmark2-2021.12_GH0.tar.gz) = 9360052 +TIMESTAMP = 1674126135 +SHA256 (glmark2-glmark2-2023.01_GH0.tar.gz) = 8fece3fc323b643644a525be163dc4931a4189971eda1de8ad4c1712c5db3d67 +SIZE (glmark2-glmark2-2023.01_GH0.tar.gz) = 9366116 diff --git a/benchmarks/glmark2/files/patch-python311 b/benchmarks/glmark2/files/patch-python311 deleted file mode 100644 index 6f77aae72de6..000000000000 --- a/benchmarks/glmark2/files/patch-python311 +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.com/ita1024/waf/-/commit/68997828c850 - ---- waflib/ConfigSet.py.orig 2021-12-23 14:46:11 UTC -+++ waflib/ConfigSet.py -@@ -140,7 +140,7 @@ class ConfigSet(object): - Utils.writef(filename,''.join(buf)) - def load(self,filename): - tbl=self.table -- code=Utils.readf(filename,m='rU') -+ code=Utils.readf(filename,m='r') - for m in re_imp.finditer(code): - g=m.group - tbl[g(2)]=eval(g(3)) ---- waflib/Context.py.orig 2021-12-23 14:46:11 UTC -+++ waflib/Context.py -@@ -109,7 +109,7 @@ class Context(ctx): - cache[node]=True - self.pre_recurse(node) - try: -- function_code=node.read('rU',encoding) -+ function_code=node.read('r',encoding) - exec(compile(function_code,node.abspath(),'exec'),self.exec_dict) - finally: - self.post_recurse(node) -@@ -340,7 +340,7 @@ def load_module(path,encoding=None): - pass - module=imp.new_module(WSCRIPT_FILE) - try: -- code=Utils.readf(path,m='rU',encoding=encoding) -+ code=Utils.readf(path,m='r',encoding=encoding) - except EnvironmentError: - raise Errors.WafError('Could not read the file %r'%path) - module_dir=os.path.dirname(path) diff --git a/benchmarks/glmark2/pkg-plist b/benchmarks/glmark2/pkg-plist index 304bba8bce9f..7e8882e80bad 100644 --- a/benchmarks/glmark2/pkg-plist +++ b/benchmarks/glmark2/pkg-plist @@ -1,146 +1,152 @@ %%DRM%%bin/glmark2-drm %%DRM%%bin/glmark2-es2-drm +%%GBM%%bin/glmark2-gbm +%%GBM%%bin/glmark2-es2-gbm %%WAYLAND%%bin/glmark2-wayland %%WAYLAND%%bin/glmark2-es2-wayland %%X11%%bin/glmark2 +%%X11%%bin/glmark2-egl %%X11%%bin/glmark2-es2 -%%DRM%%share/man/man1/glmark2-drm.1.gz -%%DRM%%share/man/man1/glmark2-es2-drm.1.gz -%%WAYLAND%%share/man/man1/glmark2-wayland.1.gz -%%WAYLAND%%share/man/man1/glmark2-es2-wayland.1.gz -%%X11%%share/man/man1/glmark2.1.gz -%%X11%%share/man/man1/glmark2-es2.1.gz +%%DRM%%man/man1/glmark2-drm.1.gz +%%DRM%%man/man1/glmark2-es2-drm.1.gz +%%GBM%%man/man1/glmark2-gbm.1.gz +%%GBM%%man/man1/glmark2-es2-gbm.1.gz +%%WAYLAND%%man/man1/glmark2-wayland.1.gz +%%WAYLAND%%man/man1/glmark2-es2-wayland.1.gz +%%X11%%man/man1/glmark2.1.gz +%%X11%%man/man1/glmark2-egl.1.gz +%%X11%%man/man1/glmark2-es2.1.gz %%DATADIR%%/models/asteroid-high.3ds %%DATADIR%%/models/asteroid-low.3ds %%DATADIR%%/models/bunny.obj %%DATADIR%%/models/cat.3ds %%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 %%DATADIR%%/shaders/bump-height.vert %%DATADIR%%/shaders/bump-normals-tangent.frag %%DATADIR%%/shaders/bump-normals-tangent.vert %%DATADIR%%/shaders/bump-normals.frag %%DATADIR%%/shaders/bump-normals.vert %%DATADIR%%/shaders/bump-poly.frag %%DATADIR%%/shaders/bump-poly.vert %%DATADIR%%/shaders/conditionals-step-conditional.all %%DATADIR%%/shaders/conditionals-step-simple.all %%DATADIR%%/shaders/conditionals.frag %%DATADIR%%/shaders/conditionals.vert %%DATADIR%%/shaders/depth.frag %%DATADIR%%/shaders/depth.vert %%DATADIR%%/shaders/desktop-blur.frag %%DATADIR%%/shaders/desktop.frag %%DATADIR%%/shaders/desktop.vert %%DATADIR%%/shaders/effect-2d-convolution.frag %%DATADIR%%/shaders/effect-2d.vert %%DATADIR%%/shaders/function-call.all %%DATADIR%%/shaders/function-step-low.all %%DATADIR%%/shaders/function-step-medium.all %%DATADIR%%/shaders/function.frag %%DATADIR%%/shaders/function.vert %%DATADIR%%/shaders/gradient.frag %%DATADIR%%/shaders/gradient.vert %%DATADIR%%/shaders/ideas-lamp-lit.frag %%DATADIR%%/shaders/ideas-lamp-lit.vert %%DATADIR%%/shaders/ideas-lamp-unlit.frag %%DATADIR%%/shaders/ideas-lamp-unlit.vert %%DATADIR%%/shaders/ideas-logo-flat.frag %%DATADIR%%/shaders/ideas-logo-flat.vert %%DATADIR%%/shaders/ideas-logo-shadow.frag %%DATADIR%%/shaders/ideas-logo-shadow.vert %%DATADIR%%/shaders/ideas-logo.frag %%DATADIR%%/shaders/ideas-logo.vert %%DATADIR%%/shaders/ideas-paper.frag %%DATADIR%%/shaders/ideas-paper.vert %%DATADIR%%/shaders/ideas-table.frag %%DATADIR%%/shaders/ideas-table.vert %%DATADIR%%/shaders/ideas-text.frag %%DATADIR%%/shaders/ideas-text.vert %%DATADIR%%/shaders/ideas-under-table.frag %%DATADIR%%/shaders/ideas-under-table.vert %%DATADIR%%/shaders/jellyfish.frag %%DATADIR%%/shaders/jellyfish.vert %%DATADIR%%/shaders/light-advanced.frag %%DATADIR%%/shaders/light-advanced.vert %%DATADIR%%/shaders/light-basic-tex-bilinear.frag %%DATADIR%%/shaders/light-basic-tex.frag %%DATADIR%%/shaders/light-basic-texgen.vert %%DATADIR%%/shaders/light-basic.frag %%DATADIR%%/shaders/light-basic.vert %%DATADIR%%/shaders/light-cel.frag %%DATADIR%%/shaders/light-phong.frag %%DATADIR%%/shaders/light-phong.vert %%DATADIR%%/shaders/light-refract.frag %%DATADIR%%/shaders/light-refract.vert %%DATADIR%%/shaders/loop-step-loop.all %%DATADIR%%/shaders/loop-step-simple.all %%DATADIR%%/shaders/loop.frag %%DATADIR%%/shaders/loop.vert %%DATADIR%%/shaders/pulsar-light.vert %%DATADIR%%/shaders/pulsar.vert %%DATADIR%%/shaders/shadow.frag %%DATADIR%%/shaders/shadow.vert %%DATADIR%%/shaders/terrain-blur.frag %%DATADIR%%/shaders/terrain-luminance.frag %%DATADIR%%/shaders/terrain-noise.frag %%DATADIR%%/shaders/terrain-normalmap.frag %%DATADIR%%/shaders/terrain-overlay.frag %%DATADIR%%/shaders/terrain-texture.vert %%DATADIR%%/shaders/terrain.frag %%DATADIR%%/shaders/terrain.vert %%DATADIR%%/shaders/text-renderer.frag %%DATADIR%%/shaders/text-renderer.vert %%DATADIR%%/textures/asteroid-height-map.png %%DATADIR%%/textures/asteroid-normal-map-tangent.png %%DATADIR%%/textures/asteroid-normal-map.png %%DATADIR%%/textures/crate-base.png %%DATADIR%%/textures/desktop-shadow-corner.png %%DATADIR%%/textures/desktop-shadow.png %%DATADIR%%/textures/desktop-window.png %%DATADIR%%/textures/effect-2d.png %%DATADIR%%/textures/glyph-atlas.png %%DATADIR%%/textures/jellyfish-caustics-01.png %%DATADIR%%/textures/jellyfish-caustics-02.png %%DATADIR%%/textures/jellyfish-caustics-03.png %%DATADIR%%/textures/jellyfish-caustics-04.png %%DATADIR%%/textures/jellyfish-caustics-05.png %%DATADIR%%/textures/jellyfish-caustics-06.png %%DATADIR%%/textures/jellyfish-caustics-07.png %%DATADIR%%/textures/jellyfish-caustics-08.png %%DATADIR%%/textures/jellyfish-caustics-09.png %%DATADIR%%/textures/jellyfish-caustics-10.png %%DATADIR%%/textures/jellyfish-caustics-11.png %%DATADIR%%/textures/jellyfish-caustics-12.png %%DATADIR%%/textures/jellyfish-caustics-13.png %%DATADIR%%/textures/jellyfish-caustics-14.png %%DATADIR%%/textures/jellyfish-caustics-15.png %%DATADIR%%/textures/jellyfish-caustics-16.png %%DATADIR%%/textures/jellyfish-caustics-17.png %%DATADIR%%/textures/jellyfish-caustics-18.png %%DATADIR%%/textures/jellyfish-caustics-19.png %%DATADIR%%/textures/jellyfish-caustics-20.png %%DATADIR%%/textures/jellyfish-caustics-21.png %%DATADIR%%/textures/jellyfish-caustics-22.png %%DATADIR%%/textures/jellyfish-caustics-23.png %%DATADIR%%/textures/jellyfish-caustics-24.png %%DATADIR%%/textures/jellyfish-caustics-25.png %%DATADIR%%/textures/jellyfish-caustics-26.png %%DATADIR%%/textures/jellyfish-caustics-27.png %%DATADIR%%/textures/jellyfish-caustics-28.png %%DATADIR%%/textures/jellyfish-caustics-29.png %%DATADIR%%/textures/jellyfish-caustics-30.png %%DATADIR%%/textures/jellyfish-caustics-31.png %%DATADIR%%/textures/jellyfish-caustics-32.png %%DATADIR%%/textures/jellyfish256.png %%DATADIR%%/textures/nasa1.png %%DATADIR%%/textures/nasa2.png %%DATADIR%%/textures/nasa3.png %%DATADIR%%/textures/terrain-backgrounddetailed6.jpg %%DATADIR%%/textures/terrain-grasslight-512-nm.jpg %%DATADIR%%/textures/terrain-grasslight-512.jpg