Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Mon Nov 15 15:58:39 CET 2010. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-09 17:37:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-11-12 19:21:11.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 12 17:39:14 UTC 2010 - sndirsch@novell.com + +- readded and reenabled build of -xgi/-xgixp drivers +- xf86-video-xgi-buildfix.diff + * buildfix for -xgi driver + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-xgi-1.6.0.tar.bz2 xf86-video-xgi-buildfix.diff xf86-video-xgixp-1.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.oAsSeF/_old 2010-11-15 15:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.oAsSeF/_new 2010-11-15 15:57:38.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 30 +Release: 31 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -72,6 +72,8 @@ Source54: xf86-video-mach64-6.8.2.tar.bz2 Source55: xf86-video-r128-6.8.1.tar.bz2 Source56: intel-gpu-tools-1.0.2-20100825-c935c60.tar.bz2 +Source57: xf86-video-xgi-1.6.0.tar.bz2 +Source58: xf86-video-xgixp-1.8.0.tar.bz2 Source99: baselibs.conf Source100: sax2-hwinfo-data.tar.gz %if %broken_kms_blacklist @@ -98,6 +100,7 @@ Patch140: xf86-video-ati-6.7.197-r128-xvideo.patch Patch141: xf86-video-ati-theatre.patch Patch142: xf86-video-ati-theatre-pciaccess.patch +Patch143: xf86-video-xgi-buildfix.diff %description This package contains X.Org video drivers. @@ -164,6 +167,9 @@ %patch141 -p1 %patch142 -p1 popd +pushd xf86-video-xgi-* +%patch143 -p1 +popd %build for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do ++++++ xf86-video-xgi-buildfix.diff ++++++ 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: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org