.gitignore | 70 +++++++++++++++++++++++++++++---
COPYING | 28 +++++++++----
Makefile.am | 18 ++------
README | 74 +++++++++++++++++-----------------
README.sgml | 116 ------------------------------------------------------
configure.ac | 16 +++----
man/.cvsignore | 2
man/Makefile.am | 41 ++++++++-----------
man/rendition.man | 2
src/.cvsignore | 6 --
src/rendition.c | 85 ---------------------------------------
src/rendition.h | 8 ---
src/vmodes.c | 4 -
13 files changed, 161 insertions(+), 309 deletions(-)
New commits:
commit 0bf606d19d9357ffc5ccffe90279453d39c259ac
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Jul 5 14:56:30 2010 +1000
rendition 4.2.4
diff --git a/configure.ac b/configure.ac
index 0792329..5091e50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.3,
+ 4.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
commit 5cdbc08be474d592bdc8a6ed4eff1e64d55098e8
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Jun 13 20:02:08 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 310cd3d..4c278ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,6 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = README.sgml
-
.PHONY: ChangeLog INSTALL
INSTALL:
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index eeb9781..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-<title>Information for Rendition (Micron) Verité Users
-<author>The XFree86 Project Inc.
-<date>9 June 2000, last update by Dejan Ilic "dejan.i...@home.se"
-
-<toc>
-
-<sect>Supported hardware <p>
-All cards based on the V1000 or the V2x00 should be supported. The server
-was tested on a miroCRYSTAL VRX (V1000), Intergraph Intense-100 3D (V1000),
Diamond Stealth II S220 (V2100), Hercules Thriller3D (V2200), Innovision
Warrior3D (V2200) and Genoa V-Raptor (v2200).
-
-<sect>Limitations <p>
-V1000 cards can only work as primary display card due to hardware limitations.
<p>
-V2x00 cards can work even if not primary, but primary display card will be
disabled when server is run. This is a driver limitation.<p>
-Hopefully these limitations were worked around and fixed before final XFree86
4.0 release.<p>
-
-<sect>Important notices <p>
-Some V1000-based video cards are known to lock up the computer if you have
write-combine activated. Disabling it removes the problem. Look for settings in
the motherboards BIOS and disable ALL settings that has to do with
write-combine (usually called USWC or just WC for short). <p>
-
-15 bits per pixel is only supported on V1000-based cards due to hardware
limitations on V2x00 chipsets.<p>
-
-If you have problems with hardware cursor use the "sw_cursor" option to revert
back to software cursor.<p>
-
-This is essentially a port of XFree86 3.3.x driver to the new XFree86
-4.0 API, and thus we have put most of effort in making a working driver
-with the most basic features. Support for multi-head support and
-acceleration are next on the list of features to be included.<p>
-
-<sect>Features <p>
-<itemize>
-<item>Hardware acceleration
-<item>Hardware cursor
-<item>Supported color depths
-<itemize>
-<item>8 bits per pixel (256 pseudo colour)
-<item>15 bits per pixel (actually 16-bits with RGB-weight 555, 32768 colors)
-<item>16 bits per pixel (high colour, RGB-weight 565, 65536 colors)
-<item>32 bits per pixel (true colour, sparse 24bit, 16M colors)
-</itemize>
-</itemize>
-
-<sect>xorg.conf Option <p>
-<descrip>
-<tag>Option "SW_Cursor"</tag>
-Disables use of the hardware cursor.
-<tag>Option "Overclock_Mem"</tag>
-Run the memory at a higher clock. Useful on some cards with display glitches
-at higher resolutions. But adds the risk to damage the hardware. Use with
-caution.
-<tag>DacSpeed "MHz"</tag>
-Set custom ramdac limit. We have currently no way of knowing if the v2x00 chip
is a v2100 (170MHz) or v2200 (203MHz and 230MHz) so we assume the lowest. Use
this option to manually override the value.
-<tag>Option "FramebufferWC"</tag>
-If writecombine is disabled in BIOS, and you add this option in configuration
file, then the driver will try to request writecombined access to the
framebuffer. This can drastically increase the performance on unaccelerated
server. Requires that "MTRR"-support is compiled into the OS-kernel.
-<tag>Option "NoDDC"</tag>
-Disable probing of DDC-information from your monitor. This information is
-not used yet and is only there for informational purposes. This might
-have changed before final XFree86 4.0 release. Safe to disable if you
experience
-problems during startup of X-server.
-<tag>Option "ShadowFB"</tag>
-If this option is enabled, the driver will cause the CPU to do each drawing
-operation first into a shadow frame buffer in system virtual memory and then
-copy the result into video memory.
-If this option is not active, the CPU will draw directly into video memory.
-Enabling this option is beneficial for those systems where reading from video
-memory is, on average, slower than the corresponding read/modify/write
-operation in system virtual memory.
-This is normally the case for PCI or AGP adapters, and, so, this option is
-enabled by default unless acceleration is enabled.
-<tag>Option "Rotate"</tag>
-The option expect a value "CW" for clockwise or "CCW" for counterclockwise
rotation of the screen. This is useful when you need more height then width on
the screen. Desktop publishing is one example where a monitor could display the
whole page at once on a monitor laying on the side.
-Notice that this option requires "ShadowFB" and automatically enable it. It
also disables the acceleration.
-The option is not activated by default.
-</descrip>
-
-<sect>News in the X11R&relvers; release<p>
-This driver was originally part of the XFree86 4.4 rc2 release.
-
-<sect>News in the XFree86 4.1 release <p>
-<itemize>
-<item>DirectColor support
-<item>SilkenMouse support
-</itemize>
-
-<sect>Major changes in this release <p>
-<itemize>
-<item>Gamma works now for >8bpp
-</itemize>
-
-<sect>Bugfixes<p>
-<itemize>
-<item>Only some code cleanup done. No real bugfixes.
-</itemize>
-
-<sect>Known problems in current driver<p>
-<itemize>
-<item>The acceleration code hangs the computer during X-server startup.
-<item>DDC-probing does not work correctly yet. No DDC information is found.
-<item>Switching from display to VC and back to display can lock up V2x00 cards.
-<item>When scrolling the virtual display on a V1000 card parts of the screen
will become distorted. Problem disappears when you continue moving around.
V2x00 does not exhibit this problem. Probably a bug in the driver rather than a
limitation of the chip.
-<item>Depth 15 & 16 has problems with colors when DirectColor is used.
-</itemize>
-
-<sect>Work in progress (not finished in time for release) <p>
-<itemize>
-<item>Acceleration is disabled for the moment. If you want to play with it
enable the "USE_ACCEL" define in rendition.c file! Beware as it has several
bugs left to clear out before if is stable for general use.
-</itemize>
-
-</article>
-
diff --git a/configure.ac b/configure.ac
index 8c4e265..0792329 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=rendition
AC_SUBST([DRIVER_NAME])
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
commit a5e5a286ca62f2d6e32c83aba02d58ae8e828a35
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Jun 13 19:57:01 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/README b/README
index a1d2470..02c0a9b 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Information for Rendition (Micron) Verite Users
The XFree86 Project Inc.
- 9 June 2000, last update by Dejan Ilic <dejan.i...@home.se>
+ 9 June 2000, last update by Dejan Ilic "dejan.i...@home.se"
____________________________________________________________
Table of Contents
@@ -11,7 +11,7 @@
3. Important notices
4. Features
5. xorg.conf Option
- 6. News in the X11R6.8 release
+ 6. News in the X11R7.5 release
7. News in the XFree86 4.1 release
8. Major changes in this release
9. Bugfixes
@@ -21,7 +21,7 @@
______________________________________________________________________
- [1m1. Supported hardware[0m
+ 1. Supported hardware
All cards based on the V1000 or the V2x00 should be supported. The
server was tested on a miroCRYSTAL VRX (V1000), Intergraph Intense-100
@@ -29,7 +29,7 @@
(V2200), Innovision Warrior3D (V2200) and Genoa V-Raptor (v2200).
- [1m2. Limitations[0m
+ 2. Limitations
V1000 cards can only work as primary display card due to hardware
limitations.
@@ -42,7 +42,7 @@
- [1m3. Important notices[0m
+ 3. Important notices
Some V1000-based video cards are known to lock up the computer if you
have write-combine activated. Disabling it removes the problem. Look
@@ -64,57 +64,57 @@
driver with the most basic features. Support for multi-head support
and acceleration are next on the list of features to be included.
- [1m4. Features[0m
+ 4. Features
- +o Hardware acceleration
+ o Hardware acceleration
- +o Hardware cursor
+ o Hardware cursor
- +o Supported color depths
+ o Supported color depths
- +o 8 bits per pixel (256 pseudo colour)
+ o 8 bits per pixel (256 pseudo colour)
- +o 15 bits per pixel (actually 16-bits with RGB-weight 555, 32768
+ o 15 bits per pixel (actually 16-bits with RGB-weight 555, 32768
colors)
- +o 16 bits per pixel (high colour, RGB-weight 565, 65536 colors)
+ o 16 bits per pixel (high colour, RGB-weight 565, 65536 colors)
- +o 32 bits per pixel (true colour, sparse 24bit, 16M colors)
+ o 32 bits per pixel (true colour, sparse 24bit, 16M colors)
- [1m5. xorg.conf Option[0m
+ 5. xorg.conf Option
- [1mOption[0m
+ Option
Disables use of the hardware cursor.
- [1mOption[0m
+ Option
Run the memory at a higher clock. Useful on some cards with
display glitches at higher resolutions. But adds the risk to
damage the hardware. Use with caution.
- [1mDacSpeed[0m
+ DacSpeed
Set custom ramdac limit. We have currently no way of knowing if
the v2x00 chip is a v2100 (170MHz) or v2200 (203MHz and 230MHz)
so we assume the lowest. Use this option to manually override
the value.
- [1mOption[0m
+ Option
If writecombine is disabled in BIOS, and you add this option in
configuration file, then the driver will try to request
writecombined access to the framebuffer. This can drastically
increase the performance on unaccelerated server. Requires that
"MTRR"-support is compiled into the OS-kernel.
- [1mOption[0m
+ Option
Disable probing of DDC-information from your monitor. This
information is not used yet and is only there for informational
purposes. This might have changed before final XFree86 4.0
release. Safe to disable if you experience problems during
startup of X-server.
- [1mOption[0m
+ Option
If this option is enabled, the driver will cause the CPU to do
each drawing operation first into a shadow frame buffer in
system virtual memory and then copy the result into video
@@ -126,7 +126,7 @@
for PCI or AGP adapters, and, so, this option is enabled by
default unless acceleration is enabled.
- [1mOption[0m
+ Option
The option expect a value "CW" for clockwise or "CCW" for
counterclockwise rotation of the screen. This is useful when you
need more height then width on the screen. Desktop publishing is
@@ -137,54 +137,54 @@
default.
- [1m6. News in the X11R6.8 release[0m
+ 6. News in the X11R7.5 release
This driver was originally part of the XFree86 4.4 rc2 release.
- [1m7. News in the XFree86 4.1 release[0m
+ 7. News in the XFree86 4.1 release
- +o DirectColor support
+ o DirectColor support
- +o SilkenMouse support
+ o SilkenMouse support
- [1m8. Major changes in this release[0m
+ 8. Major changes in this release
- +o Gamma works now for >8bpp
+ o Gamma works now for >8bpp
- [1m9. Bugfixes[0m
+ 9. Bugfixes
- +o Only some code cleanup done. No real bugfixes.
+ o Only some code cleanup done. No real bugfixes.
- [1m10. Known problems in current driver[0m
+ 10. Known problems in current driver
- +o The acceleration code hangs the computer during X-server startup.
+ o The acceleration code hangs the computer during X-server startup.
- +o DDC-probing does not work correctly yet. No DDC information is
+ o DDC-probing does not work correctly yet. No DDC information is
found.
- +o Switching from display to VC and back to display can lock up V2x00
+ o Switching from display to VC and back to display can lock up V2x00
cards.
- +o When scrolling the virtual display on a V1000 card parts of the
+ o When scrolling the virtual display on a V1000 card parts of the
screen will become distorted. Problem disappears when you continue
moving around. V2x00 does not exhibit this problem. Probably a bug
in the driver rather than a limitation of the chip.
- +o Depth 15 & 16 has problems with colors when DirectColor is used.
+ o Depth 15 & 16 has problems with colors when DirectColor is used.
- [1m11. Work in progress (not finished in time for release)[0m
+ 11. Work in progress (not finished in time for release)
- +o Acceleration is disabled for the moment. If you want to play with
+ o Acceleration is disabled for the moment. If you want to play with
it enable the "USE_ACCEL" define in rendition.c file! Beware as it
has several bugs left to clear out before if is stable for general
use.
diff --git a/README.sgml b/README.sgml
index 4439a7f..eeb9781 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,14 +1,11 @@
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
]>
<article>
<title>Information for Rendition (Micron) Verité Users
<author>The XFree86 Project Inc.
-<date>9 June 2000, last update by Dejan Ilic <email>dejan.i...@home.se</email>
-
-<ident>
-</ident>
+<date>9 June 2000, last update by Dejan Ilic "dejan.i...@home.se"
<toc>
commit 20f1bf342474973a4bb57551482f12b632fd948e
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Jun 13 10:12:24 2010 -0400
COPYING: update file with Copyright notices from source code.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/COPYING b/COPYING
index c513618..d2d7873 100644
--- a/COPYING
+++ b/COPYING
@@ -1,23 +1,24 @@
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
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 the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, 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 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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 XFree86 Project 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
+XFree86 Project.
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
commit 432cefce7e61b8445bbac284f0342c153bdfdcc4
Author: Adam Jackson <a...@redhat.com>
Date: Tue May 18 13:08:36 2010 -0400
Remove mibank.h reference
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/src/rendition.h b/src/rendition.h
index ba0a22e..0ea5cca 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -31,9 +31,6 @@
/* All drivers implementing backing store need this */
#include "mibstore.h"
-/* Drivers using the mi banking wrapper need this */
-#include "mibank.h"
-
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
commit e1331ecf64d45de97abc026f0872948b1601570f
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 15 13:54:42 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..8f2454b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# 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.
+#
+# 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
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# 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 NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS 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.
#
drivermandir = $(DRIVER_MAN_DIR)
commit 1d797c290be858b124e05cf1573db0cfc55db5b3
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.li...@gmail.com>
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8b1e4ad..8c4e265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
commit 957c7dd21e57184a576f301ecafd96819e3d71d2
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 0250b0f..310cd3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
if BUILD_LINUXDOC
README: README.sgml
commit 674b9fa5f40fd99c9904a21cda8d89699d64863a
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a40a960..0250b0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
if BUILD_LINUXDOC
commit c3769b5a338b006074dae5f2fdac2ede21db6fd9
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index 5b04139..a40a960 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,12 @@ endif
EXTRA_DIST = README.sgml
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 2c42570..8b1e4ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit db9f696aecc5153e6266e9afb2d2520493c81d7b
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Oct 26 12:54:21 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/Makefile.am b/Makefile.am
index 5de2a4a..5b04139 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,6 @@ endif
EXTRA_DIST = README.sgml
-CLEANFILES = ChangeLog
-
.PHONY: ChangeLog
ChangeLog:
diff --git a/configure.ac b/configure.ac
index e209b16..2c42570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running
autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -82,10 +88,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=rendition
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
XORG_CHECK_LINUXDOC
AC_OUTPUT([
commit 3a8fcd130e54099936a2641d4515adae3426a237
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..af0855f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,78 @@
-Makefile
-Makefile.in
-*.la
-*.lo
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-stamp-h1
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for xf86-video-rendition
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit f480933cfcc683aba19b679a6d532828eeb2eaa9
Author: Matt Turner <matts...@gmail.com>
Date: Sat Nov 7 00:34:00 2009 -0500
Use usleep instead of xf86UDelay
Signed-off-by: Matt Turner <matts...@gmail.com>
diff --git a/src/vmodes.c b/src/vmodes.c
index 5faf257..c0bd0df 100644
--- a/src/vmodes.c
+++ b/src/vmodes.c
@@ -395,14 +395,14 @@ verite_restore(ScrnInfoPtr pScreenInfo, RenditionRegPtr
reg)
if (pRendition->board.chip == V1000_DEVICE) {
/* fixme */
set_PLL(iob, reg->pclkpll);
- xf86UDelay(10000);
+ usleep(10000);
} else {
verite_out32(iob+PCLKPLL,reg->pclkpll);
/*
* Need to wait 200uS for PLL to stabilize --
* let's play it safe with 500
*/
- xf86UDelay(10000);
+ usleep(10000);
/* wait until VBLANK */
while ((verite_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) !=
CRTCSTATUS_VERT_ACTIVE);
commit db962650a038c48b7113eedfebf011cdc4829946
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
xf86-video-rendition: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit 2d62a81b452641999207c0576a08d82aee41cf06
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 7 14:42:11 2009 +1000
rendition 4.2.3
diff --git a/configure.ac b/configure.ac
index 84e5c7b..e209b16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.2,
+ 4.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
commit 47b68f542c836a76f4adb0d7951b7f0b6aaeabd1
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
rendition: change to using ABI version check
diff --git a/src/rendition.h b/src/rendition.h
index 84809fa..ba0a22e 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,7 +37,7 @@
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
commit d9e34c59faf63162f18dc87f599e36de024f557c
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:32:35 2009 +1000
rendition: update for resources/RAC API removal
diff --git a/src/rendition.c b/src/rendition.c
index db62f8e..7a9e18b 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
pRendition->PciInfo->device, pRendition->PciInfo->func);
-#endif
/*
* XXX This could be refined if some VGA memory resources are not
@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive))
return FALSE;
+
/* Operations for which memory access is required. */
pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
/* Operations for which I/O access is required. (XXX Check this) */
pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR |
RAC_VIEWPORT;
-
+#endif
/* determine depth, bpp, etc. */
if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
return FALSE;
diff --git a/src/rendition.h b/src/rendition.h
index 2b43cba..84809fa 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,11 +37,13 @@
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
+#ifndef XSERVER_LIBPCIACCESS
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
/* Several predefined resource lists */
#include "xf86Resources.h"
+#endif
/* Needed by the Shadow Framebuffer */
#include "shadowfb.h"
commit 2013e650484bd66c238a497f241c23d82361e49e
Author: Adam Jackson <a...@redhat.com>
Date: Thu Jul 2 11:28:29 2009 -0400
rendition 4.2.2
diff --git a/configure.ac b/configure.ac
index d69aef2..84e5c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.1,
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ogsbk-0006xj...@alioth.debian.org
