Update to xf86-video-rendition 4.2.6.

No actual source code changes since they were already pulled from
upstreams before this driver version was released.

3 files changed, 73 insertions, 38 deletions

diff --git a/driver/xf86-video-rendition/ChangeLog b/driver/xf86-video-rendition/ChangeLog
index b80edc272..0907237bc 100644
--- a/driver/xf86-video-rendition/ChangeLog
+++ b/driver/xf86-video-rendition/ChangeLog
@@ -1,3 +1,38 @@
+commit 367efbf6ecd1bae7e59ba92a29700a2f93c9ebd9
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Nov 11 12:03:52 2015 -0500
+
+    rendition 4.2.6
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit df5646745bf563bb36a0db1796c318fe64bf8efe
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Sep 30 10:24:18 2014 -0400
+
+    Remove dependency on xf86PciInfo.h
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 30a4b73644ee22904824d4847e44ca69369fad02
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Sep 30 10:21:58 2014 -0400
+
+    Fix build against xserver 1.17
+    
+    Also port from pci_device_map_region to pci_device_map_range.  Somewhat
+    alarming that the previous code was using map_region but unmap_range...
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 3a3ee1c45e54a808947cc26ca11f0a5299571053
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Sep 25 08:54:50 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
 commit 07026400300a985ea19346a6745685bb8dfea56f
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Tue Jul 17 16:05:09 2012 +1000
diff --git a/driver/xf86-video-rendition/README b/driver/xf86-video-rendition/README
index a1d247094..02c0a9bac 100644
--- a/driver/xf86-video-rendition/README
+++ b/driver/xf86-video-rendition/README
@@ -1,6 +1,6 @@
   Information for Rendition (Micron) Verite Users
   The XFree86 Project Inc.
-  9 June 2000, last update by Dejan Ilic  <dejan.ilic@home.se>
+  9 June 2000, last update by Dejan Ilic "dejan.ilic@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 @@
 
   ______________________________________________________________________
 
-  1.  Supported hardware
+  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).
 
 
-  2.  Limitations
+  2.  Limitations
 
   V1000 cards can only work as primary display card due to hardware
   limitations.
@@ -42,7 +42,7 @@
 
 
 
-  3.  Important notices
+  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.
 
-  4.  Features
+  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)
 
 
-  5.  xorg.conf Option
+  5.  xorg.conf Option
 
 
-     Option
+     Option
         Disables use of the hardware cursor.
 
-     Option
+     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.
 
-     DacSpeed
+     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.
 
-     Option
+     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.
 
-     Option
+     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.
 
-     Option
+     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.
 
-     Option
+     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.
 
 
-  6.  News in the X11R6.8 release
+  6.  News in the X11R7.5 release
 
   This driver was originally part of the XFree86 4.4 rc2 release.
 
 
-  7.  News in the XFree86 4.1 release
+  7.  News in the XFree86 4.1 release
 
 
-  +o  DirectColor support
+  o  DirectColor support
 
-  +o  SilkenMouse support
+  o  SilkenMouse support
 
 
-  8.  Major changes in this release
+  8.  Major changes in this release
 
 
-  +o  Gamma works now for >8bpp
+  o  Gamma works now for >8bpp
 
 
-  9.  Bugfixes
+  9.  Bugfixes
 
 
-  +o  Only some code cleanup done. No real bugfixes.
+  o  Only some code cleanup done. No real bugfixes.
 
 
-  10.  Known problems in current driver
+  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.
 
 
-  11.  Work in progress (not finished in time for release)
+  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/driver/xf86-video-rendition/configure.ac b/driver/xf86-video-rendition/configure.ac
index 4adf28048..bcb66d513 100644
--- a/driver/xf86-video-rendition/configure.ac
+++ b/driver/xf86-video-rendition/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-rendition],
-        [4.2.5],
+        [4.2.6],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-rendition])
 AC_CONFIG_SRCDIR([Makefile.am])