.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
man/sunbw2.man | 8 ++++----
src/.cvsignore | 6 ++++++
6 files changed, 44 insertions(+), 5 deletions(-)
New commits:
commit 0d47924bba0872ce4c6cadedff6783be3ce03f86
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Fri Apr 7 21:14:47 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..45aa805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07 Adam Jackson <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * src/bw2.h:
+ * src/bw2_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 2dcd6b6..dd5a950 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-sunbw2],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
@@ -51,7 +51,7 @@ # Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/bw2.h b/src/bw2.h
index 0134850..4eadaec 100644
--- a/src/bw2.h
+++ b/src/bw2.h
@@ -27,7 +27,6 @@ #define BW2_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/bw2_driver.c b/src/bw2_driver.c
index 318adc4..1bd064c 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_driver.c
@@ -28,7 +28,6 @@ #endif
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
@@ -61,11 +60,11 @@ static ModeStatus BW2ValidMode(int scrnI
void BW2Sync(ScrnInfoPtr pScrn);
-#define VERSION 4000
+#define BW2_VERSION 4000
#define BW2_NAME "SUNBW2"
#define BW2_DRIVER_NAME "sunbw2"
#define BW2_MAJOR_VERSION 1
-#define BW2_MINOR_VERSION 0
+#define BW2_MINOR_VERSION 1
#define BW2_PATCHLEVEL 0
/*
@@ -77,7 +76,7 @@ #define BW2_PATCHLEVEL 0
*/
_X_EXPORT DriverRec SUNBW2 = {
- VERSION,
+ BW2_VERSION,
BW2_DRIVER_NAME,
BW2Identify,
BW2Probe,
@@ -251,7 +250,7 @@ BW2Probe(DriverPtr drv, int flags)
pScrn = xf86AllocateScreen(drv, 0);
/* Fill in what we can of the ScrnInfoRec */
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = BW2_VERSION;
pScrn->driverName = BW2_DRIVER_NAME;
pScrn->name = BW2_NAME;
pScrn->Probe = BW2Probe;
commit a9e83a10f9bfd354af448c20b41d0c85db7e489d
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Dec 21 02:30:02 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 9970726..2dcd6b6 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-sunbw2],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
commit 4280411ea6cde6fb83bcd1a5c4ffdb9edb65b584
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Dec 19 16:25:54 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 3d09376f24adbaee6b9ecc32b7cd62d85a20d81d
Author: Kevin E Martin <[EMAIL PROTECTED]>
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 cfa2fe3..9970726 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-sunbw2],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
commit f62998bd7d5242ea8500b8ecdf98a00ae9d6da7b
Author: Kevin E Martin <[EMAIL PROTECTED]>
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 = @[EMAIL PROTECTED]
+driverman_PRE = @[EMAIL PROTECTED]
-driverman_DATA = $(driverman_SOURCES:[EMAIL PROTECTED]@)
+driverman_DATA = $(driverman_PRE:[EMAIL PROTECTED]@)
EXTRA_DIST = @[EMAIL PROTECTED]
commit e71465a26f2ea17df369b61b3593af53647be44d
Author: Kevin E Martin <[EMAIL PROTECTED]>
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 66d3f7b..cfa2fe3 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-sunbw2],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
commit 6e9e610b980c344b1aea90bd46243847d75ca4e0
Author: Kevin E Martin <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 45971c2..66d3f7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,6 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit e885f2e1d490ce03100b7a6b5303e2f96b1ee0f5
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Tue Nov 29 23:30:03 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 <[EMAIL PROTECTED]>
+
+ * 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 6624a68..45971c2 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 8d246d8f1918261607d222d1bf34c9eb803718e8
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Mon Nov 28 22:04:12 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 = @[EMAIL PROTECTED]
commit ed18e9e6384588d13d1df91d66d4ec3a6d5903a4
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Mon Nov 21 10:49:18 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..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
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 ed56be8720b4efeb130f6fc8bca10ea63cfbaa2d
Author: Kevin E Martin <[EMAIL PROTECTED]>
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 77b9378..6624a68 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-sunbw2],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
commit 4fbc319845b783edc266fdf1e881b234f989b59a
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Tue Nov 1 15:08:54 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 2d04096..77b9378 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,13 @@ 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)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit f8409577df0014ca9c6c4cd79de46c82eba61d43
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Oct 19 02:48:04 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index b7d2af0..2d04096 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-sunbw2],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
commit 37293998bfbd161401556346bb16dc573ff4dad9
Author: Alan Coopersmith <[EMAIL PROTECTED]>
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 = @[EMAIL PROTECTED]
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:[EMAIL PROTECTED]@)
EXTRA_DIST = @[EMAIL PROTECTED]
commit 83ab692c845987d10d9e70601b7a6ff2850115ba
Author: Adam Jackson <[EMAIL PROTECTED]>
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 = @[EMAIL PROTECTED]
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @[EMAIL PROTECTED]
CLEANFILES = $(driverman_DATA)
commit dfdd13ceed3ef859f0a53e97195f433747f92f54
Author: Alan Coopersmith <[EMAIL PROTECTED]>
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 f4ec38b..b7d2af0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=sunbw2
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index 8dfe1ea..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 = \
- sunbw2.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 = @[EMAIL PROTECTED]
+
+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 ed9067fb86b53aeb41b7cbbc4407380740b29760
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Thu Aug 18 09:03:49 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 e67b0967f9b7b74bf51ba6be7b5f7854c09bfc54
Author: Kevin E Martin <[EMAIL PROTECTED]>
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 a046274..f4ec38b 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-sunbw2],
- 0.1.0,
- [EMAIL PROTECTED],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunbw2)
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 174b6cb841f2d238d5e540a5706634bc99f075ee
Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
Date: Tue Jul 26 23:05:10 2005 +0000
Build system for sunbw2
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..a046274
--- /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-sunbw2],
+ 0.1.0,
+ [EMAIL PROTECTED],
+ xf86-video-sunbw2)
+
+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..8dfe1ea
--- /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 = \
+ sunbw2.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..18ec876
--- /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@
+sunbw2_drv_la_LTLIBRARIES = sunbw2_drv.la
+sunbw2_drv_la_LDFLAGS = -module -avoid-version
+sunbw2_drv_ladir = @moduledir@/drivers
+
+sunbw2_drv_la_SOURCES = \
+ bw2_driver.c \
+ bw2.h
commit 36fd43981c07fdeb21baae5014c05a8a860ab067
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Jul 11 02:30:00 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index d813549..318adc4 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_driver.c
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.3
2001/05/04 19:05:45 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
commit 272bb666f64168eea63bc02f0ee55216fd35a2ad
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Sat Jun 25 21:16:56 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 00b0072..d813549 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_driver.c
@@ -52,8 +52,8 @@ static void BW2AdjustFrame(int scrnIndex
/* Optional functions */
static void BW2FreeScreen(int scrnIndex, int flags);
-static int BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus BW2ValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void BW2Sync(ScrnInfoPtr pScrn);
@@ -72,7 +72,7 @@ #define BW2_PATCHLEVEL 0
* an upper-case version of the driver name.
*/
-DriverRec SUNBW2 = {
+_X_EXPORT DriverRec SUNBW2 = {
VERSION,
BW2_DRIVER_NAME,
BW2Identify,
@@ -96,7 +96,7 @@ static XF86ModuleVersionInfo sunbw2VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -104,7 +104,7 @@ static XF86ModuleVersionInfo sunbw2VersR
{0,0,0,0}
};
-XF86ModuleData sunbw2ModuleData = { &sunbw2VersRec, bw2Setup, NULL };
+_X_EXPORT XF86ModuleData sunbw2ModuleData = { &sunbw2VersRec, bw2Setup, NULL };
pointer
bw2Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -555,7 +555,7 @@ BW2FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
commit c0d8343ed4f9a1c7c74f1ac46c278918e6de8092
Author: Daniel Stone <[EMAIL PROTECTED]>
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/bw2.h b/src/bw2.h
index a1284c8..0134850 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
+/* $XFree86:$ */
#ifndef BW2_H
#define BW2_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 761e6a19501473ca3d7c75514b64a8143bf43d79
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Wed Jun 16 09:23:55 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/man/sunbw2.man b/man/sunbw2.man
index 7520e17..ac05ccf 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1
2001/01/24 00:06:28 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2
2001/01/27 18:20:53 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNBW2 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ sunbw2 \- BW2 video driver
.fi
.SH DESCRIPTION
.B sunbw2
-is an __xservername__ driver for Sun BW2 video cards.
+is an XFree86 driver for Sun BW2 video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B sunbw2
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 <[EMAIL PROTECTED]>
diff --git a/src/bw2.h b/src/bw2.h
index 6277f05..a1284c8 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
#ifndef BW2_H
#define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index e6bd2a9..00b0072 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_driver.c
@@ -52,8 +52,8 @@ static void BW2AdjustFrame(int scrnIndex
/* Optional functions */
static void BW2FreeScreen(int scrnIndex, int flags);
-static ModeStatus BW2ValidMode(int scrnIndex, DisplayModePtr mode,
- Bool verbose, int flags);
+static int BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+ int flags);
void BW2Sync(ScrnInfoPtr pScrn);
@@ -96,7 +96,7 @@ static XF86ModuleVersionInfo sunbw2VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -555,7 +555,7 @@ BW2FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static ModeStatus
+static int
BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
commit cde3b2263ac4c74996792b55449ec949f9dc315d
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Fri Apr 23 19:46:10 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/sunbw2.man b/man/sunbw2.man
index ac05ccf..7520e17 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2
2001/01/27 18:20:53 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1
2001/01/24 00:06:28 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNBW2 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ sunbw2 \- BW2 video driver
.fi
.SH DESCRIPTION
.B sunbw2
-is an XFree86 driver for Sun BW2 video cards.
+is an __xservername__ driver for Sun BW2 video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B sunbw2
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 <[EMAIL PROTECTED]>
diff --git a/src/bw2.h b/src/bw2.h
index a1284c8..6277f05 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
+/* $XFree86:$ */
#ifndef BW2_H
#define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 5888b0e..e6bd2a9 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.4
2003/10/30 17:37:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.3
2001/05/04 19:05:45 dawes Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -96,7 +96,7 @@ static XF86ModuleVersionInfo sunbw2VersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
commit e3be35b5f88777ea2c63cb7c7869623ac0616fc6
Author: Egbert Eich <[EMAIL PROTECTED]>
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/sunbw2.man b/man/sunbw2.man
index 8a50cd5..ac05ccf 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1
2001/01/24 00:06:28 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2
2001/01/27 18:20:53 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNBW2 __drivermansuffix__ __vendorversion__
diff --git a/src/bw2.h b/src/bw2.h
index 6277f05..a1284c8 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
#ifndef BW2_H
#define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 00dc62b..5888b0e 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.3
2001/05/04 19:05:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.4
2003/10/30 17:37:11 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
commit 896a21d1fd0fc3a04707755673a09e05d6cbf48a
Author: Egbert Eich <[EMAIL PROTECTED]>
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/sunbw2.man b/man/sunbw2.man
index ac05ccf..8a50cd5 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2
2001/01/27 18:20:53 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1
2001/01/24 00:06:28 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNBW2 __drivermansuffix__ __vendorversion__
diff --git a/src/bw2.h b/src/bw2.h
index a1284c8..6277f05 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
+/* $XFree86:$ */
#ifndef BW2_H
#define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 5888b0e..00dc62b 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.4
2003/10/30 17:37:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.3
2001/05/04 19:05:45 dawes Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
commit ae76bd203e7991467fb9378bbd178fb6bbd81f58
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Thu Feb 26 13:35:55 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/sunbw2.man b/man/sunbw2.man
index 33807fb..ac05ccf 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2
2001/01/27 18:20:53 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNBW2 __drivermansuffix__ __vendorversion__
diff --git a/src/bw2.h b/src/bw2.h
index d5aed8a..a1284c8 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
#ifndef BW2_H
#define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index c9ef851..5888b0e 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.4
2003/10/30 17:37:11 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
commit 7aa726f59c686b21cdcd9ab481d16e7e58c121d6
Author: Egbert Eich <[EMAIL PROTECTED]>
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/sunbw2.man b/man/sunbw2.man
index ac05ccf..33807fb 100644
--- a/man/sunbw2.man
+++ b/man/sunbw2.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2
2001/01/27 18:20:53 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNBW2 __drivermansuffix__ __vendorversion__
diff --git a/src/bw2.h b/src/bw2.h
index a1284c8..d5aed8a 100644
--- a/src/bw2.h
+++ b/src/bw2.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/sunbw2/bw2.h,v 1.1
2000/06/30 17:15:13 dawes Exp $ */
+/* $XFree86$ */
#ifndef BW2_H
#define BW2_H
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 5888b0e..c9ef851 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.4
2003/10/30 17:37:11 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
commit 36716ad167f0c3871903196e7e1ba3c7f0d3a5df
Author: Kaleb Keithley <[EMAIL PROTECTED]>
Date: Tue Nov 25 19:28:40 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/bw2_driver.c b/src/bw2_driver.c
index 00b0072..5888b0e 100644
--- a/src/bw2_driver.c
+++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.3
2001/05/04 19:05:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.4
2003/10/30 17:37:11 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -52,8 +52,8 @@ static void BW2AdjustFrame(int scrnIndex
/* Optional functions */
static void BW2FreeScreen(int scrnIndex, int flags);
-static int BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus BW2ValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void BW2Sync(ScrnInfoPtr pScrn);
@@ -555,7 +555,7 @@ BW2FreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
