CVS commit: pkgsrc/benchmarks/glmark2

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue Jul 25 09:07:34 UTC 2023

Modified Files:
        pkgsrc/benchmarks/glmark2: Makefile distinfo
Added Files:
        pkgsrc/benchmarks/glmark2/patches: patch-meson.build
            patch-src_meson.build
Removed Files:
        pkgsrc/benchmarks/glmark2/patches: patch-waflib_Tools_c__config.py

Log Message:
Updated benchmarks/glmark2 to 2023.01

Allows building with python 3.11

(14 day timeout from email to MAINTAINER)

glmark2 2023.01 (20230119)
==========================

* Add gbm-gl/glesv2 flavors for GBM offscreen rendering.
* Add x11-gl-egl flavor that uses EGL under X11.
* Implement SwapInterval 0 for the DRM backend.
* Support multisampled configs in --visual-config.
* Support explicitly specifying the config id in --visual-config.
* Add CPU time and shader compilation time to available results.
* Add --results to specify which kind of results to report.
* Add --results-file to export results to XML or CSV.
* Add --version command-line option.

glmark2 2021.12 (20211223)
==========================

* Fix crash with NVIDIA OpenGL driver.
* Fix issues when running with the Wayland backend under Sway.
* Gracefully handle missing GL features.
* Fix model loading on big-endian systems.
* Support EGL versions < 1.4.
* Fix crash with the DRM backend when we can't become DRM master.

glmark2 2021.02 (20210215)
==========================

* Meson build system support for DRM/X11/Wayland builds.
* Fix precision handling in various fragment shaders.
* Fix spurious failures when using --validate.
* Always draw to the correct, offscreen buffer when using --off-screen.
* Don't prefer framebuffer formats with more than 8 bytes per component.
* Add basic mouse and keyboard support on Wayland.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/benchmarks/glmark2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/benchmarks/glmark2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/benchmarks/glmark2/patches/patch-meson.build \
    pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/benchmarks/glmark2/patches/patch-waflib_Tools_c__config.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/glmark2/Makefile
diff -u pkgsrc/benchmarks/glmark2/Makefile:1.19 pkgsrc/benchmarks/glmark2/Makefile:1.20
--- pkgsrc/benchmarks/glmark2/Makefile:1.19     Thu Jun 30 11:18:04 2022
+++ pkgsrc/benchmarks/glmark2/Makefile  Tue Jul 25 09:07:34 2023
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/06/30 11:18:04 nia Exp $
+# $NetBSD: Makefile,v 1.20 2023/07/25 09:07:34 abs Exp $
 
-DISTNAME=      glmark2-2020.04
-PKGREVISION=   2
+DISTNAME=      glmark2-2023.01
 CATEGORIES=    benchmarks
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=glmark2/}
-GITHUB_TAG=    c493520253fbfe3676c8b34b6f91a7c9a838fc8e
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://github.com/glmark2/glmark2
@@ -16,7 +14,7 @@ USE_LANGUAGES=        c c++14
 USE_TOOLS+=    pkg-config
 
 .include "../../mk/dlopen.buildlink3.mk"
-.if empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS])
+.if ${BUILTIN_LIB_FOUND.dl:U:tl} != yes
 SUBST_CLASSES+=                rmdl
 SUBST_STAGE.rmdl=      pre-configure
 SUBST_MESSAGE.rmdl=    remove -ldl
@@ -30,17 +28,17 @@ LIBS+=              ${PTHREAD_LIBS}
 #./waf configure --with-flavors=<drm-gl,drm-glesv2,mir-gl,mir-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-glesv2> [--data-path=DATA_PATH --prefix=PREFIX]
 # drm-gl requires libdrm and "gbm"
 do-configure:
-       cd ${WRKSRC:Q} && \
+       cd ${WRKSRC} && \
                ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
                        --with-flavors=x11-gl \
                        --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
 
 do-build:
-       cd ${WRKSRC:Q} && \
+       cd ${WRKSRC} && \
                ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf build
 
 do-install:
-       cd ${WRKSRC:Q} && \
+       cd ${WRKSRC} && \
                ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf install \
                        --destdir=${DESTDIR}
 

Index: pkgsrc/benchmarks/glmark2/distinfo
diff -u pkgsrc/benchmarks/glmark2/distinfo:1.10 pkgsrc/benchmarks/glmark2/distinfo:1.11
--- pkgsrc/benchmarks/glmark2/distinfo:1.10     Tue Oct 26 10:02:52 2021
+++ pkgsrc/benchmarks/glmark2/distinfo  Tue Jul 25 09:07:34 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:02:52 nia Exp $
+$NetBSD: distinfo,v 1.11 2023/07/25 09:07:34 abs Exp $
 
-BLAKE2s (glmark2-2020.04-c493520253fbfe3676c8b34b6f91a7c9a838fc8e.tar.gz) = 9142e84454a5365b2dcc9cfd800fe85d983cfff49d5ceb1b13e8f07e86e7666e
-SHA512 (glmark2-2020.04-c493520253fbfe3676c8b34b6f91a7c9a838fc8e.tar.gz) = 
a477d9d43dd698d48b3e012d387ac7727a16bfbf746d7eed66562e6eca342fab49481934e7f401e3d82417f7fe0fe7519f630fcbf51190fdbbe313245b6bdb37
-Size (glmark2-2020.04-c493520253fbfe3676c8b34b6f91a7c9a838fc8e.tar.gz) = 9367248 bytes
-SHA1 (patch-waflib_Tools_c__config.py) = 8bb7716b211731cb8cfa8a73276e950fa363f710
+BLAKE2s (glmark2-2023.01.tar.gz) = 02fc1fd23d7ea66bb6dc8fc205a104e3d47f0a31458d17e9c0d2e0439a0060ae
+SHA512 (glmark2-2023.01.tar.gz) = 5aaad56bb341e9c09d8dc78ac8d07d9af39f2414a158fd6e7c2717db2427d1b353408a874a8f38065e241474c674e8220d001652a5dd5a6c893ffe778cff9006
+Size (glmark2-2023.01.tar.gz) = 9366116 bytes
+SHA1 (patch-meson.build) = bb495a1b6fadfe2788e490b6048f3f61e3f1d5ac
+SHA1 (patch-src_meson.build) = f6e6d459a87332a0e30250a7fc135516af02a0fe

Added files:

Index: pkgsrc/benchmarks/glmark2/patches/patch-meson.build
diff -u /dev/null pkgsrc/benchmarks/glmark2/patches/patch-meson.build:1.1
--- /dev/null   Tue Jul 25 09:07:34 2023
+++ pkgsrc/benchmarks/glmark2/patches/patch-meson.build Tue Jul 25 09:07:34 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-meson.build,v 1.1 2023/07/25 09:07:34 abs Exp $
+
+meson.build: fix build and avoid sigsegv
+
+https://github.com/glmark2/glmark2/commit/7d4c4da5d34e2e70a285c345c979e5e3c1eb2c3a
+
+--- meson.build.orig   2023-01-19 11:02:15.000000000 +0000
++++ meson.build
+@@ -23,7 +23,8 @@ if extras_path != ''
+ endif
+ 
+ m_dep = cpp.find_library('m', required : false)
+-dl_dep = cpp.find_library('dl')
++dl_dep = cpp.find_library('dl', required : false)
++thread_dep = dependency('threads')
+ libjpeg_dep = dependency('libjpeg')
+ libpng_dep = dependency('libpng')
+ 
Index: pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build
diff -u /dev/null pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build:1.1
--- /dev/null   Tue Jul 25 09:07:34 2023
+++ pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build     Tue Jul 25 09:07:34 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_meson.build,v 1.1 2023/07/25 09:07:34 abs Exp $
+
+meson.build: fix build and avoid sigsegv
+
+https://github.com/glmark2/glmark2/commit/7d4c4da5d34e2e70a285c345c979e5e3c1eb2c3a
+
+--- src/meson.build.orig       2023-01-19 11:02:15.000000000 +0000
++++ src/meson.build
+@@ -71,6 +71,7 @@ libmatrix_headers_dep = declare_dependen
+ common_deps = [
+     m_dep,
+     dl_dep,
++    thread_dep,
+     libjpeg_dep,
+     libpng_dep,
+     libmatrix_headers_dep,