svn commit: r437874 - in head/games/quake2lnx: . files

[Alexey Dokuchaev]

Author: danfe
Date: Thu Apr  6 19:40:24 2017
New Revision: 437874
URL: https://svnweb.freebsd.org/changeset/ports/437874

Log:
  Attempt to unbreak the build against newer versions of libXxf86dga:
  
    In file included from src/linux/gl_glx.c:57:
    /usr/local/include/X11/extensions/xf86dga.h:9:2: warning: "xf86dga.h
    is obsolete and may be removed in the future." [-W#$warnings]
    /usr/local/include/X11/extensions/xf86dga.h:10:2: warning: "include
    <X11/extensions/Xxf86dga.h> instead." [-W#warnings]
  
  While here, add missing USE_XORG components per `stage-qa' note; this
  also unbreaks the build when X11 option is not being selected (the bug
  previously went unnoticed because it is selected by default).
  
  Reported by:	Victor Sudakov

Modified:
  head/games/quake2lnx/Makefile
  head/games/quake2lnx/files/patch-src_linux_gl__glx.c
  head/games/quake2lnx/files/patch-src_linux_rw__x11.c

Modified: head/games/quake2lnx/Makefile
==============================================================================
--- head/games/quake2lnx/Makefile	Thu Apr  6 18:36:58 2017	(r437873)
+++ head/games/quake2lnx/Makefile	Thu Apr  6 19:40:24 2017	(r437874)
@@ -52,7 +52,7 @@ REDBLUE_DESC=		Enable 3D glasses renderi
 #                       ###
 
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xxf86dga
+USE_XORG=	x11 xext xxf86dga xxf86vm
 MAKE_ARGS+=	BUILD_X11=YES
 REF_TARGETS+=	softx
 PLIST_SUB+=	X11=""
@@ -62,6 +62,7 @@ PLIST_SUB+=	X11="@comment "
 
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MEYECANDY}
 USE_GL=		gl
+USE_XORG=	x11 xext xxf86dga xxf86vm
 MAKE_ARGS+=	BUILD_GLX=YES
 REF_TARGETS+=	glx
 PLIST_SUB+=	GLX=""

Modified: head/games/quake2lnx/files/patch-src_linux_gl__glx.c
==============================================================================
--- head/games/quake2lnx/files/patch-src_linux_gl__glx.c	Thu Apr  6 18:36:58 2017	(r437873)
+++ head/games/quake2lnx/files/patch-src_linux_gl__glx.c	Thu Apr  6 19:40:24 2017	(r437874)
@@ -1,5 +1,14 @@
 --- src/linux/gl_glx.c.orig	Thu Jan 27 19:35:20 2005
 +++ src/linux/gl_glx.c	Wed Jul 26 22:32:32 2006
+@@ -54,7 +54,7 @@
+ #include <X11/keysym.h>
+ #include <X11/cursorfont.h>
+ 
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+ #include <X11/extensions/xf86vmode.h>
+ #ifdef Joystick
+ # if defined (__linux__)
 @@ -428,7 +428,6 @@
    while (XPending(dpy)) {
      //ri.Con_Printf(PRINT_ALL,"Bar");

Modified: head/games/quake2lnx/files/patch-src_linux_rw__x11.c
==============================================================================
--- head/games/quake2lnx/files/patch-src_linux_rw__x11.c	Thu Apr  6 18:36:58 2017	(r437873)
+++ head/games/quake2lnx/files/patch-src_linux_rw__x11.c	Thu Apr  6 19:40:24 2017	(r437874)
@@ -1,5 +1,14 @@
 --- src/linux/rw_x11.c.orig	Wed Oct  9 03:54:25 2002
 +++ src/linux/rw_x11.c	Mon Jun 16 23:19:40 2003
+@@ -53,7 +53,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/keysym.h>
+ #include <X11/extensions/XShm.h>
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+ #ifdef OPENGL
+ #include <X11/extensions/xf86vmode.h>
+ #endif
 @@ -151,7 +151,7 @@
  int config_notify_height;