--- xserver-xorg-video-s3-0.6.3.orig/ChangeLog
+++ xserver-xorg-video-s3-0.6.3/ChangeLog
@@ -1,133 +1,474 @@
-2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
+commit d096fd94d8064a08895d34f978830240bfdc9616
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Jul 30 12:04:29 2009 +1000
 
-	* src/s3_driver.c:
-	Revert the old behaviour when the BIOS settings are used for
-	intialization of DRAM/VRAM timings, i. e. we don't touch the
-	timings during initialization phase until any memory option (like
-	slow_edodram) is specified.
-	
-	Add manual page.	
+    s3: bump for release 0.6.3
 
-2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
-	
-	* src/s3_driver.c:
-	* src/s3_video.c:
-	
-	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
-	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
-	overriding Chipset with "Trio64UV+" but not on real hardware).
+commit 3e974443b5b2906d1b82b7c27c83062715f925e9
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Jul 28 15:22:41 2009 +1000
 
-	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
-	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
-	you have problems with NewMMIO, you may override ChipRev in "Device" 
- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
-	also disables overlay video (Xv) because it isn't implemented for
-	Old MMIO yet.
-	
-2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+    s3: change to using ABI version check
 
-	* src/s3_driver.c:
-	* src/s3_shadow.c:
+commit f047dffb193ffc52a358bfb0a3ae595acf4726b2
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Jul 28 10:49:36 2009 +1000
 
-	Add shadowFB option. It can be used to speedup drawing when
-	hardware acceleration is undesirable or unavailable (for colour depth
-	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
-	default. Enabling shadowFB option disables HW acceleration. Thanks
-	to Egor Ivanov for initial porting of shadowFB from s3virge.
+    s3: fixup resources under pci access
 
-	Interlace mode support.
+commit b8d3e448a8debbc2c77dee8e590a564a010ede59
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Jul 28 10:48:48 2009 +1000
 
-	Close bug #14999.
-	
-2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+    s3: remove unneeded include
 
-	* src/s3_video.c: 
+commit c5c69f9de5d11fd2cadc4ccf00bcf2e8cf65f2eb
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Jul 28 10:03:14 2009 +1000
 
-	Streams Processor initialization.
+    s3: switch to using config pci entity instead of active
 
-	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
+commit c41a1188ce53b8975e6d5c34c54a77a3f3c291bc
+Author: Adam Hoka <ahoka@NetBSD.org>
+Date:   Sun Jul 5 22:01:46 2009 +0200
 
-	* src/s3_driver.c: 
+    Handle libpciaccess errors more gently and report any problems
+    encountered in Xorg.log (server crash versus log entry).
+    
+    This fixes PR 22510.  Report and fix by Adam Hoka <ahoka@NetBSD.org>,
+    many thanks.
+    
+    Reviewed-by: Matthieu Herrb <herrb@laas.fr>
+    Signed-off-by: Marc Balmer <marc@msys.ch>
 
-	Add XVideo option (enabled by default).
+commit aa955eda7b6fddd12b163ee66367ecc998f82ae0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 2 11:33:54 2009 -0400
 
-	Replace "swcursor" by "hwcursor" option (HW cursor 
-	not implemented yet for all chipsets).
+    s3 0.6.2
 
-	Close bug #5527: 24-bit colour depth support (24bpp and 
-	32bpp framebuffer) for TRIOs. Acceleration doesn't work
-	with packed colour mode (24 bpp FB) but works with 32bpp 
-	framebuffer mode (hardware limitation? -- need data).
+commit 2b83d07b90efd15756cf8c4c80f7f60c0e7cee2a
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date:   Thu Jun 25 19:48:34 2009 +0400
 
-	Fix system hang-up when switching between console and X session.
+    Revert the using of BIOS defaults for the VRAM/DRAM timings
 
-	Some minor changes of driver messages.
+commit bf6bdcc1220f3ed8c636e869c4b13e27923a139e
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date:   Thu Jun 25 01:57:06 2009 +0400
 
-2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+    Add manual page.
 
-	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
-	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
-	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
-	the 1024x768@16bpp mode work.
-	Thanks to Richard Driscoll for these patches.
-	
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+commit 003d36e18e32b656c1dc309c5238fa5b4804c58e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu May 28 15:14:38 2009 -0400
 
-	* configure.ac:
-	* src/s3.h:
-	Bump to 0.4.1 for Xv changes.
+    Remove useless loader symbol lists.
 
-2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
+commit 061d5f51141323ea2f4e8e597e3d4bd7e3b7cbfa
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date:   Mon May 25 14:34:27 2009 +0400
 
-	* src/s3_video.c: (S3PutImage):
-	Add a DrawablePtr argument to the XV functions to pave the way for
-	redirected video.
+    Trio64V+ now using NewMMIO. Enable Xv for Trio64V+ and Trio64UV+
 
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+commit a1d6d9bec68c3bf47af69b73c875836bc46db3a1
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date:   Mon May 4 15:10:17 2009 +0400
 
-	* configure.ac:
-	* src/s3.h:
-	* src/s3_IBMRGB.c:
-	* src/s3_Ti.c:
-	* src/s3_Trio64DAC.c:
-	* src/s3_bios.c:
-	* src/s3_cursor.c:
-	* src/s3_dga.c:
-	* src/s3_driver.c:
-	* src/s3_video.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
+    shadowFB option. Interlace mode support. Close bug #14999.
 
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit dd2e8e7a5f0bbb0f6fc3cb32161a0024545179bc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Apr 29 18:48:52 2009 -0700
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    Raise minimum xorg-server required to 1.4 for miGetPointerPosition
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 1fdb00594ed3ea18cb24e19f23813e9cc495fda3
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 30 20:59:25 2009 -0800
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Add README with pointers to mailing list, bugzilla & git repos
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 695868128746b7d8545fd78d1c42ebc2eac00a75
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Dec 22 15:30:39 2008 +1000
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    s3: fix build by including inputstr.h
 
-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 51e77345fdb5423db233f26d6af4af36887c7059
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Dec 22 15:25:45 2008 +1000
 
-	* configure.ac:
-	Remove extraneous AC_MSG_RESULT.
+    s3 0.6.1
 
-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
+commit 115436e1ec83e43b1e7727903036720cb109abef
+Author: Andrew Randrianasulu <randrik@mail.ru>
+Date:   Mon Nov 24 12:46:48 2008 -0500
 
-	* configure.ac:
-	Only build dlloader modules by default.
+    Fix typo in map setup
+    
+    fixes bug 18688
 
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit ef1ca4800ee75044243d0eb2346240c50c28f0aa
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Aug 15 14:07:28 2008 -0400
 
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
+    Uninclude xf86Version.h
 
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 565c1ad65277080968c188a635dfd743be7ea2a3
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jul 17 18:54:17 2008 -0300
 
