xserver-xorg-video-suncg6: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
README | 20 ++++++++++++++++++++
configure.ac | 2 +-
man/Makefile.am | 1 -
man/suncg6.man | 2 +-
src/cg6_driver.c | 10 ++++------
7 files changed, 46 insertions(+), 28 deletions(-)
New commits:
commit 4a5689b7213b4cfcf42e95a8f2cb65bb037e2b02
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 15:06:17 2009 +0200
Bump to 1.1.1
diff --git a/configure.ac b/configure.ac
index 313342e..cd964cf 100644
--- a/configure.ac
+++ b/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)
commit ab0df8b5e67af4a5364272f70a6c97bf4e85a95f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:04:19 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..5abd8fa
--- /dev/null
+++ b/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
commit 0ea4c5d25763c805877557914b0c95b8c6fc8f40
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Nov 25 22:46:38 2007 -0500
Request 8bpp depth from the server
We only support 8bpp so might as well ask for it rather than demand that
the user configure this in their xorg.conf.
X.Org bug#13394 (http://bugs.freedesktop.org/show_bug.cgi?id=13394)
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index 2ad85bb..57eae62 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -332,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 */
commit 1d463282b8e5befe6ab5fdd8f6688bc2a7743e43
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:35:42 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/suncg6.man b/man/suncg6.man
index 6ec4409..1ebc84b 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -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__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jakub Jelinek <jakub@redhat.com>
commit 95890614d0218d57de314cd88eaa46f45ebf0b66
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:24:59 2008 -0400
Uninclude xf86Version.h
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index 378def7..2ad85bb 100644
--- a/src/cg6_driver.c
+++ b/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"
commit b7cc50246ef1d36be47394a5b9d54f9bfc9b6398
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 8 23:57:07 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit accee0d1ce864d1a6200c93fa4ef6c942fe43feb
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 13:50:00 2007 +0200
Define CG6_*_VERSION using PACKAGE_VERSION*
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index baad7c3..378def7 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -65,9 +65,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
commit 109b59467c57bb2aaee1cced3d30129dcd305927
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 11:02:23 2007 -0800
renamed: .cvsignore -> .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2df4a8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+*~
Reply to: