Index: head/benchmarks/glmark2/Makefile =================================================================== --- head/benchmarks/glmark2/Makefile (revision 563150) +++ head/benchmarks/glmark2/Makefile (revision 563151) @@ -1,37 +1,61 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= glmark2 PORTVERSION= 2020.04 +PORTREVISION= 1 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@FreeBSD.org COMMENT= Benchmark for OpenGL (ES) 2.0 LICENSE= GPLv3 LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c++11-lang gl jpeg localbase:ldflags pkgconfig \ - waf xorg -USE_XORG= x11 + waf USE_GL= egl gl glesv2 USE_GITHUB= yes GH_TAGNAME= 06e4728 -CONFIGURE_ARGS= --with-flavors=x11-gl,x11-glesv2 --no-opt --no-debug +CONFIGURE_ARGS= --with-flavors=${PLATFORMS:ts,} --no-opt --no-debug PORTDOCS= NEWS OPTIONS_DEFINE= DOCS +OPTIONS_MULTI= PLATFORM +OPTIONS_MULTI_PLATFORM= DRM WAYLAND X11 +OPTIONS_DEFAULT=DRM 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_USE= GL=gbm +DRM_VARS= PLATFORMS+="drm-gl drm-glesv2" + +WAYLAND_BUILD_DEPENDS= 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_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} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/benchmarks/glmark2/distinfo =================================================================== --- head/benchmarks/glmark2/distinfo (revision 563150) +++ head/benchmarks/glmark2/distinfo (revision 563151) @@ -1,3 +1,7 @@ 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 Index: head/benchmarks/glmark2/pkg-plist =================================================================== --- head/benchmarks/glmark2/pkg-plist (revision 563150) +++ head/benchmarks/glmark2/pkg-plist (revision 563151) @@ -1,138 +1,146 @@ -bin/glmark2 -bin/glmark2-es2 -share/man/man1/glmark2.1.gz -share/man/man1/glmark2-es2.1.gz +%%DRM%%bin/glmark2-drm +%%DRM%%bin/glmark2-es2-drm +%%WAYLAND%%bin/glmark2-wayland +%%WAYLAND%%bin/glmark2-es2-wayland +%%X11%%bin/glmark2 +%%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 %%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