update to xf86-video-suncg6 1.1.1

5 files changed, 28 insertions, 10 deletions

diff --git a/driver/xf86-video-suncg6/README b/driver/xf86-video-suncg6/README
new file mode 100644
index 000000000..5abd8fafd
--- /dev/null
+++ b/driver/xf86-video-suncg6/README
@@ -0,0 +1,20 @@
+xf86-video-suncg6 - GX/Turbo GX video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/driver/xf86-video-suncg6
+
+        http://cgit.freedesktop.org/xorg/driver/xf86-video-suncg6
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
diff --git a/driver/xf86-video-suncg6/configure.ac b/driver/xf86-video-suncg6/configure.ac
index 313342e5c..cd964cf63 100644
--- a/driver/xf86-video-suncg6/configure.ac
+++ b/driver/xf86-video-suncg6/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-suncg6],
-        1.1.0,
+        1.1.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-suncg6)
 
diff --git a/driver/xf86-video-suncg6/man/suncg6.man b/driver/xf86-video-suncg6/man/suncg6.man
index 36b7ddbb8..1ebc84b8c 100644
--- a/driver/xf86-video-suncg6/man/suncg6.man
+++ b/driver/xf86-video-suncg6/man/suncg6.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH SUNCG6 __drivermansuffix__ __vendorversion__
@@ -25,6 +25,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Jakub Jelinek <jakub@redhat.com>
diff --git a/driver/xf86-video-suncg6/src/cg6_driver.c b/driver/xf86-video-suncg6/src/cg6_driver.c
index baad7c3bf..57eae6215 100644
--- a/driver/xf86-video-suncg6/src/cg6_driver.c
+++ b/driver/xf86-video-suncg6/src/cg6_driver.c
@@ -20,7 +20,6 @@
  * 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.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,7 +29,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Version.h"
 #include "mipointer.h"
 #include "mibstore.h"
 #include "micmap.h"
@@ -65,9 +63,9 @@ void CG6Sync(ScrnInfoPtr pScrn);
 #define CG6_VERSION 4000
 #define CG6_NAME "SUNCG6"
 #define CG6_DRIVER_NAME "suncg6"
-#define CG6_MAJOR_VERSION 1
-#define CG6_MINOR_VERSION 1
-#define CG6_PATCHLEVEL 0
+#define CG6_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define CG6_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define CG6_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
 
 /* 
  * This contains the functions needed by the server after loading the driver
@@ -334,7 +332,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags)
     deal with depth
     *********************/
     
-    if (!xf86SetDepthBpp(pScrn, 0, 0, 0, NoDepth24Support)) {
+    if (!xf86SetDepthBpp(pScrn, 8, 0, 0, NoDepth24Support)) {
 	return FALSE;
     } else {
 	/* Check that the returned depth is one we support */
diff --git a/driver/xf86-video-suncg6/src/cg6_regs.h b/driver/xf86-video-suncg6/src/cg6_regs.h
index 28178f7aa..f6f3f0578 100644
--- a/driver/xf86-video-suncg6/src/cg6_regs.h
+++ b/driver/xf86-video-suncg6/src/cg6_regs.h
@@ -20,7 +20,7 @@
  * 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.
  */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
 
 #ifndef CG6_REGS_H
 #define CG6_REGS_H