diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/ChangeLog xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/ChangeLog --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/ChangeLog 2010-06-09 19:36:54.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/ChangeLog 2010-07-06 01:31:32.000000000 +0100 @@ -1,3 +1,32 @@ +commit db3199953f1b467dc9f037061173b2a4eace40a8 +Author: Robert Hooker +Date: Tue Jul 6 09:15:57 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit 897fee2ee97ad0bb3a106642a506ad2e8b3b36c2 +Author: Gaetan Nadon +Date: Sun Jun 13 19:14:57 2010 -0400 + + README: keep the text version of README, discard the sgml version + + The linuxdoc doc tool is deprecated. + README files are exclusively text files. + + Signed-off-by: Gaetan Nadon + +commit 21262b12320b7996261c1bce35957d11e1580837 +Author: Gaetan Nadon +Date: Sun Jun 13 19:12:41 2010 -0400 + + README: fix linuxdoc content + + defs.ent are located under X11 directory + ident tag is not a Linuxdoc tag + replace docbook email tag with linuxdoc email tag + + Signed-off-by: Gaetan Nadon + commit 8d8b96164be4c0bc4f26acd9ea77b2d7038c4181 Author: Alan Coopersmith Date: Fri Jan 15 15:06:23 2010 -0800 diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/configure.ac xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/configure.ac --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/configure.ac 2010-06-09 19:36:20.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/configure.ac 2010-07-06 01:30:56.000000000 +0100 @@ -86,8 +86,6 @@ DRIVER_NAME=i740 AC_SUBST([DRIVER_NAME]) -XORG_CHECK_LINUXDOC - AC_OUTPUT([ Makefile src/Makefile diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/debian/changelog xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/debian/changelog --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/debian/changelog 2010-07-06 01:36:30.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/debian/changelog 2010-07-06 01:36:30.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-i740 (1:1.3.2+git20100609.8d8b9616-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-i740 (1:1.3.2+git20100706.897fee2e-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - 8d8b96164be4c0bc4f26acd9ea77b2d7038c4181 + * Checkout from git 20100706 (master branch) up to commit + 897fee2ee97ad0bb3a106642a506ad2e8b3b36c2 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 14:36:57 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:16:35 +0845 xserver-xorg-video-i740 (1:1.3.2-2) unstable; urgency=medium diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/.lastcommit xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/.lastcommit --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/.lastcommit 2010-06-09 19:36:20.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/.lastcommit 2010-07-06 01:30:56.000000000 +0100 @@ -1 +1 @@ -commit 8d8b96164be4c0bc4f26acd9ea77b2d7038c4181 +commit 897fee2ee97ad0bb3a106642a506ad2e8b3b36c2 diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/Makefile.am xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/Makefile.am --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/Makefile.am 2010-06-09 19:36:20.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/Makefile.am 2010-07-06 01:30:56.000000000 +0100 @@ -21,13 +21,6 @@ SUBDIRS = src man MAINTAINERCLEANFILES = ChangeLog INSTALL -if BUILD_LINUXDOC -README: - $(MAKE_TEXT) README.sgml && mv README.txt README -endif - -EXTRA_DIST = README.sgml - .PHONY: ChangeLog INSTALL INSTALL: diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/README xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/README --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/README 2010-06-09 19:36:18.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/README 2010-07-06 01:30:56.000000000 +0100 @@ -18,130 +18,130 @@ ______________________________________________________________________ - 1. Supported Hardware + 1. Supported Hardware - +o Intel 740 based cards. + o Intel 740 based cards. - 2. Features + 2. Features - +o Full support for 8, 15, 16, and 24 bit pixel depths. + o Full support for 8, 15, 16, and 24 bit pixel depths. - +o Hardware cursor support to reduce sprite flicker. + o Hardware cursor support to reduce sprite flicker. - +o Hardware accelerated 2D drawing engine support for 8, 15, 16 and 24 + o Hardware accelerated 2D drawing engine support for 8, 15, 16 and 24 bit pixel depths. - +o Support for high resolution video modes up to 1600x1200. + o Support for high resolution video modes up to 1600x1200. - +o Support for doublescan video modes (e.g., 320x200 and 320x240). + o Support for doublescan video modes (e.g., 320x200 and 320x240). - +o Support for gamma correction at all pixel depths. + o Support for gamma correction at all pixel depths. - +o Fully programmable clock supported. + o Fully programmable clock supported. - +o Robust text mode restore for VT switching. + o Robust text mode restore for VT switching. - 3. Technical Notes + 3. Technical Notes - +o Hardware acceleration is not possible when using the framebuffer in + o Hardware acceleration is not possible when using the framebuffer in 32 bit per pixel format. - +o Interlace modes cannot be supported. + o Interlace modes cannot be supported. - 4. Reported Working Video Cards + 4. Reported Working Video Cards - +o Real3D Starfighter AGP + o Real3D Starfighter AGP - +o Real3D Starfighter PCI + o Real3D Starfighter PCI - +o Diamond Stealth II/G460 AGP + o Diamond Stealth II/G460 AGP - +o 3DVision-i740 AGP + o 3DVision-i740 AGP - +o ABIT G740 8MB SDRAM + o ABIT G740 8MB SDRAM - +o Acorp AGP i740 + o Acorp AGP i740 - +o AGP 2D/3D V. 1N, AGP-740D + o AGP 2D/3D V. 1N, AGP-740D - +o AOpen AGP 2X 3D Navigator PA740 + o AOpen AGP 2X 3D Navigator PA740 - +o ARISTO i740 AGP (ART-i740-G) + o ARISTO i740 AGP (ART-i740-G) - +o ASUS AGP-V2740 + o ASUS AGP-V2740 - +o Atrend (Speedy) 3DIO740 AGP (ATC-2740) + o Atrend (Speedy) 3DIO740 AGP (ATC-2740) - +o Chaintech AGP-740D + o Chaintech AGP-740D - +o EliteGroup(ECS) 3DVision-i740 AGP + o EliteGroup(ECS) 3DVision-i740 AGP - +o EONtronics Picasso 740 + o EONtronics Picasso 740 - +o EONtronics Van Gogh + o EONtronics Van Gogh - +o Everex MVGA i740/AG + o Everex MVGA i740/AG - +o Flagpoint Shocker i740 8MB + o Flagpoint Shocker i740 8MB - +o Gainward CardExpert 740 8MB + o Gainward CardExpert 740 8MB - +o Genoa Systems Phantom 740 + o Genoa Systems Phantom 740 - +o Gigabyte Predator i740 8MB AGP + o Gigabyte Predator i740 8MB AGP - +o Hercules Terminator 128 2X/i AGP + o Hercules Terminator 128 2X/i AGP - +o HOT-158 (Shuttle) + o HOT-158 (Shuttle) - +o Intel Express 3D AGP + o Intel Express 3D AGP - +o Jaton Video-740 AGP 3D + o Jaton Video-740 AGP 3D - +o Jetway J-740-3D 8MB AGP, i740 AGP 3D + o Jetway J-740-3D 8MB AGP, i740 AGP 3D - +o Joymedia Apollo 7400 + o Joymedia Apollo 7400 - +o Leadtek Winfast S900 + o Leadtek Winfast S900 - +o Machspeed Raptor i740 AGP 4600 + o Machspeed Raptor i740 AGP 4600 - +o Magic-Pro MP-740DVD + o Magic-Pro MP-740DVD - +o MAXI Gamer AGP 8 MB + o MAXI Gamer AGP 8 MB - +o Palit Daytona AGP740 + o Palit Daytona AGP740 - +o PowerColor C740 (SG/SD) AGP + o PowerColor C740 (SG/SD) AGP - +o QDI Amazing I + o QDI Amazing I - +o Soyo AGP (SY-740 AGP) + o Soyo AGP (SY-740 AGP) - +o Spacewalker Hot-158 + o Spacewalker Hot-158 - +o VideoExcel AGP 740 + o VideoExcel AGP 740 - +o ViewTop ZeusL 8MB + o ViewTop ZeusL 8MB - +o Winfast S900 i740 AGP 8MB + o Winfast S900 i740 AGP 8MB - 5. Configuration + 5. Configuration The driver auto-detects all device information necessary to initialize - the card. The only lines you need in the "Device" section of your + the card. The only lines you need in the "Device" section of your xorg.conf file are: Section "Device" @@ -150,59 +150,60 @@ EndSection + However, if you have problems with auto-detection, you can specify: - +o VideoRam - in kilobytes + o VideoRam - in kilobytes - +o DacSpeed - in MHz + o DacSpeed - in MHz - +o MemBase - physical address of the linear framebuffer + o MemBase - physical address of the linear framebuffer - +o IOBase - physical address of the memory mapped IO registers + o IOBase - physical address of the memory mapped IO registers - 6. Driver Options + 6. Driver Options - +o "NoAccel" - Turn off hardware acceleration + o "NoAccel" - Turn off hardware acceleration - +o "SWCursor" - Request a software cursor (hardware is default) + o "SWCursor" - Request a software cursor (hardware is default) - +o "SDRAM" - Force the use of SDRAM timings + o "SDRAM" - Force the use of SDRAM timings - +o "SGRAM" - Force the use of SGRAM timings + o "SGRAM" - Force the use of SGRAM timings - +o "SlowRam" - Force the use of slower ram timings + o "SlowRam" - Force the use of slower ram timings - +o "Dac6Bit" - Force the use of a 6 Bit Dac (8 Bit is the default) + o "Dac6Bit" - Force the use of a 6 Bit Dac (8 Bit is the default) - +o "UsePIO - Force the use of programmed IO (Memory mapped is the + o "UsePIO - Force the use of programmed IO (Memory mapped is the default) Note: the i740 X server should automatically detect whether your card - has SGRAM or SDRAM. Use the "sgram" and "sdram" options if it is + has SGRAM or SDRAM. Use the "sgram" and "sdram" options if it is incorrectly detected. - 7. Known Limitations + 7. Known Limitations - +o Certain drawing operations are very slow when using 24 bit pixel + o Certain drawing operations are very slow when using 24 bit pixel depth mode. - 8. Author + 8. Author - +o Original version by Kevin E Martin + o Original version by Kevin E Martin + - +o Daryll Strauss + o Daryll Strauss - The Xorg version of this driver originally came from XFree86 4.4 - rc2. + The Xorg version of this driver originally came from XFree86 4.4 rc2. The XFree86 version of this driver was donated to The XFree86 Project by: diff -Nru xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/README.sgml xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/README.sgml --- xserver-xorg-video-i740-1.3.2+git20100609.8d8b9616/README.sgml 2010-06-09 19:36:18.000000000 +0100 +++ xserver-xorg-video-i740-1.3.2+git20100706.897fee2e/README.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ - %defs; -]> - -
-Information for i740 Users -<author>Precision Insight, Inc. -<date>18 February 1999 -<ident> -</ident> -<toc> - -<sect>Supported Hardware -<p> -<itemize> - <item>Intel 740 based cards. -</itemize> - - -<sect>Features -<p> -<itemize> - <item>Full support for 8, 15, 16, and 24 bit pixel depths. - <item>Hardware cursor support to reduce sprite flicker. - <item>Hardware accelerated 2D drawing engine support for 8, 15, 16 and - 24 bit pixel depths. - <item>Support for high resolution video modes up to 1600x1200. - <item>Support for doublescan video modes (e.g., 320x200 and 320x240). - <item>Support for gamma correction at all pixel depths. - <item>Fully programmable clock supported. - <item>Robust text mode restore for VT switching. -</itemize> - - -<sect>Technical Notes -<p> -<itemize> - <item>Hardware acceleration is not possible when using the framebuffer - in 32 bit per pixel format. - <item>Interlace modes cannot be supported. -</itemize> - - -<sect>Reported Working Video Cards -<p> -<itemize> - <item>Real3D Starfighter AGP - <item>Real3D Starfighter PCI - <item>Diamond Stealth II/G460 AGP - <item>3DVision-i740 AGP - <item>ABIT G740 8MB SDRAM - <item>Acorp AGP i740 - <item>AGP 2D/3D V. 1N, AGP-740D - <item>AOpen AGP 2X 3D Navigator PA740 - <item>ARISTO i740 AGP (ART-i740-G) - <item>ASUS AGP-V2740 - <item>Atrend (Speedy) 3DIO740 AGP (ATC-2740) - <item>Chaintech AGP-740D - <item>EliteGroup(ECS) 3DVision-i740 AGP - <item>EONtronics Picasso 740 - <item>EONtronics Van Gogh - <item>Everex MVGA i740/AG - <item>Flagpoint Shocker i740 8MB - <item>Gainward CardExpert 740 8MB - <item>Genoa Systems Phantom 740 - <item>Gigabyte Predator i740 8MB AGP - <item>Hercules Terminator 128 2X/i AGP - <item>HOT-158 (Shuttle) - <item>Intel Express 3D AGP - <item>Jaton Video-740 AGP 3D - <item>Jetway J-740-3D 8MB AGP, i740 AGP 3D - <item>Joymedia Apollo 7400 - <item>Leadtek Winfast S900 - <item>Machspeed Raptor i740 AGP 4600 - <item>Magic-Pro MP-740DVD - <item>MAXI Gamer AGP 8 MB - <item>Palit Daytona AGP740 - <item>PowerColor C740 (SG/SD) AGP - <item>QDI Amazing I - <item>Soyo AGP (SY-740 AGP) - <item>Spacewalker Hot-158 - <item>VideoExcel AGP 740 - <item>ViewTop ZeusL 8MB - <item>Winfast S900 i740 AGP 8MB -</itemize> - - -<sect>Configuration -<p> -The driver auto-detects all device information necessary to -initialize the card. The only lines you need in the "Device" -section of your xorg.conf file are: -<verb> - Section "Device" - Identifier "Intel i740" - Driver "i740" - EndSection -</verb> - -However, if you have problems with auto-detection, you can specify: -<itemize> - <item>VideoRam - in kilobytes - <item>DacSpeed - in MHz - <item>MemBase - physical address of the linear framebuffer - <item>IOBase - physical address of the memory mapped IO registers -</itemize> - - -<sect>Driver Options -<p> -<itemize> - <item>"NoAccel" - Turn off hardware acceleration - <item>"SWCursor" - Request a software cursor (hardware is default) - <item>"SDRAM" - Force the use of SDRAM timings - <item>"SGRAM" - Force the use of SGRAM timings - <item>"SlowRam" - Force the use of slower ram timings - <item>"Dac6Bit" - Force the use of a 6 Bit Dac (8 Bit is the default) - <item>"UsePIO - Force the use of programmed IO (Memory mapped is the default) -</itemize> - -Note: the i740 X server should automatically detect whether your -card has SGRAM or SDRAM. Use the "sgram" and "sdram" options -if it is incorrectly detected. - - -<sect>Known Limitations -<p> -<itemize> - <item>Certain drawing operations are very slow when using 24 bit - pixel depth mode. -</itemize> - - -<sect>Author -<p> -<itemize> - <item>Original version by Kevin E Martin - <email>kevin@precisioninsight.com</email> - <item>Daryll Strauss <email>daryll@precisioninsight.com</email> -</itemize> - -The Xorg version of this driver originally came from XFree86 4.4 rc2. - -The XFree86 version of this driver was donated to The XFree86 Project by: -<verb> - Precision Insight, Inc. - Cedar Park, TX - USA -</verb> - -<htmlurl name="http://www.precisioninsight.com" - url="http://www.precisioninsight.com"> - - -</article>