xserver-xorg-video-suncg3: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
man/.cvsignore | 3 +++
man/Makefile.am | 2 +-
man/suncg3.man | 8 ++++----
src/.cvsignore | 6 ++++++
6 files changed, 45 insertions(+), 5 deletions(-)
New commits:
commit 916e7282982feb0e5c12639ebaf56a8accc15755
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 21:20:24 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..488aae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/cg3.h:
+ * src/cg3_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 d2ca93e..3db869d 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-suncg3],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
@@ -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/cg3.h b/src/cg3.h
index 8f1eb90..351b2e6 100644
--- a/src/cg3.h
+++ b/src/cg3.h
@@ -27,7 +27,6 @@ #define CG3_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/cg3_driver.c b/src/cg3_driver.c
index a85fb60..0aa3fba 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_driver.c
@@ -29,7 +29,6 @@ #endif
#define PSZ 8
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
@@ -62,11 +61,11 @@ static ModeStatus CG3ValidMode(int scrnI
void CG3Sync(ScrnInfoPtr pScrn);
-#define VERSION 4000
+#define CG3_VERSION 4000
#define CG3_NAME "SUNCG3"
#define CG3_DRIVER_NAME "suncg3"
#define CG3_MAJOR_VERSION 1
-#define CG3_MINOR_VERSION 0
+#define CG3_MINOR_VERSION 1
#define CG3_PATCHLEVEL 0
/*
@@ -78,7 +77,7 @@ #define CG3_PATCHLEVEL 0
*/
_X_EXPORT DriverRec SUNCG3 = {
- VERSION,
+ CG3_VERSION,
CG3_DRIVER_NAME,
CG3Identify,
CG3Probe,
@@ -252,7 +251,7 @@ CG3Probe(DriverPtr drv, int flags)
pScrn = xf86AllocateScreen(drv, 0);
/* Fill in what we can of the ScrnInfoRec */
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = CG3_VERSION;
pScrn->driverName = CG3_DRIVER_NAME;
pScrn->name = CG3_NAME;
pScrn->Probe = CG3Probe;
commit 392e90da69ad373860015e71e612ba5d49b89883
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 d11ebb6..d2ca93e 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-suncg3],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
commit f23de53d007a187cb5177e4324852145174ce585
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 cbfcee8297f3c8146eb797cb671b2556dff6b4db
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 b9ca453..d11ebb6 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-suncg3],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
commit 12d8fedbc41e5a57f791d78ef0d37f22ee017517
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.
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 5d55fe760806034b421cfbbd9faef76f1e5617f0
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 2ba3e81..b9ca453 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-suncg3],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
commit c4a6f757c1454648000b01d2c2f23c0ed5a4a929
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 0553258..2ba3e81 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 543392e091e1629eafafae68d1fe2422a108bd0e
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 36c2583..0553258 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 fda80c369270ba462d16ad2511a34952723caac2
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 e1e0aae9a786735ed0ceea5d3f9c065c4e777d5d
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..cc505c1
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+suncg3.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 93a89803eb2d476ac1773a88d676465b0209cb27
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 aa43f82..36c2583 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-suncg3],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
commit c93e5e33bf3576021fa5cf5203268a6ec59da587
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 b938829..aa43f82 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 54d97b5bdc7a2fbb18bc6b0bba24a79dbe9608f1
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 5f2e670..b938829 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-suncg3],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
commit d1f4685eb5cc0fcbb9a6aafbba0f46d6367207c6
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 f41bc7d744874c4af7c0d7d61fa803a8ca7afa0a
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 d5d147fe539955f94ef1c65e7cc206b8b9c85f57
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 d5dcb54..5f2e670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=suncg3
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index 8220653..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 = \
- subcg3.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 edc9996fa8076c46288ca6555d9685e6dc6bbba0
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 316ca7e3dabc7ce7a2a78f5250e05281fd26ecea
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 2b0b046..d5dcb54 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-suncg3],
- 0.1.0,
- [ajax@freedesktop.org],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-suncg3)
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 15a8f07cf8ca6d74d29feeefeeca603495710fb8
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:07:48 2005 +0000
Build system for suncg3
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..2b0b046
--- /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-suncg3],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-suncg3)
+
+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..8220653
--- /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 = \
+ subcg3.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..17af3e2
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,33 @@
+# 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@
+suncg3_drv_la_LTLIBRARIES = suncg3_drv.la
+suncg3_drv_la_LDFLAGS = -module -avoid-version
+suncg3_drv_ladir = @moduledir@/drivers
+
+suncg3_drv_la_SOURCES = \
+ cg3_driver.c \
+ cg3.h
commit fb42827cd407e69931620158433e9938211e69fa
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/cg3_driver.c b/src/cg3_driver.c
index 3ba4c93..a85fb60 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_driver.c
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 8
#include "xf86.h"
#include "xf86_OSproc.h"
commit 133737d29a795be94b87eff0bbf5b0cc3a80ff77
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/cg3_driver.c b/src/cg3_driver.c
index 12e14e6..3ba4c93 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_driver.c
@@ -53,8 +53,8 @@ static void CG3AdjustFrame(int scrnIndex
/* Optional functions */
static void CG3FreeScreen(int scrnIndex, int flags);
-static int CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus CG3ValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void CG3Sync(ScrnInfoPtr pScrn);
@@ -73,7 +73,7 @@ #define CG3_PATCHLEVEL 0
* an upper-case version of the driver name.
*/
-DriverRec SUNCG3 = {
+_X_EXPORT DriverRec SUNCG3 = {
VERSION,
CG3_DRIVER_NAME,
CG3Identify,
@@ -97,7 +97,7 @@ static XF86ModuleVersionInfo suncg3VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -105,7 +105,7 @@ static XF86ModuleVersionInfo suncg3VersR
{0,0,0,0}
};
-XF86ModuleData suncg3ModuleData = { &suncg3VersRec, cg3Setup, NULL };
+_X_EXPORT XF86ModuleData suncg3ModuleData = { &suncg3VersRec, cg3Setup, NULL };
pointer
cg3Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -565,7 +565,7 @@ CG3FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
commit 458858bf9f9464ab88e16149c5bbf625628f6793
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/cg3.h b/src/cg3.h
index c2efa94..8f1eb90 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86:$ */
#ifndef CG3_H
#define CG3_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 "xf86sbusBus.h"
commit 5d7a9acfd861e8d3c80d26576e1336d968a458ca
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/suncg3.man b/man/suncg3.man
index 5182c80..8c1c8f1 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG3 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ suncg3 \- CG3 video driver
.fi
.SH DESCRIPTION
.B suncg3
-is an __xservername__ driver for Sun CG3 video cards.
+is an XFree86 driver for Sun CG3 video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B suncg3
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/cg3.h b/src/cg3.h
index 3490f34..c2efa94 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
#ifndef CG3_H
#define CG3_H
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index 60f61bf..12e14e6 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_driver.c
@@ -53,8 +53,8 @@ static void CG3AdjustFrame(int scrnIndex
/* Optional functions */
static void CG3FreeScreen(int scrnIndex, int flags);
-static ModeStatus CG3ValidMode(int scrnIndex, DisplayModePtr mode,
- Bool verbose, int flags);
+static int CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+ int flags);
void CG3Sync(ScrnInfoPtr pScrn);
@@ -97,7 +97,7 @@ static XF86ModuleVersionInfo suncg3VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -565,7 +565,7 @@ CG3FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static ModeStatus
+static int
CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
commit 71922f77be69323dcb937e8c8e00249d187f581f
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:47:13 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/suncg3.man b/man/suncg3.man
index 8c1c8f1..5182c80 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG3 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ suncg3 \- CG3 video driver
.fi
.SH DESCRIPTION
.B suncg3
-is an XFree86 driver for Sun CG3 video cards.
+is an __xservername__ driver for Sun CG3 video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B suncg3
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/cg3.h b/src/cg3.h
index c2efa94..3490f34 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86:$ */
#ifndef CG3_H
#define CG3_H
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index dd5ef49..60f61bf 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */
#define PSZ 8
#include "xf86.h"
@@ -97,7 +97,7 @@ static XF86ModuleVersionInfo suncg3VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
commit 2280cf405f5cc5a7650ec8e36fcc4afaf01d2830
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/suncg3.man b/man/suncg3.man
index cdc4ecc..8c1c8f1 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG3 __drivermansuffix__ __vendorversion__
diff --git a/src/cg3.h b/src/cg3.h
index 3490f34..c2efa94 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
#ifndef CG3_H
#define CG3_H
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index 8bf3815..dd5ef49 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */
#define PSZ 8
#include "xf86.h"
commit 4148dfc0ac28262940edc7e4f2ab1e4f2ed778f9
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/suncg3.man b/man/suncg3.man
index 8c1c8f1..cdc4ecc 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG3 __drivermansuffix__ __vendorversion__
diff --git a/src/cg3.h b/src/cg3.h
index c2efa94..3490f34 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86:$ */
#ifndef CG3_H
#define CG3_H
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index dd5ef49..8bf3815 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */
#define PSZ 8
#include "xf86.h"
commit 8528dfe9a41a70276d9022a190e0df782f11b882
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:55 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/suncg3.man b/man/suncg3.man
index ed1b470..8c1c8f1 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNCG3 __drivermansuffix__ __vendorversion__
diff --git a/src/cg3.h b/src/cg3.h
index b2b48e0..c2efa94 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
#ifndef CG3_H
#define CG3_H
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index e211192..dd5ef49 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */
#define PSZ 8
#include "xf86.h"
commit 43ea4c87cf322b31392de2344e9bf535e0c16b21
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:25 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/man/suncg3.man b/man/suncg3.man
index 8c1c8f1..ed1b470 100644
--- a/man/suncg3.man
+++ b/man/suncg3.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.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 SUNCG3 __drivermansuffix__ __vendorversion__
diff --git a/src/cg3.h b/src/cg3.h
index c2efa94..b2b48e0 100644
--- a/src/cg3.h
+++ b/src/cg3.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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86$ */
#ifndef CG3_H
#define CG3_H
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index dd5ef49..e211192 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86$ */
#define PSZ 8
#include "xf86.h"
commit f5fe4b8f8b07b6470856481380b2dd693fd8547b
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/cg3_driver.c b/src/cg3_driver.c
index 12e14e6..dd5ef49 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */
#define PSZ 8
#include "xf86.h"
@@ -53,8 +53,8 @@ static void CG3AdjustFrame(int scrnIndex
/* Optional functions */
static void CG3FreeScreen(int scrnIndex, int flags);
-static int CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus CG3ValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void CG3Sync(ScrnInfoPtr pScrn);
@@ -565,7 +565,7 @@ CG3FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
Reply to: