Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Tue Aug 28 19:26:21 CEST 2007. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-08-27 03:00:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-08-28 10:20:34.159450000 +0200 @@ -1,0 +2,16 @@ +Tue Aug 28 04:18:56 CEST 2007 - sndirsch@suse.de + +- added xgi driver (release 1.5.0) + "This is the initial release (despite the 1.5.0 version number) + of the driver for XGI V3XT / V3XE / V5 / V8 and Z7 / Z9 based + video cards. This driver is based on source code and + documentation released by XGI. Much of the original code was + written by Thomas Winischhofer. + +------------------------------------------------------------------- +Mon Aug 27 22:49:04 CEST 2007 - sndirsch@suse.de + +- xf86-video-unichrome-20070511.tar.bz2/xf86-video-unichrome.diff + * via driver from Unichrome Project (renamed to 'unichrome') + +------------------------------------------------------------------- New: ---- xf86-video-unichrome-20070511.tar.bz2 xf86-video-unichrome.diff xf86-video-xgi-1.5.0.tar.bz2 xf86-video-xgi.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.zX6544/_old 2007-08-28 19:26:07.000000000 +0200 +++ /var/tmp/diff_new_pack.zX6544/_new 2007-08-28 19:26:07.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 164 +Release: 166 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -72,6 +72,8 @@ Source45: xf86-video-intel-2.1.1.tar.bz2 Source46: xf86-video-ati-6.7.192.tar.bz2 Source48: xf86-video-mga.randr12-20070816.tar.bz2 +Source49: xf86-video-unichrome-20070511.tar.bz2 +Source50: xf86-video-xgi-1.5.0.tar.bz2 Patch: xf86-video-intel.diff Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff @@ -94,6 +96,8 @@ Patch37: xf86-video-ati-AGPFastWrite-risk-reduction.diff Patch38: xf86-video-intel-xvmc_i915_i945-1.diff Patch39: xf86-video-ati-bug296856.diff +Patch40: xf86-video-unichrome.diff +Patch41: xf86-video-xgi.diff %description This package contains X.Org video drivers. @@ -155,14 +159,23 @@ pushd xf86-video-nsc-* %patch16 popd +pushd xf86-video-unichrome +%patch40 +mv man/{via,unichrome}.man +popd +pushd xf86-video-xgi-* +%patch41 +popd %build for dir in xf86-video-nv-* \ *.randr12 xf86-video-ati-6.7.* \ + xf86-video-unichrome \ $(ls | grep -v -e xf86-video-impact \ -e xf86-video-nv \ -e randr12 \ -e xf86-video-ati-6.7 \ + -e xf86-video-unichrome \ ); do #test "$dir" == "xf86-video-ati.randr12" && continue pushd $dir @@ -171,6 +184,7 @@ xf86-video-intel-* | \ *.randr12 | \ xf86-video-ati-6.7.* | \ + xf86-video-unichrome | \ xf86-video-nsc-*) autoreconf -fi ;; *) ;; esac @@ -184,10 +198,12 @@ for dir in xf86-video-nv-* \ *.randr12 \ xf86-video-ati-6.7.* \ + xf86-video-unichrome \ $(ls | grep -v -e xf86-video-impact \ -e xf86-video-nv \ - -e randr12 - -e xf86-video-ati-6.7 + -e randr12 \ + -e xf86-video-ati-6.7 \ + -e xf86-video-unichrome \ ); do #test "$dir" == "xf86-video-ati.randr12" && continue make -C $dir install DESTDIR=$RPM_BUILD_ROOT @@ -220,6 +236,16 @@ %{_mandir}/man4/* %changelog +* Tue Aug 28 2007 - sndirsch@suse.de +- added xgi driver (release 1.5.0) + "This is the initial release (despite the 1.5.0 version number) + of the driver for XGI V3XT / V3XE / V5 / V8 and Z7 / Z9 based + video cards. This driver is based on source code and + documentation released by XGI. Much of the original code was + written by Thomas Winischhofer. +* Mon Aug 27 2007 - sndirsch@suse.de +- xf86-video-unichrome-20070511.tar.bz2/xf86-video-unichrome.diff + * via driver from Unichrome Project (renamed to 'unichrome') * Mon Aug 27 2007 - sndirsch@suse.de - radeonrandr12: * updated to latest RANDR 1.2 capable ATI driver 6.7.192 ++++++ xf86-video-unichrome.diff ++++++ --- ../xf86-video-unichrome.orig/configure.ac 2007-08-27 22:27:25.090028000 +0200 +++ ./configure.ac 2007-08-27 22:36:10.092493000 +0200 @@ -138,7 +138,7 @@ AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) -DRIVER_NAME=via +DRIVER_NAME=unichrome AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS --- ../xf86-video-unichrome.orig/src/Makefile.am 2007-08-27 22:27:25.272841000 +0200 +++ ./src/Makefile.am 2007-08-27 22:36:56.132403000 +0200 @@ -24,9 +24,9 @@ # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -via_drv_la_LTLIBRARIES = via_drv.la -via_drv_la_LDFLAGS = -module -avoid-version -via_drv_ladir = @moduledir@/drivers +unichrome_drv_la_LTLIBRARIES = unichrome_drv.la +unichrome_drv_la_LDFLAGS = -module -avoid-version +unichrome_drv_ladir = @moduledir@/drivers # rule to generate git_version.h $(top_srcdir)/git_version.h: @@ -36,7 +36,7 @@ # Add a dependency on git_version.h via_driver.c: $(top_srcdir)/git_version.h -via_drv_la_SOURCES = \ +unichrome_drv_la_SOURCES = \ via_accel.c \ via_ch7xxx.c \ via_ch7xxx.h \ @@ -69,14 +69,14 @@ via_vt162x.h if XV -via_drv_la_SOURCES += \ +unichrome_drv_la_SOURCES += \ via_video.c \ via_video.h \ via_videoregs.h endif if DRI -via_drv_la_SOURCES += \ +unichrome_drv_la_SOURCES += \ via_dri.c \ via_dri.h \ via_drmclient.h --- ../xf86-video-unichrome.orig/src/via_driver.h 2007-08-27 22:27:25.415694000 +0200 +++ ./src/via_driver.h 2007-08-27 22:31:58.026808000 +0200 @@ -66,7 +66,7 @@ #include "via_dri.h" #endif -#define DRIVER_NAME "via" +#define DRIVER_NAME "unichrome" #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define PATCHLEVEL 0 ++++++ xf86-video-xgi.diff ++++++ diff -u -r src.orig/xgi_dri.c src/xgi_dri.c --- src.orig/xgi_dri.c 2007-08-28 05:43:37.656984250 +0200 +++ src/xgi_dri.c 2007-08-28 05:49:38.055507750 +0200 @@ -280,7 +280,7 @@ 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 src.orig/xgi_driver.c src/xgi_driver.c --- src.orig/xgi_driver.c 2007-08-28 05:43:36.352902750 +0200 +++ src/xgi_driver.c 2007-08-28 05:58:32.340898500 +0200 @@ -2601,7 +2601,7 @@ (pXGI->PciInfo->ioBase[2] & 0xFFFC) #endif ); - pXGI->xgi_HwDevExt.pjIOAddress = (XGIIOADDRESS) (pXGI->RelIO + 0x30); + pXGI->xgi_HwDevExt.pjIOAddress = (PUCHAR) (pXGI->RelIO + 0x30); xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n", (unsigned long) pXGI->RelIO); diff -u -r src.orig/xgi_setup.c src/xgi_setup.c --- src.orig/xgi_setup.c 2007-08-28 05:43:35.844871000 +0200 +++ src/xgi_setup.c 2007-08-28 05:58:17.707984000 +0200 @@ -317,7 +317,7 @@ 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 = (PUCHAR) (pXGI->RelIO + 0x30) ; switch (pXGI->Chipset) { case PCI_CHIP_XGIXG40: --- src/xgi_accel.c.orig 2007-08-28 09:41:18.352222000 +0200 +++ src/xgi_accel.c 2007-08-28 09:45:34.852252250 +0200 @@ -82,26 +82,10 @@ extern int FbDevExist; -#if X_BYTE_ORDER == X_BIG_ENDIAN -static CARD32 BE_SWAP32 (CARD32 val) -{ - if (CurrentColorDepth == 8) - return ((((val) & 0x000000ff) << 24) | \ - (((val) & 0x0000ff00) << 8) | \ - (((val) & 0x00ff0000) >> 8) | \ - (((val) & 0xff000000) >> 24)); - if (CurrentColorDepth == 24) - return val; - if (CurrentColorDepth == 16) - return ((((val) & 0x0000ffff) << 16) | \ - (((val) & 0xffff0000) >> 16)); -} -#else static CARD32 BE_SWAP32 (CARD32 val) { return val; } -#endif #ifdef DEBUG ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org