configure.ac | 6 +++++- src/glint_driver.c | 13 ++++++++++++- src/glint_shadow.c | 1 - src/pm3_video.c | 1 - 4 files changed, 17 insertions(+), 4 deletions(-)
New commits: commit ab648787e729651e45e615cc05a1080ba46e9ce4 Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:27 2009 +1000 glint: bump for release 1.2.4 diff --git a/configure.ac b/configure.ac index 2a52607..2a3ca8c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-glint], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-glint) commit d67bba116851bb4682df9fcbac12b0cda10aa28b Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 glint: change to using ABI version check diff --git a/src/glint_driver.c b/src/glint_driver.c index 78caa87..ba51fee 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -42,7 +42,7 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "fbdevhw.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #include "xf86Resources.h" #endif commit a7c9dd7039005cc656108d00c95fc7eb75b74642 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:30 2009 +1000 glint: update for resources/RAC API removal diff --git a/src/glint_driver.c b/src/glint_driver.c index efb624f..78caa87 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -42,8 +42,10 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "fbdevhw.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "xf86int10.h" #include "dixstruct.h" #include "vbe.h" @@ -934,12 +936,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVga, pGlint->pEnt->index, ResDisableOpr); /* Operations for which memory access is required. */ pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; /* @@ -1266,6 +1269,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pGlint->irq = pGlint->pEnt->device->irq; +#ifndef XSERVER_LIBPCIACCESS /* Register all entities */ for (i = 0; i < pScrn->numEntities; i++) { EntityInfoPtr pEnt; @@ -1276,8 +1280,10 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } } +#endif } + #if !defined(__sparc__) /* Initialize the card through int10 interface if needed */ if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA && diff --git a/src/glint_shadow.c b/src/glint_shadow.c index a0a9819..6b36a1b 100644 --- a/src/glint_shadow.c +++ b/src/glint_shadow.c @@ -12,7 +12,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint.h" diff --git a/src/pm3_video.c b/src/pm3_video.c index 6f07ed3..f0d34a9 100644 --- a/src/pm3_video.c +++ b/src/pm3_video.c @@ -30,7 +30,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit f74a51285651c2eea31efb43734600b79caa0507 Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:39:13 2009 +1000 Update to xextproto 7.1 support. DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 98c74cc..2a52607 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff --git a/src/glint_driver.c b/src/glint_driver.c index 73cfd11..efb624f 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -65,8 +65,13 @@ #endif #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #define DEBUG 0 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
