diff -Naur nx-X11-1.5.0-4/CHANGELOG nx-X11-1.5.0-4-GFP1/CHANGELOG
--- nx-X11-1.5.0-4/CHANGELOG	2005-04-22 02:12:30.000000000 +0200
+++ nx-X11-1.5.0-4-GFP1/CHANGELOG	2005-04-30 17:57:30.000000000 +0200
@@ -1,5 +1,14 @@
 ChangeLog:
 
+nx-X11-1.5.0-4-GFP1
+
+- Added the GLX extension in NX-Linux.def. This provides unaccelera-
+  ted support in nxagent, with GLX operations translated into core X
+  protocol primitives.
+
+- Fixed x-X11/programs/Xserver/GL/dri/Imakefile to look in ../../hw/
+  /xfree86/os-support/bus for includes.
+
 nx-X11-1.5.0-4
 
 - Avoid calling NXTransSelect() if the transport is gone, so that we
diff -Naur nx-X11-1.5.0-4/config/cf/NX-Linux.def nx-X11-1.5.0-4-GFP1/config/cf/NX-Linux.def
--- nx-X11-1.5.0-4/config/cf/NX-Linux.def	2005-03-04 13:13:08.000000000 +0100
+++ nx-X11-1.5.0-4-GFP1/config/cf/NX-Linux.def	2005-04-30 14:56:33.000000000 +0200
@@ -625,7 +625,7 @@
  *
 #define BuildGlxExt             NO
  */
-#define BuildGlxExt             NO
+#define BuildGlxExt             YES
 
 /*
  * If you want to build support for the old dlopen style external GLX
diff -Naur nx-X11-1.5.0-4/programs/Xserver/GL/dri/Imakefile nx-X11-1.5.0-4-GFP1/programs/Xserver/GL/dri/Imakefile
--- nx-X11-1.5.0-4/programs/Xserver/GL/dri/Imakefile	2003-02-11 22:34:04.000000000 +0100
+++ nx-X11-1.5.0-4-GFP1/programs/Xserver/GL/dri/Imakefile	2005-04-30 15:17:44.000000000 +0200
@@ -15,7 +15,8 @@
 		-I$(EXTINCSRC) \
 		-I$(XF86OSSRC) -I$(XF86COMSRC) \
 		-I../include -I../glx -I$(LIBSRC)/GL/include \
-		-I$(SERVERSRC)/mi -I$(FONTINCSRC)
+		-I$(SERVERSRC)/mi -I$(FONTINCSRC) \
+		-I../../hw/xfree86/os-support/bus
       DEFINES = $(GLX_DEFINES)
 
 LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/dri)

