File xf86-video-xgi-buildfix.diff of Package xorg-x11-driver-video
Binary files xf86-video-xgi-1.6.0.orig//src/.libs/xgi_accel.o and xf86-video-xgi-1.6.0/src/.libs/xgi_accel.o differ
Binary files xf86-video-xgi-1.6.0.orig//src/.libs/xgi_drv.so and xf86-video-xgi-1.6.0/src/.libs/xgi_drv.so differ
diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_accel.c xf86-video-xgi-1.6.0/src/xgi_accel.c
--- xf86-video-xgi-1.6.0.orig//src/xgi_accel.c 2010-11-12 17:49:17.000000000 +0000
+++ xf86-video-xgi-1.6.0/src/xgi_accel.c 2010-11-12 18:08:02.000000000 +0000
@@ -958,6 +958,7 @@ Volari_AccelInit(ScreenPtr pScreen)
return TRUE;
}
#endif /* EXA */
+ return TRUE;
}
void
diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_dri.c xf86-video-xgi-1.6.0/src/xgi_dri.c
--- xf86-video-xgi-1.6.0.orig//src/xgi_dri.c 2010-11-12 17:49:17.000000000 +0000
+++ xf86-video-xgi-1.6.0/src/xgi_dri.c 2010-11-12 18:01:42.000000000 +0000
@@ -286,7 +286,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR;
pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR;
pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL;
- pDRIInfo->frameBufferPhysicalAddress = pXGI->FbAddress;
+ pDRIInfo->frameBufferPhysicalAddress = (pointer) pXGI->FbAddress;
pDRIInfo->frameBufferSize = pXGI->FbMapSize;
/* ?? */
diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_driver.c xf86-video-xgi-1.6.0/src/xgi_driver.c
--- xf86-video-xgi-1.6.0.orig//src/xgi_driver.c 2010-11-12 17:49:17.000000000 +0000
+++ xf86-video-xgi-1.6.0/src/xgi_driver.c 2010-11-12 18:03:01.000000000 +0000
@@ -3046,7 +3046,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
);
#endif
- pXGI->xgi_HwDevExt.pjIOAddress = (XGIIOADDRESS) (pXGI->RelIO + 0x30);
+ pXGI->xgi_HwDevExt.pjIOAddress = (pointer)((XGIIOADDRESS) (pXGI->RelIO + 0x30));
xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n",
(unsigned long) pXGI->RelIO);
ErrorF("xgi_driver.c-pXGI->xgi_HwDevExt.pjIOAddress=0x%x...\n", pXGI->xgi_HwDevExt.pjIOAddress);
diff -u -r -p xf86-video-xgi-1.6.0.orig//src/xgi_setup.c xf86-video-xgi-1.6.0/src/xgi_setup.c
--- xf86-video-xgi-1.6.0.orig//src/xgi_setup.c 2010-11-12 17:49:17.000000000 +0000
+++ xf86-video-xgi-1.6.0/src/xgi_setup.c 2010-11-12 18:04:05.000000000 +0000
@@ -587,7 +587,7 @@ XGI_InitHwDevInfo(ScrnInfoPtr pScrn)
PDEBUG(ErrorF("pXGI->FbBase = 0x%08lx\n",(ULONG)(pXGI->FbBase))) ;
PDEBUG(ErrorF("pHwDevInfo->pjVideoMemoryAddress = 0x%08lx\n",(ULONG)(pHwDevInfo->pjVideoMemoryAddress))) ;
pHwDevInfo->ulVideoMemorySize = pXGI->FbMapSize ;
- pHwDevInfo->pjIOAddress = pXGI->RelIO + 0x30 ;
+ pHwDevInfo->pjIOAddress = (pointer)(pXGI->RelIO + 0x30);
switch (pXGI->Chipset) {
case PCI_CHIP_XGIXG40: