xserver-xorg-video-sunleo: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
man/sunleo.man | 8 ++++----
src/.cvsignore | 6 ++++++
src/leo_regs.h | 2 +-
7 files changed, 45 insertions(+), 6 deletions(-)
New commits:
commit 32ff105536420649ed75f3c9b5df44241844fc12
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 21:29:15 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..92d3ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/leo.h:
+ * src/leo_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 1c2b232..3d72c9d 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-sunleo],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
@@ -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/leo.h b/src/leo.h
index 358b0d4..b3454a0 100644
--- a/src/leo.h
+++ b/src/leo.h
@@ -27,7 +27,6 @@ #define LEO_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/leo_driver.c b/src/leo_driver.c
index f83df85..47f624a 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -27,9 +27,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"
@@ -62,11 +63,11 @@ static ModeStatus LeoValidMode(int scrnI
void LeoSync(ScrnInfoPtr pScrn);
-#define VERSION 4000
+#define LEO_VERSION 4000
#define LEO_NAME "SUNLEO"
#define LEO_DRIVER_NAME "sunleo"
#define LEO_MAJOR_VERSION 1
-#define LEO_MINOR_VERSION 0
+#define LEO_MINOR_VERSION 1
#define LEO_PATCHLEVEL 0
/*
@@ -78,7 +79,7 @@ #define LEO_PATCHLEVEL 0
*/
_X_EXPORT DriverRec SUNLEO = {
- VERSION,
+ LEO_VERSION,
LEO_DRIVER_NAME,
LeoIdentify,
LeoProbe,
@@ -261,7 +262,7 @@ LeoProbe(DriverPtr drv, int flags)
pScrn = xf86AllocateScreen(drv, 0);
/* Fill in what we can of the ScrnInfoRec */
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = LEO_VERSION;
pScrn->driverName = LEO_DRIVER_NAME;
pScrn->name = LEO_NAME;
pScrn->Probe = LeoProbe;
commit 8737c8a2415a5b217acf644f081b3bfdcf67a20d
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 adee2f8..1c2b232 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-sunleo],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
commit 63a0eeaf8aca481fca2865f7de54a1aeb334031d
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 4e89b7b64753ad56ce7527ac8d0806750ff3d9d5
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:20 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 94da533..adee2f8 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-sunleo],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
commit 0fc678d8777c2135838bf572c02763950fb4c4d6
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 f5384ea0b8cbf03df836f4962170ca5e407619fa
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:36 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 7f664bf..94da533 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-sunleo],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
commit 45b199eba0f08d5856636bed435651504c34da80
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:11 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 b5a0b12..7f664bf 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 96f0933a19d17803dd0ace65b02554389f0af7a7
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:30:05 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 252af83..b5a0b12 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 03315c3d9accea2c04a0125bd73d044f6e8858ff
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 ffa28fd37f50f1f732c007cc23c07000ee97923d
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:20 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 654e04303c09125f0812de556902718c835a1608
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 1eba655..252af83 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-sunleo],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
commit 51e2ae1a6d9af6ee0947c287a223285c438e0de5
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 7854f08..1eba655 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 485eb362f5138dd23d764ac7311c22e2e54b56fd
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 2e9addb..7854f08 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-sunleo],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
commit 56e39cd1d5035b9ac8604d50151ad1d78feb6fc7
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 b514a4ff8cd41df23ba85f5efc19ad5926892dcd
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:37 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 6e2f704f7dd62088e327ea750e71241bba5d2f27
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:09:07 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 075ced4..2e9addb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=sunleo
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index c301fb7..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 = \
- sunleo.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 fa04f124cf7438fc1f18422298e1803434df557f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:51 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 a1f1387eb8a28fc450885a02ea9a2749ec76c9ff
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 c350331..075ced4 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-sunleo],
- 0.1.0,
- [ajax@freedesktop.org],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
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 38992a849dd82d3bf0907bc675d38cb1fe304544
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:44:54 2005 +0000
Build system for sunleo
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..c350331
--- /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-sunleo],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-sunleo)
+
+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..c301fb7
--- /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 = \
+ sunleo.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..63479c6
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,42 @@
+# 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@
+sunleo_drv_la_LTLIBRARIES = sunleo_drv.la
+sunleo_drv_la_LDFLAGS = -module -avoid-version
+sunleo_drv_ladir = @moduledir@/drivers
+
+sunleo_drv_la_SOURCES = \
+ leo_accel.c \
+ leo_checks.c \
+ leo_cursor.c \
+ leo_driver.c \
+ leo_frect.c \
+ leo_frectsp.c \
+ leo_fspans.c \
+ leo_fspanssp.c \
+ leo_glyph.c \
+ leo.h \
+ leo_regs.h
commit 4d7a6340a40f508f8a0ab249eb3dd4c260240b12
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:30:01 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 2f019e5..149c6c8 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.c
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.2tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "scrnintstr.h"
diff --git a/src/leo_checks.c b/src/leo_checks.c
index 0099c1e..27e80a8 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.c
@@ -22,6 +22,10 @@
*/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "leo.h"
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 271a222..b4578f1 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index ac66407..f83df85 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -23,6 +23,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 68178ac..e3a65fb 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.c
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "leo.h"
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 1c02f6f..c860a26 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.c
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "leo.h"
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 63f92ab..ad375d9 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.c
@@ -22,6 +22,10 @@
*/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "leo.h"
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index d0e3964..26d27e4 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.c
@@ -22,6 +22,10 @@
*/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "leo.h"
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 5e0a241..9399325 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.c
@@ -22,6 +22,10 @@
*/
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define PSZ 32
#include "leo.h"
commit 0752519dbac8def14c8d51b559695386e2253f1f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:01:27 2005 +0000
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 94756c6..2f019e5 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.c
@@ -28,7 +28,7 @@ #include "scrnintstr.h"
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "fb.h"
#include "mibstore.h"
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 73af391..5e0a241 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.c
@@ -28,7 +28,7 @@ #include "leo.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "fb.h"
commit d7805c0599b51410341847fd1608591181cc2dab
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:57 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/leo_driver.c b/src/leo_driver.c
index 16a9404..ac66407 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -73,7 +73,7 @@ #define LEO_PATCHLEVEL 0
* an upper-case version of the driver name.
*/
-DriverRec SUNLEO = {
+_X_EXPORT DriverRec SUNLEO = {
VERSION,
LEO_DRIVER_NAME,
LeoIdentify,
@@ -114,7 +114,7 @@ static XF86ModuleVersionInfo sunleoVersR
{0,0,0,0}
};
-XF86ModuleData sunleoModuleData = { &sunleoVersRec, leoSetup, NULL };
+_X_EXPORT XF86ModuleData sunleoModuleData = { &sunleoVersRec, leoSetup, NULL };
pointer
leoSetup(pointer module, pointer opts, int *errmaj, int *errmin)
commit 3f9e6dde5c5511a7204be8ba94953790d7eaf165
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/leo.h b/src/leo.h
index 8df9302..358b0d4 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.3 2000/12/01 00:24:35 dawes Exp $ */
#ifndef LEO_H
#define LEO_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 "leo_regs.h"
#include "xf86sbusBus.h"
commit b2e16e8d8aa582ad2486a3c36fbecc2ec409eabe
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 14 06:20:17 2005 +0000
Bug #1259: Convert sunleo(4) to fb.
diff --git a/src/leo_accel.c b/src/leo_accel.c
index ee62310..94756c6 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.2tsi Exp $ */
#define PSZ 32
@@ -30,19 +30,13 @@ #include "regionstr.h"
#include "mistruct.h"
#include "fontstruct.h"
#include "dixfontstr.h"
-#include "cfb.h"
-#include "cfbmskbits.h"
-#include "cfb8bit.h"
+#include "fb.h"
#include "mibstore.h"
#include "mifillarc.h"
#include "miwideline.h"
-#include "fastblt.h"
-#include "mergerop.h"
-#include "migc.h"
#include "mi.h"
#include "leo.h"
-#include "leo_gc.h"
int LeoScreenPrivateIndex;
int LeoGCPrivateIndex;
@@ -68,49 +62,6 @@ int leoRopTable[16] = {
LEO_ATTR_RGBE_ENABLE|LEO_ROP_ONES /* GXset */
};
-static void
-LeoCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- LeoPtr pLeo = LeoGetScreenPrivate (pScreen);
- DDXPointPtr pptSrc;
- DDXPointPtr ppt;
- RegionPtr prgnDst;
- BoxPtr pbox;
- int dx, dy;
- int i, nbox;
- WindowPtr pwinRoot;
-
- if (pLeo->vtSema)
- return;
-
- dx = ptOldOrg.x - pWin->drawable.x;
- dy = ptOldOrg.y - pWin->drawable.y;
-
- pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
-
- prgnDst = REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
-
- REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
- REGION_INTERSECT(pWin->drawable.pScreen, prgnDst, &pWin->borderClip, prgnSrc);
-
- pbox = REGION_RECTS(prgnDst);
- nbox = REGION_NUM_RECTS(prgnDst);
- if(!(pptSrc = (DDXPointPtr )ALLOCATE_LOCAL(nbox * sizeof(DDXPointRec))))
- return;
- ppt = pptSrc;
-
- for (i = nbox; --i >= 0; ppt++, pbox++) {
- ppt->x = pbox->x1 + dx;
- ppt->y = pbox->y1 + dy;
- }
-
- LeoDoBitblt ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
- GXcopy, prgnDst, pptSrc, ~0L);
- DEALLOCATE_LOCAL(pptSrc);
- REGION_DESTROY(pWin->drawable.pScreen, prgnDst);
-}
-
void LeoVtChange (ScreenPtr pScreen, int enter)
{
LeoPtr pLeo = LeoGetScreenPrivate (pScreen);
@@ -161,11 +112,7 @@ Bool LeoAccelInit (ScreenPtr pScreen, Le
pLeo->lc0 = lc0 = (LeoCommand0 *) ((char *)pLeo->fb + LEO_LC0_VOFF);
pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF);
- if (!pLeo->NoAccel) {
- /* Replace various screen functions. */
- pScreen->CreateGC = LeoCreateGC;
- pScreen->CopyWindow = LeoCopyWindow;
- }
+ if (!pLeo->NoAccel) /* XXX do nothing */ ;
/* We will now clear the screen: we'll draw a rectangle covering all the
* viewscreen, using a 'blackness' ROP.
diff --git a/src/leo_checks.c b/src/leo_checks.c
index e0ad8ab..0099c1e 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
@@ -29,7 +29,7 @@ #include "leo.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
-#include "cfb.h"
+#include "fb.h"
int
LeoCheckTile (PixmapPtr pPixmap, LeoStipplePtr stipple, int ox, int oy)
diff --git a/src/leo_driver.c b/src/leo_driver.c
index e5f402a..16a9404 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -31,9 +31,7 @@ #include "mipointer.h"
#include "mibstore.h"
#include "micmap.h"
-#define PSZ 32
-#include "cfb.h"
-#undef PSZ
+#include "fb.h"
#include "xf86cmap.h"
#include "leo.h"
@@ -55,8 +53,8 @@ static void LeoAdjustFrame(int scrnIndex
/* Optional functions */
static void LeoFreeScreen(int scrnIndex, int flags);
-static int LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus LeoValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void LeoSync(ScrnInfoPtr pScrn);
@@ -108,7 +106,7 @@ static XF86ModuleVersionInfo sunleoVersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
LEO_MAJOR_VERSION, LEO_MINOR_VERSION, LEO_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -414,7 +412,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
}
- if (xf86LoadSubModule(pScrn, "cfb32") == NULL) {
+ if (xf86LoadSubModule(pScrn, "fb") == NULL) {
LeoFreeRec(pScrn);
return FALSE;
}
@@ -502,9 +500,9 @@ LeoScreenInit(int scrnIndex, ScreenPtr p
* pScreen fields.
*/
- ret = cfb32ScreenInit(pScreen, pLeo->fb, pScrn->virtualX,
- pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
- 2048);
+ ret = fbScreenInit(pScreen, pLeo->fb, pScrn->virtualX,
+ pScrn->virtualY, pScrn->xDpi, pScrn->yDpi,
+ 2048, pScrn->bitsPerPixel);
if (!ret)
return FALSE;
@@ -667,7 +665,7 @@ LeoFreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 4f1e854..68178ac 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
@@ -30,8 +30,7 @@ #include "leo_regs.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
-#include "cfb.h"
-#include "cfbmskbits.h"
+#include "fb.h"
void
LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
@@ -50,7 +49,7 @@ LeoPolyFillRect(DrawablePtr pDrawable, G
if(nrectFill <= 0)
return;
- prgnClip = cfbGetCompositeClip(pGC);
+ prgnClip = fbGetCompositeClip(pGC);
prect = prectInit;
xorg = pDrawable->x;
@@ -178,7 +177,7 @@ LeoPolyFillRect1Rect(DrawablePtr pDrawab
if(nrectFill <= 0)
return;
- prgnClip = cfbGetCompositeClip(pGC);
+ prgnClip = fbGetCompositeClip(pGC);
prect = prectInit;
xorg = pDrawable->x;
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 8784acc..1c02f6f 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
@@ -30,8 +30,7 @@ #include "leo_regs.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
-#include "cfb.h"
-#include "cfbmskbits.h"
+#include "fb.h"
void
LeoPolyFillStippledRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
@@ -53,7 +52,7 @@ LeoPolyFillStippledRect(DrawablePtr pDra
if(nrectFill <= 0)
return;
- prgnClip = cfbGetCompositeClip(pGC);
+ prgnClip = fbGetCompositeClip(pGC);
prect = prectInit;
xorg = pDrawable->x;
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 755870c..63f92ab 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
@@ -29,7 +29,7 @@ #include "leo.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
-#include "cfb.h"
+#include "fb.h"
#include "mi.h"
#include "mispans.h"
@@ -48,7 +48,7 @@ LeoFillSpansSolid (DrawablePtr pDrawable
int fg;
int cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0;
- clip = cfbGetCompositeClip(pGC);
+ clip = fbGetCompositeClip(pGC);
numRects = REGION_NUM_RECTS(clip);
if (!numRects)
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 92b46a1..d0e3964 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
@@ -29,7 +29,7 @@ #include "leo.h"
#include "pixmapstr.h"
#include "scrnintstr.h"
-#include "cfb.h"
+#include "fb.h"
#include "mi.h"
#include "mispans.h"
@@ -49,7 +49,7 @@ LeoFillSpansStippled (DrawablePtr pDrawa
unsigned int *bits, msk;
int cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0;
- clip = cfbGetCompositeClip(pGC);
+ clip = fbGetCompositeClip(pGC);
numRects = REGION_NUM_RECTS(clip);
if (!numRects)
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 747865c..73af391 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
@@ -31,7 +31,7 @@ #include "scrnintstr.h"
#include "fontstruct.h"
#include "dixfontstr.h"
-#include "cfb.h"
+#include "fb.h"
#include "mi.h"
void
@@ -51,7 +51,7 @@ LeoPolyGlyphBlt (DrawablePtr pDrawable,
unsigned char *fb;
int height, width;
- clip = cfbGetCompositeClip(pGC);
+ clip = fbGetCompositeClip(pGC);
/* compute an approximate (but covering) bounding box */
box.x1 = 0;
if (ppci[0]->metrics.leftSideBearing < 0)
@@ -76,7 +76,7 @@ LeoPolyGlyphBlt (DrawablePtr pDrawable,
ld0->vclipmax = ((clip->extents.y2 - 1) << 16) | (clip->extents.x2 - 1);
break;
}
- cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase);
+ fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase);
case rgnOUT:
return;
default:
@@ -178,7 +178,7 @@ LeoTEGlyphBlt (DrawablePtr pDrawable, GC
widthGlyph = FONTMAXBOUNDS(pfont,characterWidth);
h = FONTASCENT(pfont) + FONTDESCENT(pfont);
- clip = cfbGetCompositeClip(pGC);
+ clip = fbGetCompositeClip(pGC);
bbox.x1 = x + pDrawable->x;
bbox.x2 = bbox.x1 + (widthGlyph * nglyph);
bbox.y1 = y + pDrawable->y - FONTASCENT(pfont);
@@ -205,7 +205,7 @@ LeoTEGlyphBlt (DrawablePtr pDrawable, GC
x -= pDrawable->x;
y = y - pDrawable->y + FONTASCENT(pfont);
if (pGlyphBase)
- cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, NULL);
+ fbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, NULL);
else
miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pGlyphBase);
case rgnOUT:
commit 68bec674d9ec554379bbd18d4539b34f63eef19c
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:24:00 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/man/sunleo.man b/man/sunleo.man
index 9735f0d..2871ec5 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
@@ -22,7 +22,7 @@ sunleo \- Leo video driver
.fi
.SH DESCRIPTION
.B leo
-is an __xservername__ driver for Sun Leo (ZX) video cards.
+is an XFree86 driver for Sun Leo (ZX) video cards.
.PP
Also known as the ZX or T(urbo)ZX, Leo is a 24 bit accelerated 3D
graphics card. Both cards are double-width, but the TZX also requires
@@ -55,11 +55,11 @@ SPARCcenter 2000
.SH CONFIGURATION DETAILS
You must set "DefaultDepth" to "32" in the Screen Section.
.nf
-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
Driver authors include: Jakub Jelinek <jakub@redhat.com>
.br
diff --git a/src/leo.h b/src/leo.h
index 59714b4..8df9302 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.3 2000/12/01 00:24:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
#ifndef LEO_H
#define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 02e7f82..ee62310 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
#define PSZ 32
diff --git a/src/leo_checks.c b/src/leo_checks.c
index dc04256..e0ad8ab 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 6112169..271a222 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index f8843f3..e5f402a 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -55,8 +55,8 @@ static void LeoAdjustFrame(int scrnIndex
/* Optional functions */
static void LeoFreeScreen(int scrnIndex, int flags);
-static ModeStatus LeoValidMode(int scrnIndex, DisplayModePtr mode,
- Bool verbose, int flags);
+static int LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+ int flags);
void LeoSync(ScrnInfoPtr pScrn);
@@ -108,7 +108,7 @@ static XF86ModuleVersionInfo sunleoVersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
LEO_MAJOR_VERSION, LEO_MINOR_VERSION, LEO_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -667,7 +667,7 @@ LeoFreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static ModeStatus
+static int
LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 004aa29..4f1e854 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index a162fd6..8784acc 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 239d157..755870c 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 8550c9b..92b46a1 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index a233edd..747865c 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_regs.h b/src/leo_regs.h
index 60686a9..e001587 100644
--- a/src/leo_regs.h
+++ b/src/leo_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/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#ifndef LEOREGS_H
#define LEOREGS_H
commit deabb160fb20e71b47c758ff6c737ac94bef88b4
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:48:50 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/sunleo.man b/man/sunleo.man
index 2871ec5..9735f0d 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
@@ -22,7 +22,7 @@ sunleo \- Leo video driver
.fi
.SH DESCRIPTION
.B leo
-is an XFree86 driver for Sun Leo (ZX) video cards.
+is an __xservername__ driver for Sun Leo (ZX) video cards.
.PP
Also known as the ZX or T(urbo)ZX, Leo is a 24 bit accelerated 3D
graphics card. Both cards are double-width, but the TZX also requires
@@ -55,11 +55,11 @@ SPARCcenter 2000
.SH CONFIGURATION DETAILS
You must set "DefaultDepth" to "32" in the Screen Section.
.nf
-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
Driver authors include: Jakub Jelinek <jakub@redhat.com>
.br
diff --git a/src/leo.h b/src/leo.h
index 8df9302..59714b4 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.3 2000/12/01 00:24:35 dawes Exp $ */
#ifndef LEO_H
#define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index ee62310..02e7f82 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.2tsi Exp $ */
#define PSZ 32
diff --git a/src/leo_checks.c b/src/leo_checks.c
index e0ad8ab..dc04256 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 271a222..6112169 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index b15323b..f8843f3 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,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/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -108,7 +108,7 @@ static XF86ModuleVersionInfo sunleoVersR
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
LEO_MAJOR_VERSION, LEO_MINOR_VERSION, LEO_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 4f1e854..004aa29 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 8784acc..a162fd6 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 755870c..239d157 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 92b46a1..8550c9b 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 747865c..a233edd 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_regs.h b/src/leo_regs.h
index e001587..60686a9 100644
--- a/src/leo_regs.h
+++ b/src/leo_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/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#ifndef LEOREGS_H
#define LEOREGS_H
commit f5b71945c039c0c64e4c74f223c561333eca3e16
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:37 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/man/sunleo.man b/man/sunleo.man
index e5807a3..2871ec5 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
diff --git a/src/leo.h b/src/leo.h
index 59714b4..8df9302 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.3 2000/12/01 00:24:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
#ifndef LEO_H
#define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 02e7f82..ee62310 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
#define PSZ 32
diff --git a/src/leo_checks.c b/src/leo_checks.c
index dc04256..e0ad8ab 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 6112169..271a222 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index 5aec87e..b15323b 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,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/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 004aa29..4f1e854 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index a162fd6..8784acc 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 239d157..755870c 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 8550c9b..92b46a1 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index a233edd..747865c 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_regs.h b/src/leo_regs.h
index 60686a9..e001587 100644
--- a/src/leo_regs.h
+++ b/src/leo_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/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#ifndef LEOREGS_H
#define LEOREGS_H
commit 5b396b0eadf5c17f78843829e33a376af09fca72
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/sunleo.man b/man/sunleo.man
index 2871ec5..e5807a3 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
diff --git a/src/leo.h b/src/leo.h
index 8df9302..59714b4 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo.h,v 1.3 2000/12/01 00:24:35 dawes Exp $ */
#ifndef LEO_H
#define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index ee62310..02e7f82 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_accel.c,v 1.2tsi Exp $ */
#define PSZ 32
diff --git a/src/leo_checks.c b/src/leo_checks.c
index e0ad8ab..dc04256 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 271a222..6112169 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index b15323b..5aec87e 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,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/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 4f1e854..004aa29 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frect.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 8784acc..a162fd6 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_frectsp.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 755870c..239d157 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 92b46a1..8550c9b 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 747865c..a233edd 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_regs.h b/src/leo_regs.h
index e001587..60686a9 100644
--- a/src/leo_regs.h
+++ b/src/leo_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/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#ifndef LEOREGS_H
#define LEOREGS_H
commit 4da3e5b0ca4c70a0823ee4f7189a7c20d81d1ac8
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:55 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/sunleo.man b/man/sunleo.man
index 88d1c75..2871ec5 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
diff --git a/src/leo.h b/src/leo.h
index 1427700..8df9302 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
#ifndef LEO_H
#define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index cefb70d..ee62310 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
#define PSZ 32
diff --git a/src/leo_checks.c b/src/leo_checks.c
index dc04256..e0ad8ab 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 6112169..271a222 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index 26de3b7..b15323b 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,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/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/leo_frect.c b/src/leo_frect.c
index f4968a5..4f1e854 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 2840b7d..8784acc 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 239d157..755870c 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 8550c9b..92b46a1 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index a233edd..747865c 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#define PSZ 32
diff --git a/src/leo_regs.h b/src/leo_regs.h
index 60686a9..e001587 100644
--- a/src/leo_regs.h
+++ b/src/leo_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/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
#ifndef LEOREGS_H
#define LEOREGS_H
commit e0e9b92a7dc8df5e71491782f2ed111763d267ff
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/sunleo.man b/man/sunleo.man
index 2871ec5..88d1c75 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
diff --git a/src/leo.h b/src/leo.h
index 8df9302..1427700 100644
--- a/src/leo.h
+++ b/src/leo.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/sunleo/leo.h,v 1.4 2001/05/04 19:05:46 dawes Exp $ */
+/* $XFree86$ */
#ifndef LEO_H
#define LEO_H
diff --git a/src/leo_accel.c b/src/leo_accel.c
index ee62310..cefb70d 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.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/sunleo/leo_accel.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_checks.c b/src/leo_checks.c
index e0ad8ab..dc04256 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.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/sunleo/leo_checks.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_cursor.c b/src/leo_cursor.c
index 271a222..6112169 100644
--- a/src/leo_cursor.c
+++ b/src/leo_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/sunleo/leo_cursor.c,v 1.1 2000/05/18 23:21:39 dawes Exp $ */
+/* $XFree86$ */
#include "leo.h"
diff --git a/src/leo_driver.c b/src/leo_driver.c
index b15323b..26de3b7 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,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/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/leo_frect.c b/src/leo_frect.c
index 4f1e854..f4968a5 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.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/sunleo/leo_frect.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index 8784acc..2840b7d 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.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/sunleo/leo_frectsp.c,v 1.2 2000/05/23 04:47:47 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index 755870c..239d157 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.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/sunleo/leo_fspans.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 92b46a1..8550c9b 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.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/sunleo/leo_fspanssp.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 747865c..a233edd 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.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/sunleo/leo_glyph.c,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 32
diff --git a/src/leo_regs.h b/src/leo_regs.h
index e001587..60686a9 100644
--- a/src/leo_regs.h
+++ b/src/leo_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/sunleo/leo_regs.h,v 1.1 2000/05/18 23:21:40 dawes Exp $ */
+/* $XFree86$ */
#ifndef LEOREGS_H
#define LEOREGS_H
commit cee769c87c686faf003a52aeea6caa513b0ddb5a
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:43 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/man/sunleo.man b/man/sunleo.man
index 513cf10..2871ec5 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.2 2001/01/27 18:20:54 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/sunleo.man,v 1.3 2003/07/16 00:50:13 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNLEO __drivermansuffix__ __vendorversion__
@@ -11,20 +11,56 @@ sunleo \- Leo video driver
.B " Driver \*qsunleo\*q"
\ \ ...
.B EndSection
+
+.B "Section \*qScreen\*q"
+\ \ ...
+.BI " Device \*q" devname \*q
+\ \ ...
+.B " DefaultDepth 32"
+\ \ ...
+.B EndSection
.fi
.SH DESCRIPTION
.B leo
is an XFree86 driver for Sun Leo (ZX) video cards.
-THIS MAN PAGE NEEDS TO BE FILLED IN.
+.PP
+Also known as the ZX or T(urbo)ZX, Leo is a 24 bit accelerated 3D
+graphics card. Both cards are double-width, but the TZX also requires
+extra cooling in the form of an additional double-width fan card, so
+effectively takes up 4 SBus slots.
+
.SH SUPPORTED HARDWARE
The
.B leo
-driver supports...
+driver supports all Sun stations that include a Leo chipset:
+.PP
+.B Workstations:
+.RS 4
+.PP
+Sun 4/15, 4/30, 4/75
+.br
+SPARCstation 5, 10, 20
+.br
+Ultra 1, 1E, 2
+.RE
+.PP
+.B Servers:
+.RS 4
+.PP
+SPARCserver 1000,
+.br
+SPARCcenter 2000
+.RE
+
.SH CONFIGURATION DETAILS
+You must set "DefaultDepth" to "32" in the Screen Section.
+.nf
Please refer to XF86Config(__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__)
.SH AUTHORS
-Authors include: Jakub Jelinek <jakub@redhat.com>
+Driver authors include: Jakub Jelinek <jakub@redhat.com>
+.br
+Man page: Arnaud Quette <arnaud.quette@mgeups.com>
diff --git a/src/leo_driver.c b/src/leo_driver.c
index e5f402a..b15323b 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,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/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.9 2003/10/30 17:37:12 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -55,8 +55,8 @@ static void LeoAdjustFrame(int scrnIndex
/* Optional functions */
static void LeoFreeScreen(int scrnIndex, int flags);
-static int LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus LeoValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
void LeoSync(ScrnInfoPtr pScrn);
@@ -667,7 +667,7 @@ LeoFreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
LeoValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
Reply to: