CVS commit: pkgsrc/games/xonotic

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct  5 18:53:37 UTC 2020

Modified Files:
        pkgsrc/games/xonotic: Makefile distinfo
Added Files:
        pkgsrc/games/xonotic/patches: patch-source_darkplaces_vid__glx.c

Log Message:
xonotic: fix GLX UI when pkgsrc Mesa is not installed

basically: load libGL unversioned

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/xonotic/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/xonotic/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/xonotic/patches/patch-source_darkplaces_vid__glx.c

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

Modified files:

Index: pkgsrc/games/xonotic/Makefile
diff -u pkgsrc/games/xonotic/Makefile:1.6 pkgsrc/games/xonotic/Makefile:1.7
--- pkgsrc/games/xonotic/Makefile:1.6   Tue Aug 18 17:57:59 2020
+++ pkgsrc/games/xonotic/Makefile       Mon Oct  5 18:53:37 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2020/08/18 17:57:59 leot Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/05 18:53:37 nia Exp $
 
 DISTNAME=      xonotic-0.8.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games
 MASTER_SITES=  https://dl.xonotic.org/
 EXTRACT_SUFX=  .zip

Index: pkgsrc/games/xonotic/distinfo
diff -u pkgsrc/games/xonotic/distinfo:1.1 pkgsrc/games/xonotic/distinfo:1.2
--- pkgsrc/games/xonotic/distinfo:1.1   Tue Oct  1 12:32:26 2019
+++ pkgsrc/games/xonotic/distinfo       Mon Oct  5 18:53:37 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/10/01 12:32:26 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/10/05 18:53:37 nia Exp $
 
 SHA1 (xonotic-0.8.2.zip) = 9a1726e3d0d4e5e23c1e799734397c63e5df6ec9
 RMD160 (xonotic-0.8.2.zip) = d57c9e0fd6f1a4325410d87af4b0109351e6ae30
@@ -8,5 +8,6 @@ SHA1 (patch-Makefile) = 6c667df4048fd2cb
 SHA1 (patch-source_darkplaces_hmac.c) = 58f6da84843f82fabd35e6a166e897fa1679a48a
 SHA1 (patch-source_darkplaces_hmac.h) = aa3dd533c2a6ccc0bb8836c5f6284c01db0fb0d4
 SHA1 (patch-source_darkplaces_makefile.inc) = c440ebb63b5c6561e8643f2ff725eb6d49a8ced0
+SHA1 (patch-source_darkplaces_vid__glx.c) = 35f44684e2eb7afd37727f4dc52788d71b5e6805
 SHA1 (patch-source_gmqcc_Makefile) = a70657f928f43087fc4de97f206200fd78dd8a4b
 SHA1 (patch-source_gmqcc_gmqcc.h) = 8cf08c5d6b218c042b96fad904b1a35c37cb260d

Added files:

Index: pkgsrc/games/xonotic/patches/patch-source_darkplaces_vid__glx.c
diff -u /dev/null pkgsrc/games/xonotic/patches/patch-source_darkplaces_vid__glx.c:1.1
--- /dev/null   Mon Oct  5 18:53:37 2020
+++ pkgsrc/games/xonotic/patches/patch-source_darkplaces_vid__glx.c     Mon Oct  5 18:53:37 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-source_darkplaces_vid__glx.c,v 1.1 2020/10/05 18:53:37 nia Exp $
+
+Load an unversioned libGL so this works with NetBSD native X.
+
+--- source/darkplaces/vid_glx.c.orig   2017-04-01 12:26:58.000000000 +0000
++++ source/darkplaces/vid_glx.c
+@@ -1353,10 +1353,10 @@ static qboolean VID_InitModeGL(viddef_mo
+ #if defined(__APPLE__) && defined(__MACH__)
+       drivername = "/usr/X11R6/lib/libGL.1.dylib";
+ #else
+-      drivername = "libGL.so.1";
++      drivername = "libGL.so";
+ #endif
+-// COMMANDLINEOPTION: Linux GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't 
need it
+-// COMMANDLINEOPTION: BSD GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't 
need it
++// COMMANDLINEOPTION: Linux GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so, useful only for using fxmesa or similar, if you don't know what this is for, you don't 
need it
++// COMMANDLINEOPTION: BSD GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so, useful only for using fxmesa or similar, if you don't know what this is for, you don't need 
it
+ // LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL)
+       i = COM_CheckParm("-gl_driver");
+       if (i && i < com_argc - 1)