xserver-xorg-video-suncg6: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
man/.cvsignore | 3 +++
man/Makefile.am | 2 +-
man/suncg6.man | 8 ++++----
src/.cvsignore | 6 ++++++
src/cg6_regs.h | 2 +-
7 files changed, 46 insertions(+), 6 deletions(-)
New commits:
commit 612e84c6ba39e86857d16553d202be71d3e0c0e4
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 21:24:15 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..beef8d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/cg6.h:
+ * src/cg6_driver.c:
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 839b14f..313342e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
@@ -52,7 +52,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/cg6.h b/src/cg6.h
index 370cdb2..52135a8 100644
--- a/src/cg6.h
+++ b/src/cg6.h
@@ -27,7 +27,6 @@ #define CG6_H
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86RamDac.h"
#include <X11/Xmd.h>
#include "gcstruct.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index eda4f5a..baad7c3 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -26,9 +26,10 @@ #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <string.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
@@ -61,11 +62,11 @@ static ModeStatus CG6ValidMode(int scrnI
void CG6Sync(ScrnInfoPtr pScrn);
-#define VERSION 4000
+#define CG6_VERSION 4000
#define CG6_NAME "SUNCG6"
#define CG6_DRIVER_NAME "suncg6"
#define CG6_MAJOR_VERSION 1
-#define CG6_MINOR_VERSION 0
+#define CG6_MINOR_VERSION 1
#define CG6_PATCHLEVEL 0
/*
@@ -77,7 +78,7 @@ #define CG6_PATCHLEVEL 0
*/
_X_EXPORT DriverRec SUNCG6 = {
- VERSION,
+ CG6_VERSION,
CG6_DRIVER_NAME,
CG6Identify,
CG6Probe,
@@ -260,7 +261,7 @@ CG6Probe(DriverPtr drv, int flags)
pScrn = xf86AllocateScreen(drv, 0);
/* Fill in what we can of the ScrnInfoRec */
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = CG6_VERSION;
pScrn->driverName = CG6_DRIVER_NAME;
pScrn->name = CG6_NAME;
pScrn->Probe = CG6Probe;
commit b011bb947ca9dab087574ae867ad2dbd57ab2193
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:30:03 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 253fecf..e6c8681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version for X11R7 release.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index de36c6e..839b14f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
commit 37df9be4ef223df1b4555a2497f025b7045de3a8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:55 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+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.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit 1d9fcc4a61363f6ab9b889ded9d8bcababc18381
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.
diff --git a/ChangeLog b/ChangeLog
index f1bd720..253fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for final X11R7 release candidate.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index a3fdd32..de36c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
commit 653b15ec999a254a14a8e8ddd719cf81278b825d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:39 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..f1bd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * man/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 6d7f63f2d878b8b34b0f6899a3944cf9ed6e4254
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:35 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index 749c638..e56beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC3 release.
+
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index c720e7b..a3fdd32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
commit 729b1ee86f20f9cc4af01933f0d7b08fa3f000ab
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:10 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 1cc1dfb..749c638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Remove extraneous AC_MSG_RESULT.
+
2005-11-29 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 546ec0d..c720e7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 03619fb71e97b9ba0a2a77bb9bdebc6a653f0d07
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:30:04 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..1cc1dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index b280330..546ec0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit 9f370adc4956650a4a1d32ceab64220e615a6c1c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:13 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)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @DRIVER_NAME@.man
commit baed8b2f08bad1e570ff1e2c40e177584ce9d48e
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:19 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+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/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..7a5faaf
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+suncg6.4
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 4e2a897a165b95cf88deac49b60a0f97110877af
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:21 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index a1932ba..b280330 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
commit 26b032bc94d9ee5ad706e91ef994bf8a36c7d1dd
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:55 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index 51f8353..a1932ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,14 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 5ec2a18f67b9f57bde19b199db47813a414755db
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:05 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index 4ddf888..51f8353 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
commit 4b66032de63a6d710cfed0b556a7b30f635d3043
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
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit da8e03e0ae9b74b7e4fcdfa1a04a73052cc66b09
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
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @DRIVER_NAME@.man
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
commit 887ede3ec670ec418d3f51a2fe332cc6a6749c02
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:09:06 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 60eb743..4ddf888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=suncg6
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index 7c417cd..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,22 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# 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
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON 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.
-
-dist_man_MANS = \
- subcg6.4
+# 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.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @DRIVER_NAME@.man
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit 74d4333ac6e73eafdc8b1bcdffe681763c4a38e7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:50 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
diff --git a/autogen.sh b/autogen.sh
index e81f989..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,4 +10,3 @@ autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"
-
commit 0fc810fe77c9e78aed29d8bc918a72b116cee331
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
diff --git a/configure.ac b/configure.ac
index c4edb6c..60eb743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-suncg6],
- 0.1.0,
- [ajax@freedesktop.org],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg6)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -57,6 +57,8 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit 98c493ad161fc0e1ee9ff22d7bda71ceb1a6771e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:43:00 2005 +0000
Build system for suncg6
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7052905
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /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 "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..c4edb6c
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,64 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-video-suncg6],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-suncg6)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([moduledir])
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+ man/Makefile
+])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..7c417cd
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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.
+
+dist_man_MANS = \
+ subcg6.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..21a367c
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,35 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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.
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = @XORG_CFLAGS@
+suncg6_drv_la_LTLIBRARIES = suncg6_drv.la
+suncg6_drv_la_LDFLAGS = -module -avoid-version
+suncg6_drv_ladir = @moduledir@/drivers
+
+suncg6_drv_la_SOURCES = \
+ cg6_cursor.c \
+ cg6_driver.c \
+ cg6.h \
+ cg6_regs.h
commit 30eb6d11ceb6229adb4473a87cecf02d0cf9b266
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.
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 72a396f..5cab501 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,11 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
+/* $XFree86:$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index 0815f36..eda4f5a 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -22,6 +22,10 @@
*/
/* $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"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
commit b17f996d50437f0d4709d85b02bb6f5d1ed81108
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.
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index bf9a333..0815f36 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -52,8 +52,8 @@ static void CG6AdjustFrame(int scrnIndex
/* Optional functions */
static void CG6FreeScreen(int scrnIndex, int flags);
-static int CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void CG6Sync(ScrnInfoPtr pScrn);
@@ -72,7 +72,7 @@ #define CG6_PATCHLEVEL 0
* an upper-case version of the driver name.
*/
-DriverRec SUNCG6 = {
+_X_EXPORT DriverRec SUNCG6 = {
VERSION,
CG6_DRIVER_NAME,
CG6Identify,
@@ -105,7 +105,7 @@ static XF86ModuleVersionInfo suncg6VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -113,7 +113,7 @@ static XF86ModuleVersionInfo suncg6VersR
{0,0,0,0}
};
-XF86ModuleData suncg6ModuleData = { &suncg6VersRec, cg6Setup, NULL };
+_X_EXPORT XF86ModuleData suncg6ModuleData = { &suncg6VersRec, cg6Setup, NULL };
pointer
cg6Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -644,7 +644,7 @@ CG6FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
commit 2625014f0a350501f8dbf7c4b33180181110ffab
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.
diff --git a/src/cg6.h b/src/cg6.h
index 00ed5b7..370cdb2 100644
--- a/src/cg6.h
+++ b/src/cg6.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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
#ifndef CG6_H
#define CG6_H
@@ -29,7 +29,7 @@ #include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
#include "xf86RamDac.h"
-#include "Xmd.h"
+#include <X11/Xmd.h>
#include "gcstruct.h"
#include "cg6_regs.h"
#include "xf86sbusBus.h"
commit 12767617cb0b37d5da34be3e67f1aeed2a7f9efa
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:23:55 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/man/suncg6.man b/man/suncg6.man
index 36b7ddb..b0dc5e8 100644
--- a/man/suncg6.man
+++ b/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__
@@ -14,17 +14,17 @@ suncg6 \- GX/Turbo GX video driver
.fi
.SH DESCRIPTION
.B suncg6
-is an __xservername__ driver for Sun GX and Turbo GX (also known as cgsix) video cards.
+is an XFree86 driver for Sun GX and Turbo GX (also known as cgsix) video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B suncg6
driver supports...
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__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__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jakub Jelinek <jakub@redhat.com>
diff --git a/src/cg6.h b/src/cg6.h
index 17e4673..00ed5b7 100644
--- a/src/cg6.h
+++ b/src/cg6.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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
#ifndef CG6_H
#define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 31266e5..72a396f 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86:$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index 6099c99..bf9a333 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -52,8 +52,8 @@ static void CG6AdjustFrame(int scrnIndex
/* Optional functions */
static void CG6FreeScreen(int scrnIndex, int flags);
-static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode,
- Bool verbose, int flags);
+static int CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+ int flags);
void CG6Sync(ScrnInfoPtr pScrn);
@@ -105,7 +105,7 @@ static XF86ModuleVersionInfo suncg6VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -644,7 +644,7 @@ CG6FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static ModeStatus
+static int
CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index 28178f7..f6f3f05 100644
--- a/src/cg6_regs.h
+++ b/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
commit e39e72d26810ef2c870cad1e74bf4bf5db114301
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:47:46 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/suncg6.man b/man/suncg6.man
index b0dc5e8..36b7ddb 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.1 2001/01/24 00:06:29 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG6 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ suncg6 \- GX/Turbo GX video driver
.fi
.SH DESCRIPTION
.B suncg6
-is an XFree86 driver for Sun GX and Turbo GX (also known as cgsix) video cards.
+is an __xservername__ driver for Sun GX and Turbo GX (also known as cgsix) video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B suncg6
driver supports...
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jakub Jelinek <jakub@redhat.com>
diff --git a/src/cg6.h b/src/cg6.h
index 00ed5b7..17e4673 100644
--- a/src/cg6.h
+++ b/src/cg6.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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
#ifndef CG6_H
#define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 72a396f..31266e5 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
+/* $XFree86:$ */
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index a9619d2..6099c99 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -105,7 +105,7 @@ static XF86ModuleVersionInfo suncg6VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index f6f3f05..28178f7 100644
--- a/src/cg6_regs.h
+++ b/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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
+/* $XFree86$ */
#ifndef CG6_REGS_H
#define CG6_REGS_H
commit e5db942329252ba4068689cfd793034ec2997714
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:36 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/man/suncg6.man b/man/suncg6.man
index 491b68d..b0dc5e8 100644
--- a/man/suncg6.man
+++ b/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__
diff --git a/src/cg6.h b/src/cg6.h
index 17e4673..00ed5b7 100644
--- a/src/cg6.h
+++ b/src/cg6.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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
#ifndef CG6_H
#define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 31266e5..72a396f 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86:$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index c0cb0d7..a9619d2 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index 28178f7..f6f3f05 100644
--- a/src/cg6_regs.h
+++ b/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
commit 488685520f25cb4dc5b58050d028bfd069757c16
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:25 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/man/suncg6.man b/man/suncg6.man
index b0dc5e8..491b68d 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.1 2001/01/24 00:06:29 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG6 __drivermansuffix__ __vendorversion__
diff --git a/src/cg6.h b/src/cg6.h
index 00ed5b7..17e4673 100644
--- a/src/cg6.h
+++ b/src/cg6.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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
#ifndef CG6_H
#define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 72a396f..31266e5 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
+/* $XFree86:$ */
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index a9619d2..c0cb0d7 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index f6f3f05..28178f7 100644
--- a/src/cg6_regs.h
+++ b/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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
+/* $XFree86$ */
#ifndef CG6_REGS_H
#define CG6_REGS_H
commit d2c072ee1f96a1f6b1981492a0123661ff1bb156
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:55 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/suncg6.man b/man/suncg6.man
index c730b75..b0dc5e8 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $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__
diff --git a/src/cg6.h b/src/cg6.h
index 72795b6..00ed5b7 100644
--- a/src/cg6.h
+++ b/src/cg6.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.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
#ifndef CG6_H
#define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index f3cefe8..72a396f 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index 1bfd795..a9619d2 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -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_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index 28178f7..f6f3f05 100644
--- a/src/cg6_regs.h
+++ b/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
commit 9e9549fb77fb5fb1fd832a8b2431c6649e6643f0
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:27 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/man/suncg6.man b/man/suncg6.man
index b0dc5e8..c730b75 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG6 __drivermansuffix__ __vendorversion__
diff --git a/src/cg6.h b/src/cg6.h
index 00ed5b7..72795b6 100644
--- a/src/cg6.h
+++ b/src/cg6.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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
+/* $XFree86$ */
#ifndef CG6_H
#define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 72a396f..f3cefe8 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
+/* $XFree86$ */
#include "cg6.h"
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index a9619d2..1bfd795 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index f6f3f05..28178f7 100644
--- a/src/cg6_regs.h
+++ b/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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
+/* $XFree86$ */
#ifndef CG6_REGS_H
#define CG6_REGS_H
commit 67668c8db44e9e00c155acea3937c713a167c199
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:41 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index bf9a333..a9619d2 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -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: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -52,8 +52,8 @@ static void CG6AdjustFrame(int scrnIndex
/* Optional functions */
static void CG6FreeScreen(int scrnIndex, int flags);
-static int CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void CG6Sync(ScrnInfoPtr pScrn);
@@ -644,7 +644,7 @@ CG6FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
Reply to: