diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/ChangeLog xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/ChangeLog --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/ChangeLog 2010-06-09 19:35:50.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/ChangeLog 2010-07-06 01:30:31.000000000 +0100 @@ -1,3 +1,41 @@ +commit cad0bddd25e5dfb91fc3df0c31910888bea46a14 +Author: Robert Hooker +Date: Tue Jul 6 09:14:58 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit ff026f65b3e8f54d6677b8dc16fd17db43b39edf +Author: Gaetan Nadon +Date: Sun Jun 13 18:51:15 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. + The file had not been updated for 5 years. + + Signed-off-by: Gaetan Nadon + +commit 399c47cb69731d1e3e8d59edd53b3e7cc2b77d95 +Author: Gaetan Nadon +Date: Sun Jun 13 18:40:05 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 f1d97375da248af05848f56323c1a8cad4d3a416 +Author: Gaetan Nadon +Date: Sat Jun 12 19:55:58 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit 3c58b1d2ad0203ac9b96db7ba8da6f7171aead49 Author: Alan Coopersmith Date: Fri Jan 15 14:55:02 2010 -0800 diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/configure.ac xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/configure.ac --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/configure.ac 2010-06-09 19:35:17.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/configure.ac 2010-07-06 01:29:58.000000000 +0100 @@ -90,8 +90,6 @@ DRIVER_NAME=i128 AC_SUBST([DRIVER_NAME]) -XORG_CHECK_LINUXDOC - AC_OUTPUT([ Makefile src/Makefile diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/COPYING xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/COPYING --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/COPYING 2010-06-09 19:35:15.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/COPYING 2010-07-06 01:29:58.000000000 +0100 @@ -1,12 +1,43 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1994-2000 by Robin Cutshaw +Copyright 2005 Adam Jackson +Copyright 1998 by Number Nine Visual Technology, Inc. -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Robin Cutshaw not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Robin Cutshaw makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ROBIN CUTSHAW BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Copyright 2007 George Sapountzis + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/debian/changelog xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/debian/changelog --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/debian/changelog 2010-07-06 01:36:29.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/debian/changelog 2010-07-06 01:36:29.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-i128 (1:1.3.3+git20100609.3c58b1d2-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-i128 (1:1.3.3+git20100706.ff026f65-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - 3c58b1d2ad0203ac9b96db7ba8da6f7171aead49 + * Checkout from git 20100706 (master branch) up to commit + ff026f65b3e8f54d6677b8dc16fd17db43b39edf * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 14:35:53 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:15:33 +0845 xserver-xorg-video-i128 (1:1.3.3-2) unstable; urgency=low diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/.lastcommit xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/.lastcommit --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/.lastcommit 2010-06-09 19:35:17.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/.lastcommit 2010-07-06 01:29:58.000000000 +0100 @@ -1 +1 @@ -commit 3c58b1d2ad0203ac9b96db7ba8da6f7171aead49 +commit ff026f65b3e8f54d6677b8dc16fd17db43b39edf diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/Makefile.am xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/Makefile.am --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/Makefile.am 2010-06-09 19:35:17.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/Makefile.am 2010-07-06 01:29:58.000000000 +0100 @@ -21,13 +21,6 @@ SUBDIRS = src man MAINTAINERCLEANFILES = ChangeLog INSTALL -if BUILD_LINUXDOC -README: README.sgml - $(MAKE_TEXT) README.sgml && mv README.txt README -endif - -EXTRA_DIST = README.sgml - .PHONY: ChangeLog INSTALL INSTALL: diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/README xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/README --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/README 2010-06-09 19:35:15.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/README 2010-07-06 01:29:58.000000000 +0100 @@ -15,111 +15,111 @@ ______________________________________________________________________ - 1. Supported hardware + 1. Supported hardware The current accelerated I128 server supports - +o Imagine 128 (I128 with Texas Instruments TVP3025 or IBM528 RAMDAC). + o Imagine 128 (I128 with Texas Instruments TVP3025 or IBM528 RAMDAC). It has been tested with with 4MB of VRAM. - +o Imagine 128 Ticket 2 Ride (I128-T2R with IBM526 or 528 RAMDAC). It + o Imagine 128 Ticket 2 Ride (I128-T2R with IBM526 or 528 RAMDAC). It has been tested with 4 MB and 8 MB of VRAM and DRAM. - +o Imagine 128 Revolution 3D (I128-R3D with IBM526 RAMDAC). It has + o Imagine 128 Revolution 3D (I128-R3D with IBM526 RAMDAC). It has been tested with 4 MB, 8 MB, and 16 MB of WRAM or SGRAM. - +o Imagine 128 Revolution IV (I128-R4 with SILVERHAMMER RAMDAC). It + o Imagine 128 Revolution IV (I128-R4 with SILVERHAMMER RAMDAC). It has been tested with 32 MB. - 2. Features: + 2. Features: - +o uses linear frame buffer + o uses linear frame buffer - +o Resolutions up to the maximum supported by the card should be + o Resolutions up to the maximum supported by the card should be possible. - +o 8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are + o 8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are supported. - +o supports RGB Sync-on-Green + o supports RGB Sync-on-Green - +o Makes use of the graphics accelerator. + o Makes use of the graphics accelerator. - 3. Configuration: + 3. Configuration: The I128 driver should auto-detect all supported hardware so you needn't have anything other than the Identifier in the Section - "Device" of the xorg.conf file. When running the xorgcfg or - xorgconfig programs one merely needs to select an I128 card so that - the correct server will be used. One need not and should not specify - a RAMDAC, clockchip or allow the setup program to probe for clocks. - The driver will auto-detect the amount of video ram present. + "Device" of the xorg.conf file. When running the xorgcfg or xorgconfig + programs one merely needs to select an I128 card so that the correct + server will be used. One need not and should not specify a RAMDAC, + clockchip or allow the setup program to probe for clocks. The driver + will auto-detect the amount of video ram present. The following Section "Device" options are supported by the I128 driver: - +o Option "Dac6Bit" + o Option "Dac6Bit" Will enable 6-bit DAC support. - +o Option "NoAccel" + o Option "NoAccel" Will disable all hardware acceleration. - +o Option "SyncOnGreen" + o Option "SyncOnGreen" Will enable syncing on green for sync-on-green monitors (these are typically fixed frequency workstation monitors). - 4. Mode lines for the Silicon Graphics flat panel display: + 4. Mode lines for the Silicon Graphics flat panel display: - +o These mode lines are required for use with the T2R4 (Rev 4) and the + o These mode lines are required for use with the T2R4 (Rev 4) and the Silicon Graphics Flat Panel display. - +o Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029 + o Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 7 +Hsync +Vsync - +o Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029 + o Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 5 +Hsync +Vsync - +o Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029 + o Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 1 +Hsync +Vsync - +o Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 - HSkew 7 DoubleScan +Hsync +Vsync + o Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 HSkew + 7 DoubleScan +Hsync +Vsync - +o Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 - HSkew 5 DoubleScan +Hsync +Vsync + o Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 HSkew + 5 DoubleScan +Hsync +Vsync - +o Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 - HSkew 1 DoubleScan +Hsync +Vsync + o Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 HSkew + 1 DoubleScan +Hsync +Vsync - +o These lines are required for use with the SGI Multilink Adapter and + o These lines are required for use with the SGI Multilink Adapter and the SiliconGraphics Flat Panel display. - +o Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 - 1056 -Hsync -Vsync + o Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 1056 + -Hsync -Vsync - +o Option "OverridePolarity" "1" + o Option "OverridePolarity" "1" - 5. Author(s) + 5. Author(s) - Robin Cutshaw, + Robin Cutshaw, and special help from: - +o Galen Brooks, + o Galen Brooks, diff -Nru xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/README.sgml xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/README.sgml --- xserver-xorg-video-i128-1.3.3+git20100609.3c58b1d2/README.sgml 2010-06-09 19:35:15.000000000 +0100 +++ xserver-xorg-video-i128-1.3.3+git20100706.ff026f65/README.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,98 +0,0 @@ - %defs; -]> - -
-Information for Number Nine I128 Users -<author>The XFree86 Project Inc. -<date>25 March 2004 -<ident> -</ident> - -<toc> - -<sect>Supported hardware -<p> -The current accelerated I128 server supports -<p> -<itemize> -<item>Imagine 128 -(I128 with Texas Instruments TVP3025 or IBM528 RAMDAC). It has been tested with -with 4MB of VRAM. -<item>Imagine 128 Ticket 2 Ride -(I128-T2R with IBM526 or 528 RAMDAC). It has been tested with 4 MB and 8 MB of -VRAM and DRAM. -<item>Imagine 128 Revolution 3D -(I128-R3D with IBM526 RAMDAC). It has been tested with 4 MB, 8 MB, and 16 MB -of WRAM or SGRAM. -<item>Imagine 128 Revolution IV -(I128-R4 with SILVERHAMMER RAMDAC). It has been tested with 32 MB. -</itemize> - -<sect>Features: -<p> -<itemize> -<item>uses linear frame buffer -<item>Resolutions up to the maximum supported by the card should be possible. -<item>8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are -supported. -<item>supports RGB Sync-on-Green -<item>Makes use of the graphics accelerator. -</itemize> - -<sect>Configuration: -<p> -The I128 driver should auto-detect all supported hardware so you needn't -have anything other than the Identifier in the Section "Device" of the -xorg.conf file. When running the xorgcfg or xorgconfig programs one -merely needs to select an I128 card so that the correct server will be -used. One need not and should not specify a RAMDAC, clockchip or allow -the setup program to probe for clocks. The driver will auto-detect the -amount of video ram present. - -The following Section "Device" options are supported by the I128 driver: -<itemize> -<item>Option "Dac6Bit" -<p> -Will enable 6-bit DAC support. -<item>Option "NoAccel" -<p> -Will disable all hardware acceleration. -<item>Option "SyncOnGreen" -<p> -Will enable syncing on green for sync-on-green monitors (these are typically -fixed frequency workstation monitors). -</itemize> - -<sect>Mode lines for the Silicon Graphics flat panel display: -<p> -<itemize> -<item>These mode lines are required for use with the T2R4 (Rev 4) and the -Silicon Graphics Flat Panel display. -<item>Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 7 +Hsync +Vsync -<item>Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 5 +Hsync +Vsync -<item>Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 1 +Hsync +Vsync -<item>Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 HSkew 7 DoubleScan +Hsync +Vsync -<item>Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 HSkew 5 DoubleScan +Hsync +Vsync -<item>Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 HSkew 1 DoubleScan +Hsync +Vsync -</itemize> - -<p> -<itemize> -<item>These lines are required for use with the SGI Multilink Adapter and the SiliconGraphics Flat Panel display. -<item>Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 1056 -Hsync -Vsync -<item>Option "OverridePolarity" "1" -</itemize> - -<sect>Author(s) -<p> - -Robin Cutshaw, <email>robin@XFree86.Org</email> - -and special help from: - -<itemize> -<item>Galen Brooks, <email>galen@interlabs.com</email> -</itemize> - -</article>