CVS commit: pkgsrc/sysutils/szyszka

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Jun  9 19:44:13 UTC 2023

Modified Files:
        pkgsrc/sysutils/szyszka: Makefile
        pkgsrc/sysutils/szyszka/files: szyszka.sh

Log Message:
Limit libEGL workaround to non fixed libGL

Specifically where
  nm /usr/X11R7/lib/libGL.so | grep -Fq "B _glapi_tls_Dispatch"
is true


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/szyszka/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/szyszka/files/szyszka.sh

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

Modified files:

Index: pkgsrc/sysutils/szyszka/Makefile
diff -u pkgsrc/sysutils/szyszka/Makefile:1.1 pkgsrc/sysutils/szyszka/Makefile:1.2
--- pkgsrc/sysutils/szyszka/Makefile:1.1        Wed May 31 22:59:18 2023
+++ pkgsrc/sysutils/szyszka/Makefile    Fri Jun  9 19:44:13 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2023/05/31 22:59:18 abs Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/09 19:44:13 abs Exp $
 
 DISTNAME=      szyszka-3.0.0
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=qarmin/}
 

Index: pkgsrc/sysutils/szyszka/files/szyszka.sh
diff -u pkgsrc/sysutils/szyszka/files/szyszka.sh:1.1 pkgsrc/sysutils/szyszka/files/szyszka.sh:1.2
--- pkgsrc/sysutils/szyszka/files/szyszka.sh:1.1        Wed May 31 22:59:18 2023
+++ pkgsrc/sysutils/szyszka/files/szyszka.sh    Fri Jun  9 19:44:13 2023
@@ -1,5 +1,6 @@
 #!/bin/sh
-if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ]; then
+if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ] && \
+  nm /usr/X11R7/lib/libGL.so | grep -Fq "B _glapi_tls_Dispatch"; then
     # Temporary workaround for PR#57445
     # This may not avoid a crash 100% of the time, but changes at least some
     # cases of 100% crash on startup to "have not yet seen crash on startup"