xserver-xorg-video-intel: Changes to 'debian-unstable'
ChangeLog | 176 ++++++
Makefile.in | 139 ++--
aclocal.m4 | 684 ++++++++++++++++--------
config.h.in | 9
configure | 1180 +++++++++++++++++++++++++-----------------
configure.ac | 12
debian/changelog | 8
depcomp | 64 ++
install-sh | 348 +++++++++---
ltmain.sh | 233 +++++---
man/Makefile.in | 106 +--
man/intel.man | 2
missing | 61 +-
mkinstalldirs | 5
src/Makefile.am | 1
src/Makefile.in | 243 ++++----
src/bios_reader/Makefile.in | 135 ++--
src/bios_reader/bios_dumper.c | 3
src/ch7017/Makefile.in | 130 ++--
src/ch7xxx/Makefile.in | 130 ++--
src/common.h | 12
src/i810.h | 4
src/i810_reg.h | 8
src/i830.h | 18
src/i830_bios.h | 3
src/i830_crt.c | 140 ++--
src/i830_display.c | 103 +++
src/i830_display.h | 4
src/i830_driver.c | 3
src/i830_lvds.c | 117 ++--
src/i830_memory.c | 57 +-
src/i830_quirks.c | 84 ++
src/i830_shadow.c | 253 ---------
src/i830_tv.c | 28
src/i965_render.c | 16
src/ivch/Makefile.in | 133 ++--
src/reg_dumper/Makefile.in | 149 ++---
src/sil164/Makefile.in | 131 ++--
src/tfp410/Makefile.in | 131 ++--
src/xvmc/Makefile.in | 139 ++--
40 files changed, 3029 insertions(+), 2173 deletions(-)
New commits:
commit b4b6ac3c013a47a17745984e3b1b9356614283c4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 14 12:50:31 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 19ad307..8e67403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.1.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.1.1-1) unstable; urgency=low
* New upstream release.
+ manpage typo fixed (closes: #432061). Thanks, A Costa!
+ adds quirk for TV output on some 965-based laptops (closes: #434297).
- -- Julien Cristau <jcristau@debian.org> Tue, 14 Aug 2007 12:25:47 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 14 Aug 2007 12:48:02 +0200
xserver-xorg-video-intel (2:2.1.0-2) unstable; urgency=low
commit 6ec7dfd40a897615395af0f9e2e433aacc86746e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 14 12:47:53 2007 +0200
Delete obsolete file.
diff --git a/src/i830_shadow.c b/src/i830_shadow.c
deleted file mode 100644
index 93c72c5..0000000
--- a/src/i830_shadow.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
-
-/*
- Copyright (c) 1999,2000 The XFree86 Project Inc.
- based on code written by Mark Vojkovich <markv@valinux.com>
-*/
-
-/*
- * Ported from the savage driver to the I830 by
- * Helmar Spangenberg <hspangenberg@frey.de> and Dima Dorfman
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "xf86.h"
-#include "i830.h"
-#include "shadowfb.h"
-#include "servermd.h"
-
-
-void
-I830RefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
-{
- I830Ptr pI830 = I830PTR(pScrn);
- int width, height, Bpp, FBPitch;
- unsigned char *src, *dst;
-
- Bpp = pScrn->bitsPerPixel >> 3;
- FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
-
- while(num--) {
- width = (pbox->x2 - pbox->x1) * Bpp;
- height = pbox->y2 - pbox->y1;
- src = pI830->shadowPtr + (pbox->y1 * pI830->shadowPitch) +
- (pbox->x1 * Bpp);
- dst = pI830->FbBase + (pbox->y1 * FBPitch) + (pbox->x1 * Bpp);
-
- while(height--) {
- memcpy(dst, src, width);
- dst += FBPitch;
- src += pI830->shadowPitch;
- }
-
- pbox++;
- }
-}
-
-
-void
-I830PointerMoved(int index, int x, int y)
-{
- ScrnInfoPtr pScrn = xf86Screens[index];
- I830Ptr pI830 = I830PTR(pScrn);
- int newX, newY;
-
- if(pI830->rotate == 1) {
- newX = pScrn->pScreen->height - y - 1;
- newY = x;
- } else {
- newX = y;
- newY = pScrn->pScreen->width - x - 1;
- }
-
- (*pI830->PointerMoved)(index, newX, newY);
-}
-
-void
-I830RefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
-{
- I830Ptr pI830 = I830PTR(pScrn);
- int count, width, height, y1, y2, dstPitch, srcPitch;
- CARD8 *dstPtr, *srcPtr, *src;
- CARD32 *dst;
-
- dstPitch = pScrn->displayWidth;
- srcPitch = -pI830->rotate * pI830->shadowPitch;
-
- while(num--) {
- width = pbox->x2 - pbox->x1;
- y1 = pbox->y1 & ~3;
- y2 = (pbox->y2 + 3) & ~3;
- height = (y2 - y1) >> 2; /* in dwords */
-
- if(pI830->rotate == 1) {
- dstPtr = pI830->FbBase +
- (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
- srcPtr = pI830->shadowPtr + ((1 - y2) * srcPitch) + pbox->x1;
- } else {
- dstPtr = pI830->FbBase +
- ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
- srcPtr = pI830->shadowPtr + (y1 * srcPitch) + pbox->x2 - 1;
- }
-
- while(width--) {
- src = srcPtr;
- dst = (CARD32*)dstPtr;
- count = height;
- while(count--) {
- *(dst++) = src[0] | (src[srcPitch] << 8) |
- (src[srcPitch * 2] << 16) |
- (src[srcPitch * 3] << 24);
- src += srcPitch * 4;
- }
- srcPtr += pI830->rotate;
- dstPtr += dstPitch;
- }
-
- pbox++;
- }
-}
-
-
-void
-I830RefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
-{
- I830Ptr pI830 = I830PTR(pScrn);
- int count, width, height, y1, y2, dstPitch, srcPitch;
- CARD16 *dstPtr, *srcPtr, *src;
- CARD32 *dst;
-
- dstPitch = pScrn->displayWidth;
- srcPitch = -pI830->rotate * pI830->shadowPitch >> 1;
-
- while(num--) {
- width = pbox->x2 - pbox->x1;
- y1 = pbox->y1 & ~1;
- y2 = (pbox->y2 + 1) & ~1;
- height = (y2 - y1) >> 1; /* in dwords */
-
- if(pI830->rotate == 1) {
- dstPtr = (CARD16*)pI830->FbBase +
- (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
- srcPtr = (CARD16*)pI830->shadowPtr +
- ((1 - y2) * srcPitch) + pbox->x1;
- } else {
- dstPtr = (CARD16*)pI830->FbBase +
- ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
- srcPtr = (CARD16*)pI830->shadowPtr +
- (y1 * srcPitch) + pbox->x2 - 1;
- }
-
- while(width--) {
- src = srcPtr;
- dst = (CARD32*)dstPtr;
- count = height;
- while(count--) {
- *(dst++) = src[0] | (src[srcPitch] << 16);
- src += srcPitch * 2;
- }
- srcPtr += pI830->rotate;
- dstPtr += dstPitch;
- }
-
- pbox++;
- }
-}
-
-
-/* this one could be faster */
-void
-I830RefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
-{
- I830Ptr pI830 = I830PTR(pScrn);
- int count, width, height, y1, y2, dstPitch, srcPitch;
- CARD8 *dstPtr, *srcPtr, *src;
- CARD32 *dst;
-
- dstPitch = BitmapBytePad(pScrn->displayWidth * 24);
- srcPitch = -pI830->rotate * pI830->shadowPitch;
-
- while(num--) {
- width = pbox->x2 - pbox->x1;
- y1 = pbox->y1 & ~3;
- y2 = (pbox->y2 + 3) & ~3;
- height = (y2 - y1) >> 2; /* blocks of 3 dwords */
-
- if(pI830->rotate == 1) {
- dstPtr = pI830->FbBase +
- (pbox->x1 * dstPitch) + ((pScrn->virtualX - y2) * 3);
- srcPtr = pI830->shadowPtr + ((1 - y2) * srcPitch) + (pbox->x1 * 3);
- } else {
- dstPtr = pI830->FbBase +
- ((pScrn->virtualY - pbox->x2) * dstPitch) + (y1 * 3);
- srcPtr = pI830->shadowPtr + (y1 * srcPitch) + (pbox->x2 * 3) - 3;
- }
-
- while(width--) {
- src = srcPtr;
- dst = (CARD32*)dstPtr;
- count = height;
- while(count--) {
- dst[0] = src[0] | (src[1] << 8) | (src[2] << 16) |
- (src[srcPitch] << 24);
- dst[1] = src[srcPitch + 1] | (src[srcPitch + 2] << 8) |
- (src[srcPitch * 2] << 16) |
- (src[(srcPitch * 2) + 1] << 24);
- dst[2] = src[(srcPitch * 2) + 2] | (src[srcPitch * 3] << 8) |
- (src[(srcPitch * 3) + 1] << 16) |
- (src[(srcPitch * 3) + 2] << 24);
- dst += 3;
- src += srcPitch * 4;
- }
- srcPtr += pI830->rotate * 3;
- dstPtr += dstPitch;
- }
-
- pbox++;
- }
-}
-
-void
-I830RefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
-{
- I830Ptr pI830 = I830PTR(pScrn);
- int count, width, height, dstPitch, srcPitch;
- CARD32 *dstPtr, *srcPtr, *src, *dst;
-
- dstPitch = pScrn->displayWidth;
- srcPitch = -pI830->rotate * pI830->shadowPitch >> 2;
-
- while(num--) {
- width = pbox->x2 - pbox->x1;
- height = pbox->y2 - pbox->y1;
-
- if(pI830->rotate == 1) {
- dstPtr = (CARD32*)pI830->FbBase +
- (pbox->x1 * dstPitch) + pScrn->virtualX - pbox->y2;
- srcPtr = (CARD32*)pI830->shadowPtr +
- ((1 - pbox->y2) * srcPitch) + pbox->x1;
- } else {
- dstPtr = (CARD32*)pI830->FbBase +
- ((pScrn->virtualY - pbox->x2) * dstPitch) + pbox->y1;
- srcPtr = (CARD32*)pI830->shadowPtr +
- (pbox->y1 * srcPitch) + pbox->x2 - 1;
- }
-
- while(width--) {
- src = srcPtr;
- dst = dstPtr;
- count = height;
- while(count--) {
- *(dst++) = *src;
- src += srcPitch;
- }
- srcPtr += pI830->rotate;
- dstPtr += dstPitch;
- }
-
- pbox++;
- }
-}
commit 3715672c6528de85be5fba5bd116a8dded9cb9c7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 14 12:32:32 2007 +0200
New upstream release
autoreconf and update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3d1c1b3..25bae64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,179 @@
+commit 69ea37ebf72b92d842aa80dfa3578e328c7ceaa3
+Author: Kyle McMartin <kyle@phobos.i.cabal.ca>
+Date: Tue Aug 14 01:28:30 2007 -0400
+
+ Bump driver version to 2.1.1
+
+commit 46ca27eb547ad225b306d7f0886232d408b98c7f
+Author: Keith Packard <keithp@koto.keithp.com>
+Date: Fri Aug 10 14:31:16 2007 -0700
+
+ Clean up tv mode name allocation and copy.
+
+ TV mode names used to contain the signalling standard along with the pixel
+ size. The signalling has been moved to the TV_FORMAT property, but the
+ allocation and initialization of the mode name was left a bit messy as a
+ result.
+ (cherry picked from commit ed1b106fabf3a18489bdb3083326f27387a9cb72)
+
+commit cd6807306009f57219d5863b9fba785c7bb4f79e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Aug 9 12:14:44 2007 +1000
+
+ i965: increase composite vertex buffer size and alignment to be safe
+ (cherry picked from commit 7b143e5c8397da077c0e02455c21c5a99cf50942)
+
+commit ba59c2794b89cbd85a1fe743d4f8661edf08c03f
+Author: Dave Airlie <airlied@linux.ie>
+Date: Thu Aug 9 09:41:32 2007 +1000
+
+ i965: fix memcpy of the sf_kernel when a mask is needed
+ (cherry picked from commit 14691b24da5aa29d8c41ac7b7c61828e3cd9eab7)
+
+commit 24708b9d3f99513c287df14859a7e34affd67fe1
+Author: Carl Worth <cworth@cworth.org>
+Date: Wed Aug 8 11:13:37 2007 -0700
+
+ Allow 965 composite acceleration to A8 destinations.
+
+ Note that this is a slowdown in text rendering due to the high overhead of our
+ compositing setup, but appears to be correct according to rendercheck.
+ (cherry picked from commit 5e18c6af9051da654d2a6a97553ef4fe777bb61e)
+
+commit 77f55151708e6331107a7e25fbf5d23d87517869
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Aug 8 11:03:51 2007 -0700
+
+ Bug #11593: Remove dead struct vch_bdb_20 which was angering the sun compiler.
+ (cherry picked from commit b0ec670cdb0b6ca6fc0f4f165fa3ee5a20d7c985)
+
+commit ff5c9436bb94e2093775b6c8678641eba7291857
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 09:13:00 2007 +0200
+
+ Define INTEL_VERSION_MAJOR/MINOR/PATCH using PACKAGE_VERSION_*
+ (cherry picked from commit 7431abee5fb971d1f8bc7ac4bea137f6ece9418b)
+
+commit ab950611401575145fa01084a85d817ea13bb9cf
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 3 16:46:09 2007 -0700
+
+ Add the file mode for bios_dumper output so it doesn't have 000 permissions.
+ (cherry picked from commit ba90d944329dd8c79a757c38128964fbbe4ab898)
+
+commit a85dd7adc35601a988b1001e8b3c8aa4d53de0c0
+Author: Jesse Barnes <jesse.barnes@intel.com>
+Date: Wed Aug 8 15:29:52 2007 -0400
+
+ Legacy backlight changes: - add support for 965GM - make sure legacy enabled systems don't reduce the range of backlight values we can present to the user
+
+ (cherry picked from commit 0da4f2b0cd7203377ad10407928a367b8c6d310e)
+
+ Conflicts:
+
+ src/i830.h
+
+commit c989cb4897e2e2d395c52df4822290a767cdc866
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 3 10:46:39 2007 -0700
+
+ Quirk away the nonexistent TV connector on the Panasonic CF-Y4.
+ (cherry picked from commit 322a163cfbda885adc6bb09c1f976d36617ea83b)
+
+commit 010eda526fd42f1d42d2f82d0ba77e852f9a5349
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Sat Jul 28 17:43:29 2007 +0800
+
+ Update Lenovo TV quirk info
+
+ (cherry picked from commit 15f71edba37738f8ba279fa07452fda10cc65298)
+
+commit c518635bdbb2b8e0a43b130ddcf95e9520315802
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Jul 27 09:24:24 2007 +0800
+
+ Add another Lenovo TV output quirk
+
+ From issue report http://lists.freedesktop.org/archives/xorg/2007-July/026644.html
+ (cherry picked from commit f403a50afbcef1e54f554481c72037338bd5357c)
+
+commit 2fa82154066c9061f8503685bb520065deb496b7
+Author: Wang Zhenyu <zhenyu.z.wang@intel.com>
+Date: Fri Jul 27 09:14:13 2007 +0800
+
+ Add quirk support
+
+ This one trys to use a flag for possible quirks. It adds a quirk
+ for my Lenovo T61 TV output, and ports some origin LVDS quirks to it.
+ (cherry picked from commit 34c82ad7ce83394db47588693b578cf91991bf1c)
+
+commit 91d3c4702de892cf8445166e43efa4b94c973847
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jul 9 12:56:13 2007 -0700
+
+ Fix some physical address handling for >4GB addresses.
+
+ The upper bits would have been inappropriately dropped on G33-class hardware,
+ and on G965-class hardware in a 32-bit environment. The only use of physical
+ addresses on these should be for FBC, though, and FBC requires addresses
+ below 4GB. This is unresolved.
+ (cherry picked from commit 88f8b688e2316ae4a1f7485f0010ce90de54783a)
+
+commit e64614e9374e54dfc6a2a5bac3d82218f793e400
+Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
+Date: Wed Jul 25 20:11:32 2007 +0200
+
+ Fix typo in intel.man
+
+ Reported by A. Costa" <agcosta@gis.net> in
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432061
+ (cherry picked from commit 0fd3ba0518b3cde9ca0e4e2fc1854c00d8a43d5c)
+
+commit 3f5c3b63bf0672a3c092215c77838bb936900944
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Fri Jul 20 15:18:48 2007 +0800
+
+ Fix device id info for 945GME, 965GME
+
+ which do have new host bridge ids
+ (cherry picked from commit b1af2c0e01c54ef1d40fd0ca1ede29a1dd7ed97b)
+
+commit b5b97f117d28202065018c167bad2c330bb6c25c
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Fri Jul 13 12:47:18 2007 -0700
+
+ Remove hard-coded CRT blanking frobbing for load detection.
+
+ CRT blanking needn't be adjusted to perform load detection on 9xx chips, and
+ the 8xx load detection path now adjusts blanking just during load detection.
+ Adjusting the blanking interval turned out to cause many monitors to fail to
+ sync.
+ (cherry picked from commit ff2be3995d33f9e4b7f63b380f166b6168c9b9c6)
+
+commit 760bd1bbeaa8daa3bf05267b34897e175058f4f0
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Fri Jul 13 10:58:06 2007 -0700
+
+ Ensure pipe/output active before doing load detection.
+
+ If the pipe or output have been set to DPMSOff, then load detection will not
+ work correctly. Also, share the load detection configuration code between
+ crt and tv outputs.
+ (cherry picked from commit 00f4587025a3879626623135b0a153fcdb906719)
+
+commit 9d6fca93760b7fba7dfb774171eca94ca52d0115
+Author: Keith Packard <keithp@neko.keithp.com>
+Date: Mon Jul 9 21:29:55 2007 -0700
+
+ Eliminate bogus (and harmful) blanking adjustment for load detect.
+
+ Instead of always adding blanking to mode lines, use the FORCE_BORDER option
+ on i9xx hardware where it works, and dynamically add a bit of border if
+ necessary on i8xx hardware to make load detection work. This may cause
+ flashing when a usable crtc is not otherwise idle when load detection is
+ requested.
+ (cherry picked from commit 6f18300aed1340348c6d395f326061b5315be643)
+
commit 3c552af65d28fafec1d09484a8914b690b961349
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 2 18:33:47 2007 -0700
diff --git a/Makefile.in b/Makefile.in
index 2b6d7f2..41c7e45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
# 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.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog compile config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -104,10 +101,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
-BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
-BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
-BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -124,11 +117,9 @@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
DRI_CFLAGS = @DRI_CFLAGS@
-DRI_FALSE = @DRI_FALSE@
DRI_LIBS = @DRI_LIBS@
DRI_MM_CFLAGS = @DRI_MM_CFLAGS@
DRI_MM_LIBS = @DRI_MM_LIBS@
-DRI_TRUE = @DRI_TRUE@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -140,10 +131,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
-HAVE_GEN4ASM_FALSE = @HAVE_GEN4ASM_FALSE@
-HAVE_GEN4ASM_TRUE = @HAVE_GEN4ASM_TRUE@
-HAVE_PCIACCESS_FALSE = @HAVE_PCIACCESS_FALSE@
-HAVE_PCIACCESS_TRUE = @HAVE_PCIACCESS_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -158,8 +146,6 @@ LINUXDOC = @LINUXDOC@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_HTML = @MAKE_HTML@
MAKE_PDF = @MAKE_PDF@
@@ -167,6 +153,7 @@ MAKE_PS = @MAKE_PS@
MAKE_TEXT = @MAKE_TEXT@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -180,25 +167,22 @@ PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VIDEO_DEBUG_FALSE = @VIDEO_DEBUG_FALSE@
-VIDEO_DEBUG_TRUE = @VIDEO_DEBUG_TRUE@
WARN_CFLAGS = @WARN_CFLAGS@
XMODES_CFLAGS = @XMODES_CFLAGS@
-XMODES_FALSE = @XMODES_FALSE@
-XMODES_TRUE = @XMODES_TRUE@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -210,6 +194,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -239,8 +224,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README
@@ -285,7 +273,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -307,7 +295,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -340,8 +327,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -443,23 +429,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -473,7 +458,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -481,6 +466,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -488,7 +475,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -563,7 +550,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -633,12 +620,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -659,24 +654,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/aclocal.m4 b/aclocal.m4
index d164a8b..a128c26 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,9 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -176,7 +181,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@@ -263,8 +268,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
@@ -276,8 +282,9 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
@@ -293,12 +300,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
@@ -529,13 +544,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -552,6 +571,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -623,7 +645,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -664,11 +686,12 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
Reply to: