CVS commit: pkgsrc/benchmarks/glmark2

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Jul 26 13:37:35 UTC 2023

Modified Files:
        pkgsrc/benchmarks/glmark2: Makefile distinfo
        pkgsrc/benchmarks/glmark2/patches: patch-src_meson.build
Added Files:
        pkgsrc/benchmarks/glmark2/patches: patch-src_gl-state-egl.cpp
            patch-src_gl-state-glx.cpp

Log Message:
Work around upstream commit which seems to break usage on at least
NetBSD DRM devices (still worked fine with software rendering)

https://github.com/glmark2/glmark2/commit/ea488e972bbac35084b02d5b24392c26a8f232f2

Instead now if we cannot find a "good" config, we use the best
found with a warning

Also apply https://github.com/glmark2/glmark2/pull/203

Bump pkgrevision

OK'd by MAINTAINER


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/benchmarks/glmark2/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/benchmarks/glmark2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-egl.cpp \
    pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-glx.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build

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.20 pkgsrc/benchmarks/glmark2/Makefile:1.21
--- pkgsrc/benchmarks/glmark2/Makefile:1.20     Tue Jul 25 09:07:34 2023
+++ pkgsrc/benchmarks/glmark2/Makefile  Wed Jul 26 13:37:35 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2023/07/25 09:07:34 abs Exp $
+# $NetBSD: Makefile,v 1.21 2023/07/26 13:37:35 abs Exp $
 
 DISTNAME=      glmark2-2023.01
 CATEGORIES=    benchmarks
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=glmark2/}
+PKGREVISION=   1
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://github.com/glmark2/glmark2

Index: pkgsrc/benchmarks/glmark2/distinfo
diff -u pkgsrc/benchmarks/glmark2/distinfo:1.11 pkgsrc/benchmarks/glmark2/distinfo:1.12
--- pkgsrc/benchmarks/glmark2/distinfo:1.11     Tue Jul 25 09:07:34 2023
+++ pkgsrc/benchmarks/glmark2/distinfo  Wed Jul 26 13:37:35 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2023/07/25 09:07:34 abs Exp $
+$NetBSD: distinfo,v 1.12 2023/07/26 13:37:35 abs Exp $
 
 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
+SHA1 (patch-src_gl-state-egl.cpp) = c4522d35b40bbfe57c17246be8e15853edb72874
+SHA1 (patch-src_gl-state-glx.cpp) = 3bcb7cb79a5316178425d573b635264deb791e69
+SHA1 (patch-src_meson.build) = c538f29b55fc1c040d723ae010d53e17664973a4

Index: pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build
diff -u pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build:1.1 pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build:1.2
--- pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build:1.1 Tue Jul 25 09:07:34 2023
+++ pkgsrc/benchmarks/glmark2/patches/patch-src_meson.build     Wed Jul 26 13:37:35 2023
@@ -1,9 +1,11 @@
-$NetBSD: patch-src_meson.build,v 1.1 2023/07/25 09:07:34 abs Exp $
+$NetBSD: patch-src_meson.build,v 1.2 2023/07/26 13:37:35 abs Exp $
 
 meson.build: fix build and avoid sigsegv
 
 https://github.com/glmark2/glmark2/commit/7d4c4da5d34e2e70a285c345c979e5e3c1eb2c3a
 
+Also add x11_dep when -DGLMARK2_USE_GLX
+
 --- src/meson.build.orig       2023-01-19 11:02:15.000000000 +0000
 +++ src/meson.build
 @@ -71,6 +71,7 @@ libmatrix_headers_dep = declare_dependen
@@ -14,3 +16,11 @@ https://github.com/glmark2/glmark2/commi
      libjpeg_dep,
      libpng_dep,
      libmatrix_headers_dep,
+@@ -244,6 +245,7 @@ if need_glx
+             include_directories('libmatrix'),
+             ],
+         compile_args: ['-DGLMARK2_USE_GLX'],
++        dependencies: x11_dep,
+         )
+ else
+     wsi_glx_dep = declare_dependency()

Added files:

Index: pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-egl.cpp
diff -u /dev/null pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-egl.cpp:1.1
--- /dev/null   Wed Jul 26 13:37:35 2023
+++ pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-egl.cpp        Wed Jul 26 13:37:35 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_gl-state-egl.cpp,v 1.1 2023/07/26 13:37:35 abs Exp $
+
+Make failure to find a good EGL FB config non fatal
+
+--- src/gl-state-egl.cpp.orig  2023-01-19 11:02:15.000000000 +0000
++++ src/gl-state-egl.cpp
+@@ -635,7 +635,10 @@ GLStateEGL::select_best_config(std::vect
+         }
+     }
+ 
+-    return best_score > 0 ? best_config : 0;
++    if (best_score <= 0) {
++        Log::error("Unable to find good EGL FB config (best match %d)\n", best_config);
++    }
++    return best_config;
+ }
+ 
+ bool
Index: pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-glx.cpp
diff -u /dev/null pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-glx.cpp:1.1
--- /dev/null   Wed Jul 26 13:37:35 2023
+++ pkgsrc/benchmarks/glmark2/patches/patch-src_gl-state-glx.cpp        Wed Jul 26 13:37:35 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_gl-state-glx.cpp,v 1.1 2023/07/26 13:37:35 abs Exp $
+
+Make failure to find a good GLX FB config non fatal
+
+--- src/gl-state-glx.cpp.orig  2023-01-19 11:02:15.000000000 +0000
++++ src/gl-state-glx.cpp
+@@ -342,7 +342,10 @@ GLStateGLX::select_best_config(std::vect
+         }
+     }
+ 
+-    return best_score > 0 ? best_config : 0;
++    if (best_score <= 0) {
++        Log::error("Unable to find good GLX FB config (best match %d)\n", best_config);
++    }
++    return best_config;
+ }
+ 
+ GLADapiproc