-	* configure.ac:
-	Update pkgcheck dependencies to work with separate build roots.
+    Correct unresolved symbol and incorrect assignment.
+    
+      Function miPointerPosition is deprecated and not available anymore.
+      Correct "if (test = value)" -> "if (test == value)".
+
+commit 2128de2ad9fa67537d8ed56ff173b8a7b0422e0e
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date:   Mon Jul 7 14:31:10 2008 -0400
+
+    S3: various fixes
+    
+            * src/s3_video.c:
+    
+            Streams Processor initialization.
+    
+            XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
+    
+            * src/s3_driver.c:
+    
+            Add XVideo option (enabled by default).
+    
+            Replace "swcursor" by "hwcursor" option (HW cursor
+            not implemented yet for all chipsets).
+    
+            Close bug #5527: 24-bit colour depth support (24bpp and
+            32bpp framebuffer) for TRIO64V2. Acceleration doesn't work
+            with packed colour mode (24 bpp FB) but works with 32bpp
+            framebuffer mode (hardware limitation? -- need data).
+    
+            Fix system hang-up when switching between console and X session.
+    
+            Some minor changes of driver messages.
+
+commit 7edc59e33bfa152e124bc8dd25f7fc4b22e44bd8
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 15:00:28 2008 -0400
+
+    s3 0.6.0
+
+commit 081bf87a55b65f12d0339b4f48a13b8113661dc7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 14:55:06 2008 -0400
+
+    Fix distcheck
+
+commit 773959298037b5b86e87d0fed530f1924d5d2208
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 14:53:10 2008 -0400
+
+    Death to RCS tags.
+
+commit a0d6e3ff590f3704918339dc2b9aa0f820b24b75
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Mar 10 11:47:10 2008 +1000
+
+    s3: pciaccess conversion
+
+commit 7985d0148c766475c04f8481b0a9ddcea807d990
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date:   Mon Feb 25 11:52:09 2008 -0500
+
+    Add non-vbe DPMS support for TRIOs, adjust max clock on Trio64V2
+
+commit 4cf015311015b0e2267d7195c3795a337a466508
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Tue Aug 7 12:50:34 2007 +0200
+
+    Define VERSION* using PACKAGE_VERSION*
+
+commit 9465c594e919bd2ac3e41ac96e72a432daf81fa7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 9 19:33:45 2007 -0800
+
+    Was previously done in monolith Imakefile as:
+    SpecialCObjectRule(s3_video,$(_NOOP_), -DS3_NEWMMIO)
+    
+    Needed to get definitions of GET_PSTREAM_*, GET_SSTREAM_*, etc.
+
+commit 3470935b099daed7ed2a31791267b9087672f3f7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Jan 9 19:30:36 2007 -0800
+
+    renamed: .cvsignore -> .gitignore
+
+commit 658f0fcdb9d6494c99dcb9bf61b8f8d3ba830618
+Author: Alex Deucher <alex@t41p.(none)>
+Date:   Mon Nov 27 14:20:10 2006 -0500
+
+    bump version for release
+
+commit d4ce4d3f91690a61511b2d13943e5d0073917377
+Author: Evgeny M. Zubok <zoubok@mail.ru>
+Date:   Sat Nov 25 23:35:28 2006 -0500
+
+    full fix for older cards.
+
+commit 1f2426bf8aad082f6f232d3b8c497acdd9892810
+Author: Evgeny M. Zubok <zoubok@mail.ru>
+Date:   Thu Nov 23 13:36:04 2006 -0500
+
+    Make S3 driver work again.  Bug 7112.
+
+commit 921ff3112b0fa7ca95e9ef16d4ac980f86138594
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Sat Apr 8 01:39:50 2006 +0000
+
+    Bump to 0.4.1 for Xv changes.
+
+commit 0dd4f7377699b4d31a0cf34cc95a0bc8ae9a9391
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 7 23:11:42 2006 +0000
+
+    Add a DrawablePtr argument to the XV functions to pave the way for
+        redirected video.
+
+commit df44e7c257fdf15aa30c6b49d3a6116c01e396e4
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri Apr 7 19:51:30 2006 +0000
+
+    Unlibcwrap. Bump server version requirement. Bump to 0.4.0.
+
+commit 6adde374f8c1a1fd6573262d83e2810e5193c538
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:30:01 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit c5d01fca0fb8c72dd69766eae41659bf4e6cb50e
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:25:54 2005 +0000
+
+    Stub COPYING files
+
+commit 18c0c40ce5f8142db7b12835f3c4dadcbbd063d5
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:18 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit d992241a8afda96025bae85fcc6d26132c5372ae
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:34 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 8d185b334f89baccc9d1ba288c43099d420162bd
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Dec 2 02:16:09 2005 +0000
+
+    Remove extraneous AC_MSG_RESULT.
+
+commit a8e40603f6f12adc12c85c3f6e2e16df661381ab
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Tue Nov 29 23:30:02 2005 +0000
+
+    Only build dlloader modules by default.
+
+commit be33c9a629feb4795006550e916cb1f27b4da69f
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:49:17 2005 +0000
+
+    Add .cvsignores for drivers.
+
+commit 610b28959e0222e652c826aebae4de4bd08b60da
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Nov 9 21:15:20 2005 +0000
+
+    Update package version number for X11R7 RC2 release.
+
+commit 74b42054bf14a29df6629b4f3b295dd4f1f448ed
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Nov 1 15:08:54 2005 +0000
+
+    Update pkgcheck depedencies to work with separate build roots.
+
+commit fe34c3a53ea040fb07de1edb0d0b5efba271c2ad
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:04 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 8af9770f05b485d9016a2f46a65423075091bc9b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 00:09:04 2005 +0000
+
+    Use sed & cpp to substitute variables in driver man pages
+
+commit 527b5f01b56106ee43e1fdfec34a8da4a9cd250f
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Aug 18 09:03:48 2005 +0000
+
+    Update autogen.sh to one that does objdir != srcdir.
+
+commit 1304f6f06236eac7fc8b1c426ee3c67c88a9e4e5
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:44 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit 7a4f0abfbb2d38e58b402d64c73c5e8b8f7ceed5
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Tue Jul 26 18:46:49 2005 +0000
+
+    Build system for s3
+
+commit f53881d942bcd463127d2e5bef18e6e422d361c4
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Jul 11 02:29:58 2005 +0000
+
+    Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit b826671f9e2dc702ab8537deb33f51fa7ede9c57
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jul 1 22:43:12 2005 +0000
+
+    Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 807527511814ff314c16d3c611d58a10d21c3369
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Sat Jun 25 21:16:55 2005 +0000
+
+    Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 74df74c1f8b49e71e495af5ccad77600fd783f23
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Apr 20 12:25:29 2005 +0000
+
+    Fix includes right throughout the Xserver tree:
+    change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+    change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+        <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+    change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 0147cb45138ccd06477dc7f973ae20c1405f2bf5
+Author: Alex Deucher <agd5f@yahoo.com>
+Date:   Sun Oct 17 20:29:32 2004 +0000
+
+    - Add interlaced support to S3 driver (bug 332, Leo Savernik)
+    - EmulateWheelTimeout (bug 323, Mathias Fröhlich)
+    - single button double-click (bug 322, Rob Brown)
+
+commit b66a0081cec6427604758371907ac6c7dca532a3
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri Sep 17 03:04:53 2004 +0000
+
+    Bug #1192: Remove cfb support from drivers where its use is an option.
+        Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+        to refer to fb rather than cfb.
+
+commit 73537025414eb20771ee2337cf60016daafc0fc9
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Aug 16 09:13:14 2004 +0000
+
+    Bug #1087: Make sure all the *Weak symbols are documented in the import
+        list, so the loader knows not to complain about unresolved symbols when
+        an optional module isn't loaded. This typically manifests as warnings
+        about fbdevHW symbols when the user isn't using the framebuffer
+        console.
+
+commit c431a14b6be0d9071b0fc95121260b33ab598f75
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Tue Aug 3 02:44:21 2004 +0000
+
+    Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
+        DoLoadableServer NO builds work again.
+
+commit d5c13acdc525296f3dd7b7fc99737be2423c1a01
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri Jul 30 20:30:54 2004 +0000
+
+    Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+        framebuffer formats except cfb and the overlay modes should work, and
+        r128 and radeon need to be loaded from the ati driver (both issues to
+        be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+        drivers. elfloader users shouldn't be affected.
+
+commit 1c466ae7996c3b3e7d3dba87458a056452bd3601
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Wed Jun 16 09:23:31 2004 +0000
+
+    DRI XFree86-4_3_99_12-merge import
+
+commit b1069acf6e9345c44f2a3cf7378590162e947042
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed May 26 16:24:09 2004 +0000
+
+    Fixing setting of physical framebuffer base for several drivers. C&T
+        driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
+        driver: improved support for lowres double scan modes.
+
+commit 143b16b20caba7c6f61784752b2ce766441ce170
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:43:14 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit c690296c3a9ea42e3beb8b97b2fe4654b5f0b7f7
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:33:31 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 55979da7b2d78bc8a2e85d0544d49801640e2617
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:12:23 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 05d3ef930b8b6dfde1eb4a272ad97e44625d9faf
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:54 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit ce44f2000de918df33fa355aaccf3f4aaa82762c
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:23 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 44cec492e6684d44e3ddcee0570bf3c72b9e07e3
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Thu Dec 4 22:03:18 2003 +0000
+
+    XFree86 4.3.99.901 (RC 1)
+
+commit 22ef8a01ef4b9d7d9ce62e3646a8309f0d789e1f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:28:38 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 7a758184cd0a922e87909ccc54375a52bed792b8
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:55 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit b8772dfb095f92bdedafae787f74a099182a4594
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:55 2003 +0000
+
+    Initial revision
--- xserver-xorg-video-s3-0.6.3.orig/autogen.sh
+++ xserver-xorg-video-s3-0.6.3/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
--- xserver-xorg-video-s3-0.6.3.orig/debian/watch
+++ xserver-xorg-video-s3-0.6.3/debian/watch
@@ -0,0 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-s3
+version=3
+http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-s3-(.*)\.tar\.gz
--- xserver-xorg-video-s3-0.6.3.orig/debian/compat
+++ xserver-xorg-video-s3-0.6.3/debian/compat
@@ -0,0 +1 @@
+8
--- xserver-xorg-video-s3-0.6.3.orig/debian/xserver-xorg-video-s3.links
+++ xserver-xorg-video-s3-0.6.3/debian/xserver-xorg-video-s3.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-s3/script
--- xserver-xorg-video-s3-0.6.3.orig/debian/README.source
+++ xserver-xorg-video-s3-0.6.3/debian/README.source
@@ -0,0 +1,49 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit" 
+   (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to 
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated using this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+  may be git'cherry-picked into the Debian repository. In this
+  case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+  with quilt as documented in /usr/share/doc/quilt/README.source.
--- xserver-xorg-video-s3-0.6.3.orig/debian/copyright
+++ xserver-xorg-video-s3-0.6.3/debian/copyright
@@ -0,0 +1,25 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
+
+     XFree86 4.x driver for S3 chipsets
+
+
+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 Ani Joshi not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  Ani Joshi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as-is" without express or implied warranty.
+
+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ANI JOSHI 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.
--- xserver-xorg-video-s3-0.6.3.orig/debian/changelog
+++ xserver-xorg-video-s3-0.6.3/debian/changelog
@@ -0,0 +1,273 @@
+xserver-xorg-video-s3 (1:0.6.3-5.21.201403160916) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Sun, 16 Mar 2014 09:16:15 +0100
+
+xserver-xorg-video-s3 (1:0.6.3-5) unstable; urgency=high
+
+  * High urgency upload for RC bug fix.
+  * Add missing call to vbeFree
+  * Fix for new vgahw ABI (closes: #522747).  Prevents X crash on startup.
+  * Include unistd.h for usleep
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 20 Mar 2013 19:24:32 +0100
+
+xserver-xorg-video-s3 (1:0.6.3-4) unstable; urgency=low
+
+  * Switch to dh:
+    - Use debhelper 8.
+    - Use dh-autoreconf.
+    - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf
+      debhelper sequence.
+  * Remove xsfbs accordingly.
+  * Update Uploaders list. Thanks, David & Brice!
+  * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Add quilt build-dep for future use.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 14:54:24 +0100
+
+xserver-xorg-video-s3 (1:0.6.3-3) experimental; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+  * Add myself to Uploaders.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 20:44:50 +0200
+
+xserver-xorg-video-s3 (1:0.6.3-2) unstable; urgency=medium
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+    good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
+  * Update xsfbs, use new ${xviddriver:Depends} substvar.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 15 May 2010 16:18:28 +0200
+
+xserver-xorg-video-s3 (1:0.6.3-1) experimental; urgency=low
+
+  [ Brice Goglin ]
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+    choose a driver during autoconfiguration.
+    + Disable patch system and remove quilt from build-deps.
+
+  [ Timo Aaltonen ]
+  * New upstream release.
+  * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
+
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 06 Dec 2009 02:00:55 +0100
+
+xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
+
+  * Add README.source, bump Standards-Version to 3.8.2.
+  * New upstream release.
+    + Fix 24bits support (for Virtual PC 2007), closes: #470408.
+  * Install the s3.4 manpage, closes: #374059.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 20 Jul 2009 18:42:04 +0200
+
+xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 11:10:16 +0100
+
+xserver-xorg-video-s3 (1:0.6.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Build against xserver 1.6 rc1.
+  * Allow parallel builds.
+  * Run autoreconf on build; add build-deps on automake, libtool and
+    xutils-dev.
+  * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 04 Feb 2009 07:47:57 +0100
+
+xserver-xorg-video-s3 (1:0.6.0-2) experimental; urgency=low
+
+  * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 05 Sep 2008 02:00:17 +0200
+
+xserver-xorg-video-s3 (1:0.6.0-1) unstable; urgency=low
+
+  [ Brice Goglin ]
+  * Add upstream URL to debian/copyright.
+
+  [ Julien Cristau ]
+  * New upstream release.
+  * Refresh 01_gen_pci_ids.diff.
+  * Remove Branden from Uploaders with his permission.
+  * Bump Standards-Version to 3.7.3.
+  * Drop the XS- prefix from Vcs-* control fields.
+  * Add myself to Uploaders.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+    /usr/bin/Xorg and other modules, and that's not a bug, so we want
+    dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
+    dpkg-dev >= 1.14.17.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 06 Jun 2008 11:57:22 +0200
+
+xserver-xorg-video-s3 (1:0.5.0-4) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 15:43:47 -0400
+
+xserver-xorg-video-s3 (1:0.5.0-3) experimental; urgency=low
+
+  * Build against xserver 1.4 and build-dep on it as well
+  * Add 01_gen_pci_ids.diff. This patch provides a set of PCI id's supported
+    by this driver so that the server can automatically load it
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 13 Sep 2007 20:50:28 -0400
+
+xserver-xorg-video-s3 (1:0.5.0-2) unstable; urgency=low
+
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-s3.
+
+  [ Brice Goglin ]
+  * Install the upstream changelog.
+  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+    (needed to let xsfbs get access to serverminver).
+  * Add XS-Vcs-*.
+  * Add a link to www.X.org and a reference to the xf86-video-s3
+    module in the long description.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 02 May 2007 14:58:44 +0200
+
+xserver-xorg-video-s3 (1:0.5.0-1) experimental; urgency=low
+
+  * New upstream release plus fixes from upstream
+  * Remove obsolete 01_enable_new_mmio.diff
+  * Generate server dependencies automatically from the ABI
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 28 Feb 2007 23:21:48 -0500
+
+xserver-xorg-video-s3 (1:0.4.1-5) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Add link to xserver-xorg-core bug script, so that bugreports contain
+    the user's config and log files.
+  * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
+    versions don't have the bug script.
+
+  [ David Nusinow ]
+  * Replace old 01_enable_new_mmio.diff with new patch that doesn't break old
+    chips that don't have the new mmio scheme. Thanks Eugene Konev for
+    pointing out the problem and Evgeny M. Zubok for writing the patch.
+    Closes: #377386
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 25 Nov 2006 14:07:01 -0500
+
+xserver-xorg-video-s3 (1:0.4.1-4) unstable; urgency=low
+
+  [ Drew Parsons ]
+  * Provides: xserver-xorg-video-1.0. Closes: #362883.
+
+  [ David Nusinow ]
+  * Add 01_enable_new_mmio.diff for a define that was lost in the move to 7.1.
+    Thanks Anton Martchukov for the report and Evgeny M. Zubok for the patch.
+    Closes: #377386
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
+  * Bump standards version to 3.7.2.2. No changes necessary.
+  * Exclude s3_drv.la from dh_install
+
+ -- David Nusinow <dnusinow@debian.org>  Sat,  7 Oct 2006 22:37:01 -0400
+
+xserver-xorg-video-s3 (1:0.4.1-3) unstable; urgency=low
+
+  [ Steve Langasek ]
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 18 Sep 2006 19:57:47 -0400
+
+xserver-xorg-video-s3 (1:0.4.1-2) experimental; urgency=low
+
+  [ Drew Parsons ]
+  *  Provides: xserver-xorg-video-1.0 not xserver-xorg-video.
+
+  [ David Nusinow ]
+  * Bump xserver (build-)depends epochs to 2: to deal with botched
+    server upload
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 22 Aug 2006 23:46:37 +0000
+
+xserver-xorg-video-s3 (1:0.4.1-1) experimental; urgency=low
+
+  [ Andres Salomon ]
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix.
+  * Run dh_install w/ --list-missing.
+
+  [ David Nusinow ]
+  * New upstream release
+  * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for
+    the build-dep on xserver-xorg-dev.
+  * Bump debhelper compat to 5
+  * Don't try to install manpages, there aren't any
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 15 Aug 2006 00:37:53 +0000
+
+xserver-xorg-video-s3 (1:0.3.5.4-3) unstable; urgency=low
+
+  * Correctly name the .install file. Thanks Frank Gevaerts. (closes: #362471)
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 13 Apr 2006 19:06:21 -0400
+
+xserver-xorg-video-s3 (1:0.3.5.4-2) unstable; urgency=low
+
+  * Upload to modular
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 20:25:51 -0500
+
+xserver-xorg-video-s3 (1:0.3.5.4-1) experimental; urgency=low
+
+  * First upload to Debian
+  * Change source package, package, and provides names to denote the
+    type of driver and that they are for xserver-xorg
+
+ -- David Nusinow <dnusinow@debian.org>  Fri, 13 Jan 2006 00:39:41 -0500
+
+xserver-xorg-driver-s3 (1:0.3.5.4-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:11:26 +1100
+
+xserver-xorg-driver-s3 (1:0.3.5.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 13:12:37 +1100
+
+xserver-xorg-driver-s3 (1:0.3.5.2-0ubuntu2) dapper; urgency=low
+
+  * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev,
+    x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon,  5 Dec 2005 12:56:48 +1100
+
+xserver-xorg-driver-s3 (1:0.3.5.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 22 Nov 2005 13:05:54 +1100
+
+xserver-xorg-driver-s3 (1:0.3.5.1-1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 25 Oct 2005 17:09:19 +1000
+
+xserver-xorg-driver-s3 (1:0.3.5-1) breezy; urgency=low
+
+  * First xserver-xorg-driver-s3 release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  6 Jul 2005 15:48:17 +1000
--- xserver-xorg-video-s3-0.6.3.orig/debian/xserver-xorg-video-s3.install
+++ xserver-xorg-video-s3-0.6.3/debian/xserver-xorg-video-s3.install
@@ -0,0 +1,2 @@
+usr/lib/xorg/modules/drivers/*.so
+usr/share/man/man4/*
--- xserver-xorg-video-s3-0.6.3.orig/debian/control
+++ xserver-xorg-video-s3-0.6.3/debian/control
@@ -0,0 +1,40 @@
+Source: xserver-xorg-video-s3
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
+Build-Depends:
+ debhelper (>= 8),
+ dh-autoreconf,
+ quilt,
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.9.4),
+ x11proto-video-dev,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ x11proto-xext-dev,
+ xutils-dev
+Standards-Version: 3.9.1
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git
+
+Package: xserver-xorg-video-s3
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+Description: X.Org X server -- legacy S3 display driver
+ This package provides the driver for certain legacy S3 video card chipsets,
+ including the Trio64 and 96x cards.  It does not provide support for
+ ViRGE/Trio3D or Savage chipsets; support for these cards is provided by
+ xserver-xorg-video-s3virge and xserver-xorg-driver-savage, respectively.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-video-s3 driver module.
--- xserver-xorg-video-s3-0.6.3.orig/debian/rules
+++ xserver-xorg-video-s3-0.6.3/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+
+# Kill *.la files, and forget no-one:
+override_dh_install:
+	find debian/tmp -name '*.la' -delete
+	dh_install --fail-missing
+
+# That's a plugin, use appropriate warning level:
+override_dh_shlibdeps:
+	dh_shlibdeps -- --warnings=6
+
+%:
+	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
--- xserver-xorg-video-s3-0.6.3.orig/debian/patches/series
+++ xserver-xorg-video-s3-0.6.3/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
--- xserver-xorg-video-s3-0.6.3.orig/src/s3.h
+++ xserver-xorg-video-s3-0.6.3/src/s3.h
@@ -113,7 +113,6 @@
         XAAInfoRecPtr           pXAA;
 	xf86CursorInfoPtr	pCurs;
 	xf86Int10InfoPtr	pInt10;
-	vbeInfoPtr		pVBE;
         XF86VideoAdaptorPtr     adaptor;
         S3PortPrivPtr           portPrivate;
 
--- xserver-xorg-video-s3-0.6.3.orig/src/s3_Ti.c
+++ xserver-xorg-video-s3-0.6.3/src/s3_Ti.c
@@ -29,6 +29,8 @@
 #include "config.h"
 #endif
 
+#include <unistd.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
--- xserver-xorg-video-s3-0.6.3.orig/src/s3_driver.c
+++ xserver-xorg-video-s3-0.6.3/src/s3_driver.c
@@ -309,6 +309,7 @@
 	S3Ptr pS3;
 	vgaHWPtr hwp;
 	ClockRangePtr clockRanges;
+	vbeInfoPtr pVBE;
 	rgb zeros = {0, 0, 0};
 	Gamma gzeros = {0.0, 0.0, 0.0};
 	int i, vgaCRIndex, vgaCRReg;
@@ -325,6 +326,7 @@
                 return FALSE;
         
         hwp = VGAHWPTR(pScrn);
+	vgaHWSetStdFuncs(hwp);
         vgaHWGetIOBase(hwp);
         
         pScrn->monitor = pScrn->confScreen->monitor;
@@ -436,7 +438,8 @@
 	}
 
 	if (xf86LoadSubModule(pScrn, "vbe")) {
-		pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
+		pVBE = VBEInit(pS3->pInt10, pEnt->index);
+		vbeFree(pVBE);
 	}
 	
 	if (pS3->shadowFB) {
