diff options
| author | nia <nia@pkgsrc.org> | 2020-10-05 18:53:37 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-10-05 18:53:37 +0000 |
| commit | 71030b50de7fca9f00ce67194d76d48a06cd936c (patch) | |
| tree | 46bcb5c54985222bd3da96203b979517149d505b /games | |
| parent | f1208bccbf96672f833df1b0e5e6e215faa161f5 (diff) | |
| download | pkgsrc-71030b50de7fca9f00ce67194d76d48a06cd936c.tar.gz | |
xonotic: fix GLX UI when pkgsrc Mesa is not installed
basically: load libGL unversioned
bump PKGREVISION
Diffstat (limited to 'games')
| -rw-r--r-- | games/xonotic/Makefile | 4 | ||||
| -rw-r--r-- | games/xonotic/distinfo | 3 | ||||
| -rw-r--r-- | games/xonotic/patches/patch-source_darkplaces_vid__glx.c | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index 3e32777369d..6b67a22496c 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -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 diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo index b4f409a9bee..0fced3ac546 100644 --- a/games/xonotic/distinfo +++ b/games/xonotic/distinfo @@ -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) = 6c667df4048fd2cbec1c5c8cccb9d525390358ab 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 diff --git a/games/xonotic/patches/patch-source_darkplaces_vid__glx.c b/games/xonotic/patches/patch-source_darkplaces_vid__glx.c new file mode 100644 index 00000000000..feae78b2b81 --- /dev/null +++ b/games/xonotic/patches/patch-source_darkplaces_vid__glx.c @@ -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) |