Update to xf86-video-sisusb 0.9.4

7 files changed, 901 insertions, 74 deletions

diff --git a/driver/xf86-video-sisusb/COPYING b/driver/xf86-video-sisusb/COPYING
index 7f33cbfd2..a312c8e98 100644
--- a/driver/xf86-video-sisusb/COPYING
+++ b/driver/xf86-video-sisusb/COPYING
@@ -1,12 +1,54 @@
-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 (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England
+Written by:
+      Alan Hourihane <alanh@fairlite.demon.co.uk>,
+      Mike Chapman <mike@paranoia.com>,
+      Juanjo Santamarta <santamarta@ctv.es>,
+      Mitani Hiroshi <hmitani@drl.mei.co.jp>,
+      David Thomas <davtom@dream.org.uk>,
+      Thomas Winischhofer <thomas@winischhofer.net>.
+
+Licensed under the following terms:
+
+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 appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER 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:
 
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff --git a/driver/xf86-video-sisusb/ChangeLog b/driver/xf86-video-sisusb/ChangeLog
index 98ece2217..ce5e33445 100644
--- a/driver/xf86-video-sisusb/ChangeLog
+++ b/driver/xf86-video-sisusb/ChangeLog
@@ -1,57 +1,544 @@
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+commit 43eab862e5cf0bfa9e7c8bb570651e94c067c451
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Mon Jul 5 15:01:24 2010 +1000
 
-	* configure.ac:
-	* src/sisusb.h:
-	Bump to 0.8.1 for Xv changes.
+    sisusb 0.9.4
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
-2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
+commit 13068db6a2180350b6e0e4159979dc7402889fce
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Jun 13 11:04:56 2010 -0400
 
-	* src/sisusb_video.c: (SISUSBPutImage):
-	Add a DrawablePtr argument to the XV functions to pave the way for
-	redirected video.
+    COPYING: replace stub file with actual Copyright notices.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+commit fdc38b41c4aa45cc08aa8d213a9f24b6cff2d0b5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue May 18 13:12:06 2010 -0400
 
-	* configure.ac:
-	* src/sisusb.h:
-	Unlibcwrap.  Bump server version requirement.  Bump to 0.8.0.
+    Remove mibank.h reference
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
 
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit aae0f80542dd75cd04df59963c04bd5f2d897fcf
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 15 15:50:22 2010 -0800
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    Update Sun license notices to current X.Org standard form
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 53f7f85fd24679dd39e23fa7734ca51c7720078f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Dec 15 22:01:02 2009 -0500
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    configure.ac: remove unused sdkdir=$(pkg-config...) statement
+    
+    The sdkdir variable isn't use, so remove the statement.
+    
+    Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit eb3d35736e9515841b58e767994183a29f6802ad
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Nov 23 09:25:05 2009 -0500
 
-	* man/Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+    
+    Now that the INSTALL file is generated.
+    Allows running make maintainer-clean.
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit d85dbf02b359ed04a90f9d3ae576c7149e261901
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:41:41 2009 -0400
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Automake 'foreign' option is specified in configure.ac.
+    Remove from Makefile.am
 
-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit d751d92921bd9c575dde34a0bcf5a1013a7f15fb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:09:09 2009 -0400
 
-	* configure.ac:
-	Remove extraneous AC_MSG_RESULT.
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Add missing INSTALL file. Use standard GNU file on building tarball
+    README may have been updated
+    Remove AUTHORS file as it is empty and no content available yet.
+    Remove NEWS file as it is empty and no content available yet.
 
-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
+commit d2be1820f423df7f0da0478dd04f336f41dd1719
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Oct 26 12:54:22 2009 -0400
 
-	* configure.ac:
-	Only build dlloader modules by default.
+    Several driver modules do not have a ChangeLog target in Makefile.am #23814
+    
+    The git generated ChangeLog replaces the hand written one.
+    Update configure.ac to xorg-macros level 1.3.
+    Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+    Update Makefile.am to add ChangeLog target if missing
+    Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+    This is a pre-req for the INSTALL_CMD
 
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit acf752ffe4a2d8332ee8c53f9c97e2c68cbdb3ab
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Oct 22 13:04:38 2009 -0400
 
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
 
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 4165654f007a843443ebdfb77b7bbd4d74e3cb59
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Oct 22 12:34:18 2009 -0400
 
-	* configure.ac:
-	Update pkgcheck dependencies to work with separate build roots.
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
+
+commit a18b2e7643188c5b0a900680792d413ca0e9941e
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Jul 30 12:04:29 2009 +1000
+
+    sisusb: bump for release 0.9.3
+
+commit cf32d0b9a37137b26f2c89578b53197ba27b22a9
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Jul 28 13:32:37 2009 +1000
+
+    sisusb: update for resources/RAC API removal
+
+commit 35789a14c0074bb5994deb890e0f3832f1d4a067
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jul 16 11:55:36 2009 +1000
+
+    Update to xextproto 7.1 support.
+    
+    DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+    need to include dpmsconst.h if xextproto 7.1 is available.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 89ca2b91468b13db7dda7984675013a6180feb97
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Jul 2 11:46:26 2009 -0400
+
+    sisusb 0.9.2
+
+commit d6b8211d924ac41d878be707b79e585334d77347
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu May 28 15:20:00 2009 -0400
+
+    Remove useless loader symbol lists.
+
+commit 153b489ad561134ebdef6c4025f3b7ae5d873065
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Feb 24 10:22:50 2009 -0500
+
+    sisusb 0.9.1
+
+commit 74c729bc4a94319dd27b927deeaffb807e696bfe
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 30 21:00:47 2009 -0800
+
+    Add README with pointers to mailing list, bugzilla & git repos
+
+commit e9585015180a1c835ef43a99073b74fe9f7a0245
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 9 16:34:14 2009 -0800
+
+    Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit 382f1c431ac0ccdec0e07f18c07efcf44459d2cb
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 13:32:34 2008 -0400
+
+    Really compile fix this time I mean it.
+
+commit 39ec8cff7a3bcea4aa87b176e9c8d75af55de6f8
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 19 10:22:21 2008 -0400
+
+    Build fix.
+
+commit a92ba1876d63464e85cea00a6f5e70800465cb41
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Aug 15 14:27:14 2008 -0400
+
+    Build fix.
+
+commit bfb07a5de1c396d8fd9c26da2266c4721ee929b8
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sun Jul 20 04:20:17 2008 +0300
+
+    Remove XFree86-Misc (PassMessage) support
+    
+    HandleMessage/PassMessage from XFree86-Misc was cunningly implemented as
+    just returning BadMatch, given that it's (presumably) been replaced by
+    SISCTRL.  Remove it.
+
+commit 84fd65c57a33a03d494582aceb13356d19a87b82
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri Jun 6 12:48:37 2008 +0200
+
+    Add missing include for ioctl()
+
+commit d4b0b8ebba1e8cc2e1b270ff229782ae05b034ac
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 15:36:15 2008 -0400
+
+    sisusb 0.9.0
+
+commit 4e73725b6adc1637fb8d13b02e59b9493c5ea9a7
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 15:34:48 2008 -0400
+
+    open() is not fopen().  Use O_RDONLY, not 'r'.
+
+commit e70cfd55c7562ea37c2b7d4ab9c70d7dd3f2189e
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 15:33:49 2008 -0400
+
+    Death to RCS tags.
+
+commit 10c3f050cd97fa90db40182f1846c2463f2f0e35
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Mar 8 23:53:14 2008 +0100
+
+    Makefile.am: nuke RCS Id
+
+commit ec1d219d933d865f107b68566ea5bb87f3521b22
+Author: Tomasz Dominikowski <dominikowski@gmail.com>
+Date:   Fri Nov 16 19:36:43 2007 +0100
+
+    Fix xserver version detection.
+    
+    Since xorg-server 1.3, XORG_VERSION_CURRENT is smaller than 6.8.99.13.
+
+commit a294456d5dc5be9086c0b3296eb7adfb5735be82
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:52:44 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 79c66ee5e6b59049de02edf5808613db277c75d3
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:25:56 2007 -0400
+
+    Rename .cvsignore to .gitignore
+
+commit 5497d19cfcdbd284bccc71ae2dab43c211c66145
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Tue Aug 7 13:00:34 2007 +0200
+
+    Define SISUSB_*_VERSION using PACKAGE_VERSION*
+
+commit e0be7e9930fbb149a8f395257938974cd3cef255
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Sat Apr 8 01:48:35 2006 +0000
+
+    Bump to 0.8.1 for Xv changes.
+
+commit e5fa9ebeef6d509714419bf381895000a7963fde
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 7 23:15:17 2006 +0000
+
+    Add a DrawablePtr argument to the XV functions to pave the way for
+        redirected video.
+
+commit 435046789ca3e39c5006fe0c696359d9f6fdd19a
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri Apr 7 21:10:49 2006 +0000
+
+    Unlibcwrap. Bump server version requirement. Bump to 0.8.0.
+
+commit 79680aa0dab65fcf9befc1818faad15022f88130
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:30:02 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 1642b954441b6062512e9b03d24c4036ad31033d
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:25:54 2005 +0000
+
+    Stub COPYING files
+
+commit 8b4f7b009fcdfdc6f235b93d3dad9cd389bc1c05
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:19 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 5d718fb805e3d9ffa9136f7542d0cfbf7de4fd07
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:38 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 01f6a69e7a13929e4a8ea338be8925ac320da8e7
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:35 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit e37039e3b67e2efc6de585844819ba5d04ced4c4
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Dec 2 02:16:10 2005 +0000
+
+    Remove extraneous AC_MSG_RESULT.
+
+commit d3c9f35a751f2cdd2b1ae242553c98c5d93e573e
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Tue Nov 29 23:30:03 2005 +0000
+
+    Only build dlloader modules by default.
+
+commit d164e20088e5d10075f6d284a69b29c29398615d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:04:11 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit f74c888bf818195ecddb0673d37b73a0244b1b5a
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:49:18 2005 +0000
+
+    Add .cvsignores for drivers.
+
+commit 39866bb6cdef4077553f089dfba45abe7e7badda
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Nov 9 21:31:21 2005 +0000
+
+    Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 9aaedd4b1dad82195acfd49175e57ceed2df08c1
+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 ec22a0dd50f5a90d59182dfac3d2f9004df734d5
+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 59fe6134fb3283232014dd2ab78779226eea048c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Thu Oct 27 18:27:19 2005 +0000
+
+    SiSUSB: Sync option names with SiS driver
+
+commit a37eb792c23aa98146ab63c1335879c445f0206b
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:04 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit b984f8fd42d96efce4c2bbc6e89d66dea3f68ac6
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Oct 18 00:01:54 2005 +0000
+
+    Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+        substitutions to work better with BSD make
+
+commit 5b7efdb4cacd18193abee3e113b74818e5c38465
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Oct 17 22:57:36 2005 +0000
+
+    More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+        of indirectly
+
+commit 77138abe4ea4230241db6c0f8af01066e3410154
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 00:09:05 2005 +0000
+
+    Use sed & cpp to substitute variables in driver man pages
+
+commit 7fc68fb65c32834f5765244a62c3bdd163e2bc79
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Wed Sep 28 18:59:22 2005 +0000
+
+    SiS USB driver: Allow HWCursor in interlace modes
+
+commit 4633fa57590a5baff9281d203123a87afc177d6b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Wed Sep 28 18:48:30 2005 +0000
+
+    SIS USB driver: Fix cursor flickering
+
+commit 98565d570e018a81b220b6235cd0f80157b76242
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Fri Sep 16 13:52:16 2005 +0000
+
+    SiSUSB: Fix sisctrl extension (stupid typo) Fix (gamma) brightness and add
+        contrast
+
+commit c24c0042c7ab7e02a9aa860de6b933d1a7e53d0b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Aug 19 00:13:45 2005 +0000
+
+    More updates for Panoramix -> Xinerama rename
+
+commit 8b05a40be9311f9889f72c6095f4166bac3023cb
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Aug 18 09:03:49 2005 +0000
+
+    Update autogen.sh to one that does objdir != srcdir.
+
+commit b255a200f33266cda6c3ef36771c9c8c98403bbb
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Mon Aug 15 22:57:51 2005 +0000
+
+    SiSUSB: Additional support for kernel text consoles
+
+commit d4278dcf467b7557bf81fb09cd8327a252a52489
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Mon Aug 15 16:53:29 2005 +0000
+
+    SiSUSB: Prep for SiSUSB kernel console driver
+
+commit a9a1b4e977ad7d9836712cdca49d95c12904e488
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:45 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 ce7c1ce51495cdf0e8aa9804582788129b0b12a4
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jul 27 17:33:34 2005 +0000
+
+    Build system for sisusb
+
+commit 7c809f61c84fcdfe74dda3da189e5ed61341e026
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Tue Jul 26 22:48:22 2005 +0000
+
+    Tue Jul 26 18:47:47 2005 Søren Sandmann <sandmann@redhat.com>
+    include <X11/X.h> instead of "X.h"
+    Include <X11/extensions/PanoramiXproto.h> instead of "PanoramiXproto.h"
+
+commit 5a36c53d1e093e9efafd498aa546fce4090b693c
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Jul 11 02:30:00 2005 +0000
+
+    Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 6f69642e9cf61a24c898145b20ad70468758d5d6
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Sat Jul 9 03:02:56 2005 +0000
+
+    SiSUSB driver: Remove declarations of non-existent routines
+
+commit 02234ea0f3cee11ada1e7e627cd5d7c784642b35
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Sat Jul 9 02:50:34 2005 +0000
+
+    SiSUSB driver: Sync with sis driver
+
+commit f36573d588d5c0b0eb3a3fb0bf85a77cfe6323e7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jul 1 22:43:13 2005 +0000
+
+    Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 9cac260c912f1b5f7155ef272a591cb4358c294d
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Sat Jun 25 21:16:56 2005 +0000
+
+    Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 5ee8fbce7c56193e12edd0f1016bbb4a39ad768a
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Tue Jun 21 11:29:37 2005 +0000
+
+    SiSUSB driver: Work-around a segfault at 'X -configure'
+
+commit 26f9da76d3e9970aeb88792e682b5ffdb899ba43
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Fri Apr 22 23:42:43 2005 +0000
+
+    SiSUSB driver:
+    - remove gamma pre-brightness remains
+    - minor clean-ups
+
+commit 2a629b64c6ce666d12a4f657d2696c36958fb123
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Thu Apr 21 21:35:54 2005 +0000
+
+    SISUSB driver:
+    - Add SISCTRL extension
+    - Xv interface for SiSCtrl is now deprecated (will be removed soon)
+
+commit 03db913ae3977acc4ea2fdafb4bf7a4af10df017
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Apr 20 12:25:30 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 5cadfbf2a338c4543224307ac8be7c2b8ffa38c9
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Fri Jan 28 17:58:39 2005 +0000
+
+    sisusb: Add default modes 1280x1024 and 1152x864
+
+commit 0be33d78c10047c41385d396cd3f40293307779b
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Fri Jan 28 17:31:33 2005 +0000
+
+    - Accelerate HWcursor upload in double scan modes
+    - Add "driverfunc" and report no hardware access needed
+    - Remove unneeded stuff
+
+commit 0db5df2bc16c069f088b3aed19031c1dc596f071
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Thu Jan 27 17:57:51 2005 +0000
+
+    sisusb: Accelerate by only committing data every third time the
+        blockhandler is called.
+
+commit 616bc35cb0b06c057f8c55f76e495f605ebcc961
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Wed Jan 26 01:21:20 2005 +0000
+
+    sisusb: Minor clean-ups
+
+commit 5ec5757649b77be1e8dd198e6ebaf6d6367e7f2c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Tue Jan 25 16:33:01 2005 +0000
+
+    sisusb: Remove debug warning
+
+commit bfa22c276a6557cc8f55013c6c7421fe38b74270
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Tue Jan 25 16:11:05 2005 +0000
+
+    sisusb: Update manpage
+
+commit 134205acd44ef4067965930935896fdd32c8ee3c
+Author: Thomas Winischhofer <thomas@winischhofer.net>
+Date:   Tue Jan 25 15:54:02 2005 +0000
+
+    Add sisusb driver
diff --git a/driver/xf86-video-sisusb/INSTALL b/driver/xf86-video-sisusb/INSTALL
new file mode 100644
index 000000000..8b82ade08
--- /dev/null
+++ b/driver/xf86-video-sisusb/INSTALL
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/driver/xf86-video-sisusb/Makefile.am b/driver/xf86-video-sisusb/Makefile.am
index 7052905f3..00c154df9 100644
--- a/driver/xf86-video-sisusb/Makefile.am
+++ b/driver/xf86-video-sisusb/Makefile.am
@@ -18,5 +18,14 @@
 #  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.
 
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/driver/xf86-video-sisusb/configure.ac b/driver/xf86-video-sisusb/configure.ac
index f2ae3625f..86c6ac5c3 100644
--- a/driver/xf86-video-sisusb/configure.ac
+++ b/driver/xf86-video-sisusb/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-sisusb],
-        0.9.3,
+        0.9.4,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-sisusb)
 
