From nobody Wed Mar 01 14:55:27 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRcjW461yz3txcm; Wed, 1 Mar 2023 14:55:27 +0000 (UTC) (envelope-from git@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 4PRcjW3TWVz3Mcv; Wed, 1 Mar 2023 14:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677682527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lrj24RLN694ua6dnsRjPqbpr9boTRHJMOtsz+i/NbSM=; b=iUDw0kN3uHvKDK3kCI+X7xOZyY4ia2sY6WngcB/VEM/a4mrkv7MPlcXhwyBjTWnxLJRM0K IxEtpo5gl1BLa88Ju1DTdm5aaz1Xjpcpu7w6EGwyVNaKmmacgBBtTiHJi5nnczkupU+uEh +zCwIgWa/JgG1Q1RB6iQwKBxxH0VqgQ9abFWZDT05Ju8KNAp2Gp4642fh8KRn8pXbkmLxa YYpR7sFu44S0PJMb1CzUclhU8WH2178mm9kZL0SkfZgvntZf1Tvo7h3hDdo3Q/H+q2BOdy SJBQfqQniuWUGgHjsjgvrto9wi8ZEcBWBQuTU1NJR1mzBnxLj38BZSyYp5u+jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677682527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lrj24RLN694ua6dnsRjPqbpr9boTRHJMOtsz+i/NbSM=; b=rf1da1oUw4omKLjy7dXlQA9hN2Kn5GJqi8e5OtRzs2cUK5TVg6vqgODx97mwtcqZPBr+RJ mUYAU1mL+JXqvB4zx0ltM3qRaLWVb2382sAedDpjrMVVoYb1kL1ZnKADk53enpPXfVD8mL 2EN/dxVyUg/INi71xJihzyIbOSl44g5UljkKz2k4dP36F0pho3uJY8hzcweM5rVXYKV1+y hMDuycvLS/pvj4N/FAa8DV05N4UkU9Cshqu3UtSp+k2M9NpDGetk8qr/Eq3mtVWaOCtBiz W5kBgR8vYOrLTIpfA7OPmayWVyUbrJAN+J4xgl1a42gLuc4ywlQNmdCg81frgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677682527; a=rsa-sha256; cv=none; b=QkcFQmXYcqX7llEReJLn6EFRbpFBHQaFyM18xW1vwI0Rs5ZIBY504sLqtNhb56OvZt8odV jt/knCVXcpPla/DkUQkHNBCyROlPMXYql7l3DoTKj1BAfJnuNg+raAz++G1UegSOarkKsF XSeXEszrAMmVAY7wyOjLZwMC6bbLfc+XaQxYL4fUPRaWO+tKLs0pAgoRMPGrJ4JH0Ii1RH rNLyiva84+YwFC8kPvy1EYs8t1VndG25IDgUQWJzs/suyv2a7EreT8Pwoi071CySt1NBh3 X6gIPAs+TlrigYObsmjGcxZc9vNUDy1HIxZqak+hboaJjN+ikYkuKa2YfN6gvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRcjW2VL4zdfg; Wed, 1 Mar 2023 14:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321EtRVL037363; Wed, 1 Mar 2023 14:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321EtRML037362; Wed, 1 Mar 2023 14:55:27 GMT (envelope-from git) Date: Wed, 1 Mar 2023 14:55:27 GMT Message-Id: <202303011455.321EtRML037362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 1bdccb1e1940 - main - benchmarks/glmark2: update the port to version 2023.01 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bdccb1e19402cbdecb2ad52013f76b9d3eefc3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bdccb1e19402cbdecb2ad52013f76b9d3eefc3b commit 1bdccb1e19402cbdecb2ad52013f76b9d3eefc3b Author: Alexey Dokuchaev AuthorDate: 2023-03-01 14:54:54 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-03-01 14:54:54 +0000 benchmarks/glmark2: update the port to version 2023.01 - Now uses the Meson build system for the most common build flavors (X11, Wayland, DRM) - Add new option for GBM offscreen rendering (not sure how useful it is though) - Move `gl' and `localbase' from global USES to those options which actually require them Reported by: portscout PR: 269776 (independent) --- benchmarks/glmark2/Makefile | 24 ++++++++++++----------- benchmarks/glmark2/distinfo | 6 +++--- benchmarks/glmark2/files/patch-python311 | 33 -------------------------------- benchmarks/glmark2/pkg-plist | 18 +++++++++++------ 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile index e3303910cab3..d747a631891f 100644 --- a/benchmarks/glmark2/Makefile +++ b/benchmarks/glmark2/Makefile @@ -1,5 +1,5 @@ PORTNAME= glmark2 -PORTVERSION= 2021.12 +PORTVERSION= 2023.01 CATEGORIES= benchmarks MAINTAINER= danfe@FreeBSD.org @@ -10,17 +10,16 @@ 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 @@ -28,21 +27,24 @@ 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} 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,15 +1,21 @@ %%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