components/x11/xf86-video-nv/patches/01.7163065.patch

   1 --- a/configure.ac      Thu May  3 12:58:53 2012
   2 +++ b/configure.ac      Thu May  3 13:00:23 2012
   3 @@ -61,6 +61,10 @@
   4  XORG_DRIVER_CHECK_EXT(XV, videoproto)
   5  XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
   6
   7 +PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
   8 +                 [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
   9 +                 [Has version 1.12.0 or greater of the Xserver])])
  10 +
  11  # Obtain compiler/linker options for the driver dependencies
  12  PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES])
  13  PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
  14 --- a/src/nv_driver.c   Mon Jul 19 15:53:18 2010
  15 +++ b/src/nv_driver.c   Thu May  3 13:01:56 2012
  16 @@ -1543,7 +1543,10 @@
  17         xf86FreeInt10(pNv->pInt);
  18         return FALSE;
  19      }
  20 +
  21 +#ifdef HAVE_XORG_SERVER_1_12_0
  22      vgaHWSetStdFuncs(VGAHWPTR(pScrn));
  23 +#endif
  24
  25      /* We use a programmable clock */
  26      pScrn->progClock = TRUE;