.gitignore | 70 +++++++++++++++++++++++++++--- COPYING | 29 ++++++------ Makefile.am | 16 ++---- README | 74 +++++++++++++++---------------- README.sgml | 116 -------------------------------------------------- configure.ac | 17 +++---- debian/README.source | 2 debian/changelog | 31 +++++++++++++ debian/control | 10 +--- debian/rules | 10 ++-- debian/xsfbs/xsfbs.mk | 35 +++++++++------ man/.cvsignore | 2 man/Makefile.am | 41 ++++++++--------- src/.cvsignore | 6 -- src/rendition.h | 3 - src/vmodes.c | 4 - 16 files changed, 213 insertions(+), 253 deletions(-)
New commits: commit 5e87c7d6bcc4007487a9ea88ed709f0b2031283c Author: Christopher James Halse Rogers <[email protected]> Date: Wed Aug 4 11:16:47 2010 +1000 Add changelog entry for 4.2.4 diff --git a/debian/changelog b/debian/changelog index 98a2eaa..c975254 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-rendition (1:4.2.4-1) UNRELEASED; urgency=low + + * New upstream release + - Fix build against Xserver 1.9, which dropped ISA support and mibank.h + * Bump Standards-Version to 3.9.1 + + -- Christopher James Halse Rogers <[email protected]> Wed, 04 Aug 2010 11:06:48 +1000 + xserver-xorg-video-rendition (1:4.2.3-3) unstable; urgency=low * Really perform the ${xviddriver:Depends} change mentioned in the diff --git a/debian/control b/debian/control index 959a7d2..d8ae5a4 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: libtool, xutils-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-rendition Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-rendition.git commit 0bf606d19d9357ffc5ccffe90279453d39c259ac Author: Dave Airlie <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 "[email protected]" - -<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 <[email protected]> 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 <[email protected]> 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 <[email protected]> + 9 June 2000, last update by Dejan Ilic "[email protected]" ____________________________________________________________ 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>[email protected]</email> - -<ident> -</ident> +<date>9 June 2000, last update by Dejan Ilic "[email protected]" <toc> commit 20f1bf342474973a4bb57551482f12b632fd948e Author: Gaetan Nadon <[email protected]> Date: Sun Jun 13 10:12:24 2010 -0400 COPYING: update file with Copyright notices from source code. Signed-off-by: Gaetan Nadon <[email protected]> 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 <[email protected]> Date: Tue May 18 13:08:36 2010 -0400 Remove mibank.h reference Signed-off-by: Adam Jackson <[email protected]> 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 94cc5c9ad3e7b228557492b1f0f45dd3cd10dec0 Author: Mikhail Gusarov <[email protected]> Date: Fri May 7 18:58:58 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 0a457f8..959a7d2 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,5 @@ Description: X.Org X server -- Rendition display driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-video-rendition driver module. commit 47ae11d9333b165b5e221f2fc24fa2bb8354e21d Author: Cyril Brulebois <[email protected]> Date: Mon May 3 23:52:55 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 22b535c..98a2eaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-rendition (1:4.2.3-3) UNRELEASED; urgency=low +xserver-xorg-video-rendition (1:4.2.3-3) unstable; urgency=low * Really perform the ${xviddriver:Depends} change mentioned in the previous entry. - -- Cyril Brulebois <[email protected]> Mon, 03 May 2010 23:51:28 +0200 + -- Cyril Brulebois <[email protected]> Mon, 03 May 2010 23:52:46 +0200 xserver-xorg-video-rendition (1:4.2.3-2) unstable; urgency=low commit c23128fb37df271b303689308806349596b5ea25 Author: Cyril Brulebois <[email protected]> Date: Mon May 3 23:52:22 2010 +0200 Really perform the ${xviddriver:Depends} change mentioned in the previous entry. diff --git a/debian/changelog b/debian/changelog index c573a92..22b535c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-rendition (1:4.2.3-3) UNRELEASED; urgency=low + + * Really perform the ${xviddriver:Depends} change mentioned in the + previous entry. + + -- Cyril Brulebois <[email protected]> Mon, 03 May 2010 23:51:28 +0200 + xserver-xorg-video-rendition (1:4.2.3-2) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index e184a61..0a457f8 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, @@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-renditi Package: xserver-xorg-video-rendition Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Provides: ${xviddriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-rendition Conflicts: xserver-xorg-driver-rendition commit 7aa2e845fb7cede1d3e8928eb76e1ac7261d578b Author: Cyril Brulebois <[email protected]> Date: Mon May 3 23:44:42 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 3f8bded..c573a92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-rendition (1:4.2.3-2) UNRELEASED; urgency=low +xserver-xorg-video-rendition (1:4.2.3-2) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -12,7 +12,7 @@ xserver-xorg-video-rendition (1:4.2.3-2) UNRELEASED; urgency=low * Add myself to Uploaders. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). - -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:19:19 +0100 + -- Cyril Brulebois <[email protected]> Mon, 03 May 2010 23:44:33 +0200 xserver-xorg-video-rendition (1:4.2.3-1) experimental; urgency=low commit 5fa6e5bcd7a33603e10e6eb0c5899cb7ad45b81e Author: Cyril Brulebois <[email protected]> Date: Mon May 3 23:44:22 2010 +0200 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index fc18792..3f8bded 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-rendition (1:4.2.3-2) UNRELEASED; urgency=low ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:19:19 +0100 diff --git a/debian/control b/debian/control index 12d2cc6..e184a61 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: libtool, xutils-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-rendition Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-rendition.git commit 19fed1d7247da2694c1f26b08e13d6f7cc51a95c Author: Cyril Brulebois <[email protected]> Date: Mon May 3 23:44:14 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 5cb2373..fc18792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-rendition (1:4.2.3-2) UNRELEASED; urgency=low * Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. + * Add myself to Uploaders. -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:19:19 +0100 diff --git a/debian/control b/debian/control index ed1c258..12d2cc6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-rendition Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 28269c8b77f7a1b63f99195182732b07989641c9 Author: Cyril Brulebois <[email protected]> Date: Mon May 3 23:43:52 2010 +0200 Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. diff --git a/debian/changelog b/debian/changelog index bd537eb..5cb2373 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ xserver-xorg-video-rendition (1:4.2.3-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:19:19 +0100 xserver-xorg-video-rendition (1:4.2.3-1) experimental; urgency=low commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit 1ad884fd1a56319bbb6c16c7c5a727993ea5cd65 Author: Julien Cristau <[email protected]> Date: Sat Jan 23 01:46:34 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 016cc0f..4f66f22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:10 +0200 diff --git a/debian/control b/debian/control index bc78e9b..ed1c258 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-rendition Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 9a1963c8d3f18a029ac692468b66e47b92ba4c1b Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:47 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index 47b45cb..016cc0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ xserver-xorg-video-rendition (1:4.2.3-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:10 +0200 xserver-xorg-video-rendition (1:4.2.1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 7d866b2..46ad7a4 100755 --- a/debian/rules +++ b/debian/rules @@ -37,12 +37,12 @@ build-stamp: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: xsfclean @@ -54,7 +54,7 @@ clean: xsfclean rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f aclocal.m4 config.guess config.sub config.h.in configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs rm -f $$(find -name Makefile.in) @@ -67,7 +67,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi commit e1331ecf64d45de97abc026f0872948b1601570f Author: Alan Coopersmith <[email protected]> Date: Fri Jan 15 13:54:42 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> 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 @@ # -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
