--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-nv/7163065.patch	Fri May 04 14:47:54 2012 -0700
@@ -0,0 +1,28 @@
+--- configure.ac	Thu May  3 12:58:53 2012
++++ configure.ac	Thu May  3 13:00:23 2012
+@@ -61,6 +61,10 @@
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
++PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
++                 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
++                 [Has version 1.12.0 or greater of the Xserver])])
++
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES])
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+--- src/nv_driver.c	Mon Jul 19 15:53:18 2010
++++ src/nv_driver.c	Thu May  3 13:01:56 2012
+@@ -1543,7 +1543,11 @@
+ 	xf86FreeInt10(pNv->pInt);
+ 	return FALSE;
+     }
+-    
++
++#ifdef HAVE_XORG_SERVER_1_12_0
++    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
++#endif
++
+     /* We use a programmable clock */
+     pScrn->progClock = TRUE;
+ 

--- a/open-src/driver/xf86-video-nv/Makefile	Mon Apr 30 13:11:56 2012 -0700
+++ b/open-src/driver/xf86-video-nv/Makefile	Fri May 04 14:47:54 2012 -0700
@@ -36,12 +36,15 @@
 TARBALL_SHA1 = d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 
+SOURCE_PATCHES = 7163065.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
 MODULE_STABILITY=Volatile
 
+# Regenerate configure after patching configure.ac
+AUTORECONF=yes
+
 # Libraries/modules to link with
 MODULE_LD_OPTIONS= \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR) \