@@ -30,10 +30,16 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -61,7 +67,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
                   HAVE_XEXTPROTO_71="no")
 AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
 
@@ -74,9 +79,6 @@ AC_SUBST([moduledir])
 DRIVER_NAME=sisusb
 AC_SUBST([DRIVER_NAME])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([
 	Makefile
 	src/Makefile
diff --git a/driver/xf86-video-sisusb/man/Makefile.am b/driver/xf86-video-sisusb/man/Makefile.am
index d076dc410..1b26ac2c6 100644
--- a/driver/xf86-video-sisusb/man/Makefile.am
+++ b/driver/xf86-video-sisusb/man/Makefile.am
@@ -1,27 +1,24 @@
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# 
-# 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.
-# 
-# The above copyright notice and this permission notice 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 OPEN GROUP 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.
-# 
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# 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.
 # 
 
 drivermandir = $(DRIVER_MAN_DIR)
diff --git a/driver/xf86-video-sisusb/src/sisusb_driver.c b/driver/xf86-video-sisusb/src/sisusb_driver.c
index 86b69f6f1..8ba2c3306 100644
--- a/driver/xf86-video-sisusb/src/sisusb_driver.c
+++ b/driver/xf86-video-sisusb/src/sisusb_driver.c
@@ -39,7 +39,6 @@
 #include "shadowfb.h"
 #include "fb.h"
 #include "micmap.h"
-#include "mibank.h"
 #include "mipointer.h"
 #include "mibstore.h"