Add experimental AGP support using dfr's experimental agp driver (currently

5-current only).

2 files changed, 47 insertions, 0 deletions

diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index f6947fa2f47f..b884c144532a 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -25,6 +25,9 @@ GNU_CONFIGURE=	yes
 GLVER?=		14
 GLUTVER?=	3
 
+AGP_DEVICE=	/dev/agpgart
+
+CFLAGS+=	-DAGP_DEVICE=\\\"${AGP_DEVICE}\\\"
 CONFIGURE_SCRIPT=autogen.sh
 CONFIGURE_ARGS=	--enable-extra \
 		--with-mesa=${WRKDIRPREFIX}${.CURDIR}/../../graphics/Mesa3/work/Mesa-3.2 \
@@ -49,6 +52,10 @@ post-extract:
 	@${ECHO_MSG} "         Users of XFree86 4.0 and above should use DRI instead."
 	@${ECHO_MSG}
 
+pre-build:
+	@find ${WRKSRC} -type f | xargs grep -l linux/agpgart | \
+		xargs perl -pi -e "s|linux/agpgart|sys/agpio|"
+
 pre-install:
 .if exists(${PREFIX}/lib/libGL.so.${GLVER}) && !defined(GL_CHECK_OVERRIDE)
 	@${ECHO_MSG}
@@ -61,6 +68,13 @@ pre-install:
 .endif
 
 post-install:
+.if exists(/usr/include/sys/agpio.h)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "The module has been built with experimental AGP support. To use it you should"
+	@${ECHO_MSG} "create device node for agp driver (mknod ${AGP_DEVICE} c 148 0) and enable"
+	@${ECHO_MSG} "AGP support in ${PREFIX}/etc/glx.conf file."
+	@${ECHO_MSG}
+.endif
 	${MKDIR} ${PREFIX}/share/doc/utah-glx
 	${INSTALL_MAN} ${WRKSRC}/docs/README.* ${PREFIX}/share/doc/utah-glx
 
diff --git a/graphics/utah-glx/files/patch-af b/graphics/utah-glx/files/patch-af
new file mode 100644
index 000000000000..39dde9437d15
--- /dev/null
+++ b/graphics/utah-glx/files/patch-af
@@ -0,0 +1,33 @@
+--- configure.in.orig	Fri Jun 23 12:23:13 2000
++++ configure.in	Fri Jun 23 12:30:06 2000
+@@ -879,7 +879,7 @@
+ ])
+ 
+ dnl agp driver support
+-AC_CHECK_HEADER(linux/agpgart.h,
++AC_CHECK_HEADER(sys/agpio.h,
+ [
+   if test "$enable_agp" = "no"
+    then
+@@ -887,9 +887,9 @@
+    else
+     dnl see which version of the gart module we've found
+     AC_MSG_CHECKING(validity of agpgart.h)
+-    AC_EGREP_CPP([/dev/agpgart],[
+-#include <linux/agpgart.h>
+-AGP_DEVICE
++    AC_EGREP_CPP([],[
++#include <sys/agpio.h>
++AGPIOC_INFO
+     ],
+     [
+       AC_MSG_RESULT([new agpgart module])
+@@ -906,7 +906,7 @@
+   fi
+ ],
+ [
+-  dnl *didn't* find linux/agpgart.h on the system
++  dnl *didn't* find sys/agpio.h on the system
+   if test "$enable_agp" = "yes"
+    then
+     AC_MSG_RESULT([  enabling agpgart support anyway (manual override)])