From owner-svn-ports-head@freebsd.org Thu Jan 28 18:47:37 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 034A84E6E00; Thu, 28 Jan 2021 18:47:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRTx46jjZz4Vy6; Thu, 28 Jan 2021 18:47:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D9B2414FB2; Thu, 28 Jan 2021 18:47:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10SIlaAO064631; Thu, 28 Jan 2021 18:47:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10SIladp064628; Thu, 28 Jan 2021 18:47:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202101281847.10SIladp064628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 28 Jan 2021 18:47:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563151 - head/benchmarks/glmark2 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/benchmarks/glmark2 X-SVN-Commit-Revision: 563151 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2021 18:47:37 -0000 Author: jbeich Date: Thu Jan 28 18:47:35 2021 New Revision: 563151 URL: https://svnweb.freebsd.org/changeset/ports/563151 Log: benchmarks/glmark2: expose KMS console and Wayland support PR: 252197 Reviewed by: danfe (maintainer) Modified: head/benchmarks/glmark2/Makefile (contents, props changed) head/benchmarks/glmark2/distinfo (contents, props changed) head/benchmarks/glmark2/pkg-plist (contents, props changed) Modified: head/benchmarks/glmark2/Makefile ============================================================================== --- head/benchmarks/glmark2/Makefile Thu Jan 28 18:37:00 2021 (r563150) +++ head/benchmarks/glmark2/Makefile Thu Jan 28 18:47:35 2021 (r563151) @@ -3,8 +3,13 @@ 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 @@ -13,16 +18,35 @@ 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 Modified: head/benchmarks/glmark2/distinfo ============================================================================== --- head/benchmarks/glmark2/distinfo Thu Jan 28 18:37:00 2021 (r563150) +++ head/benchmarks/glmark2/distinfo Thu Jan 28 18:47:35 2021 (r563151) @@ -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 Modified: head/benchmarks/glmark2/pkg-plist ============================================================================== --- head/benchmarks/glmark2/pkg-plist Thu Jan 28 18:37:00 2021 (r563150) +++ head/benchmarks/glmark2/pkg-plist Thu Jan 28 18:47:35 2021 (r563151) @@ -1,7 +1,15 @@ -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