ChangeLog | 406 +++++++-
Makefile.in | 154 +--
aclocal.m4 | 911 ++++++++++++-------
config.guess | 60 -
config.sub | 66 +
configure | 1845 ++++++++++++++++++++++++++-------------
configure.ac | 2
debian/changelog | 16
debian/control | 8
debian/patches/01_fbdev_man.diff | 8
debian/xsfbs/xsfbs.mk | 103 --
debian/xsfbs/xsfbs.sh | 7
depcomp | 93 +
install-sh | 514 +++++++---
ltmain.sh | 277 +++--
man/Makefile.in | 96 +-
missing | 61 -
mkinstalldirs | 5
src/Makefile.in | 150 +--
src/fbdev.c | 16
20 files changed, 3240 insertions(+), 1558 deletions(-)
New commits:
commit 30b01d304a8721ed5c938f946a6183b9513b2afb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Mar 19 21:26:20 2008 +0100
debian/control updates.
* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 50aeb42..c2a3683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xserver-xorg-video-fbdev (1:0.4.0-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patch 01_fbdev_man.diff.
+ * Build against xserver 1.5 rc1.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Julien Cristau <[EMAIL PROTECTED]> Wed, 19 Mar 2008 21:23:38 +0100
diff --git a/debian/control b/debian/control
index 93ea9bb..b36fa06 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>=
2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev,
x11proto-render-dev, x11proto-video-dev
-Standards-Version: 3.7.2.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
-XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
+Build-Depends: debhelper (>= 4.0.0), quilt, pkg-config, xserver-xorg-dev (>=
2:1.4.99.901), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev,
x11proto-render-dev, x11proto-video-dev, libpciaccess-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
+Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
Package: xserver-xorg-video-fbdev
Architecture: any
commit 434cb00661bab902e3c30ac462d4a5fcac90aaf7
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Mar 19 21:25:01 2008 +0100
Update changelogs and refresh patch.
diff --git a/ChangeLog b/ChangeLog
index ead4bce..53cdcb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,66 +1,386 @@
-2006-05-19 Adam Jackson <[EMAIL PROTECTED]>
+commit 73ff2d0cd72a165ecfb30b1620bda3b445d04409
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Mar 19 13:51:44 2008 -0400
- * configure.ac:
- * src/fbdev.c:
- Bump to 0.3.0
+ fbdev 0.4.0
-2006-05-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6bae3476b01620372b77579bc4cbef99eda734c6
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Fri Oct 12 15:58:34 2007 +0200
- * src/fbdev.c: (FBDevShadowInit), (FBDevScreenInit),
- (FBDevCloseScreen):
- Fix ShadowFB support to work with recent miext/shadow changes from
- bug #5460 (Kevin Martin), and apply fix for miext/shadow crasher
- https://bugs.freedesktop.org/show_bug.cgi?id=6940 (Kristian
- Hoegsberg).
+ Fixed leftover PCIACCESS -> XSERVER_LIBPCIACCESS.
-2006-04-06 Adam Jackson <[EMAIL PROTECTED]>
+commit a9a7763ce04b4b4e1529f1aa74bb5081dc562ea7
+Author: Brice Goglin <[EMAIL PROTECTED]>
+Date: Wed Sep 12 01:49:33 2007 +0200
- * configure.ac:
- * src/fbdev.c:
- Unlibcwrap. Bump server version requirement. Bump to 0.2.0.
+ Replace a non-ascii char with the corresponding groff escape in fbdev.man
-2006-01-09 David Nusinow <gravity-at-freedesktop-dot-org>
+commit 31707aeccd805fb530872e4b088189665c970076
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Jan 22 08:52:43 2007 -0800
- * man/fbdev.man:
- Convert manpage to utf-8
- Bugzilla #1925 <https://bugs.freedesktop.org/show_bug.cgi?id=1925>
+ Add conditional support for pci-rework branch.
+
+ To build VESA driver for use with pci-rework Xserver, add --enable-pciacces
+ to the configure command line. Otherwise, the "traditional" VESA driver
will
+ be built.
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b17f9256d5958fdd45dd5fe0ce10663ef9634900
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Sun Dec 31 17:43:52 2006 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Only determine pitch after setting initial mode.
+
+ We were determining it from the mode which is current at X server startup,
+ which may have a completely different pitch.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 436a2c094aecb661e183e3ca247765a0fe1fa4bc
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Fri Dec 29 12:57:44 2006 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Bump to 0.3.1 for release.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5b54cbd70e12b10f7d8b76d0bfdda2d8bc2cb969
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Fri Dec 29 12:57:23 2006 +0100
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Use package version definitions from XORG_RELEASE_VERSION macros.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b6fd3708242b492acdaa125099b4e29837596605
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Fri Dec 29 12:29:31 2006 +0100
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Don't prefer 24bpp for depth 24.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 43236f5bfc33f4757dbc5ed9d5682a73c06d8b87
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Wed Dec 27 13:05:12 2006 +0100
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Fix shadow framebuffer, and by extension rotation.
+
+ Based on Adam Jackson's shadow framebuffer fixes in xf86-video-vesa.
-2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
+commit 643573a51fbdcaa4ddb8036956a626f3dce13881
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Wed Dec 27 13:03:05 2006 +0100
- * configure.ac:
- Only build dlloader modules by default.
+ Add missing argument to xf86DrvMsg().
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b5b1b7d7313fdcd8bd37cb53ca654874d4b395fb
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Wed Dec 27 13:01:32 2006 +0100
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Update my e-mail address.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit abfc75fbcdf021a07f5b9c7ed6189e3b8cb69a7f
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Wed Dec 27 12:59:42 2006 +0100
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Convert .cvsignore to .gitignore.
+
+ Add a couple of items while we're at it.
+
+commit a12d1ce572e739cfe164915779adae2cf5191a06
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Nov 8 12:22:53 2006 -0500
+
+ Make debug output a run-time option instead of compile-time.
+
+commit 6ed2e61542ed37be2a5f3e41614a2b94649ea94f
+Author: Jeremy C. Reed <[EMAIL PROTECTED]>
+Date: Wed Oct 18 14:56:01 2006 -0500
+
+ Replace stub file with real license.
+
+ "XFree86 code without an explicit copyright is covered by the
+ following copyright/license" ....
+
+ Discussed on xorg list.
+
+commit 24177f72188f752c53d3dd772e5b7940a31004ae
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri May 19 19:17:46 2006 +0000
+
+ Bump to 0.3.0
+
+commit c7b9e1a3275b98ba74eacb67e7dc86ae502a4a51
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu May 18 21:15:32 2006 +0000
+
+ Fix ShadowFB support to work with recent miext/shadow changes from bug
+ #5460 (Kevin Martin), and apply fix for miext/shadow crasher
+ https://bugs.freedesktop.org/show_bug.cgi?id=6940 (Kristian Hoegsberg).
+
+commit fe1fa4c016202e7e07f4e3143b6cedb7f9e82f9b
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Apr 7 19:02:07 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 0.2.0.
+
+commit 41a763816d9319680f31690baeab66407cd5f41c
+Author: gravity <gravity>
+Date: Tue Jan 10 03:22:11 2006 +0000
+
+ Convert manpage to utf-8
+
+commit 332464c43f0f73fabbfddadbdb6a1dd0358dcba7
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Dec 21 02:30:00 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit cf1b33cb4da017b4c81aa4a4f425e02b6db3275e
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Dec 19 16:25:53 2005 +0000
+
+ Stub COPYING files
+
+commit 35c09ae4c4587c3673f21cc59770ff1d1d386307
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:24:17 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 2e4f3e6a0a92688d3747caa3dd77acb7d656cd7e
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:34 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 8521127ff1037f3b93f3fae36a1a195b926e8a8a
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:33 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 7a37e5db75e35ab26677a0201362a4a454987ffc
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Dec 2 02:16:08 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 4635b198fbaec32206c00dd2b1156b8c0e77178e
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Nov 29 23:29:58 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 91b40b9c63e664c5f6a916400dc7020cd9241ca2
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:04:09 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit ff706274279f209d1478f95cf33c24ae19b9eba6
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Nov 21 10:49:12 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit d57ddc84c3a0fd25ed385e458ffe920079aa4feb
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Nov 9 21:15:15 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 493a1b8b117417df7de647825350a1d44c1d23dd
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Nov 1 15:08:52 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 3f11faf88ce3678cbc9ad305eef17bc922c8f75e
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:48:02 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit e87f2ee9b17e922212ee6b04763418e27b87fbaa
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Oct 18 00:01:53 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 5f77732d9a6b54c6964718637c9a4304985e5a00
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Oct 17 22:57:33 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 52518e451155e101c1dc24f91a937d15af4d6d2c
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Oct 17 00:09:02 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit a2a75f4dba11cd6f49be546a38b2aaa189d2813b
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Fri Aug 26 06:32:45 2005 +0000
+
+ Numerous spelling and grammar fixes. (Branden Robinson, Debian #099n)
+
+commit 28171378a17fbae4a95419a2a3f1cee6246a1916
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Aug 18 09:03:46 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit f060ccc1f1544fdcce08ffd495c24c9106bc0ec2
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:43 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit d0517a40a91b6a044e6a87d20ce6007a12c299bb
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Mon Jul 25 23:50:23 2005 +0000
+
+ Build system for fbdev driver
+
+commit 44d4790006f8f505ccf045161ce82854d921d52f
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Jul 11 02:29:47 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 4d18c5309c49c4fa83fd645f6ed879d2c2cad3a9
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Jun 25 21:16:54 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 82ab7895da512d13c9831e9d17e8ee11211db2c0
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Jan 28 16:12:59 2005 +0000
+
+ Modifying X.Org Xserver DDX to allow to run X with ordinary user
+ permissions when no access to HW registers is required. For API changes
+ which mostly involve the modifications to make the RRFunc (introduced
+ with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch
+ applies changes to OS specific files for other OSes which I cannot
+ test.
+
+commit 077e3dbcf41e25229b2a4949bc6b50adf26b084d
+Author: Markus Kuhn <[EMAIL PROTECTED]>
+Date: Sat Dec 4 00:43:05 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 2327cdd208b07282ec3e339d9edf46092ff1b765
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Aug 16 09:13:13 2004 +0000
+
+ Bug #1087: Make sure all the *Weak symbols are documented in the import
+ list, so the loader knows not to complain about unresolved symbols when
+ an optional module isn't loaded. This typically manifests as warnings
+ about fbdevHW symbols when the user isn't using the framebuffer
+ console.
+
+commit bd1e31bdb5e64c5a533024aea077c417692438e2
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Aug 3 02:44:20 2004 +0000
+
+ Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
+ DoLoadableServer NO builds work again.
+
+commit 1d3246ca0d6cfd40e39df1715f98a33c24476490
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sun Aug 1 18:04:07 2004 +0000
+
+ *really* remove the last call to FillInScreenInfo. i clearly haven't had my
+ coffee yet this morning...
+
+commit ce86e2a272005604b3eec732d68b65259ee9e04d
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sun Aug 1 16:28:57 2004 +0000
+
+ Kill off the last fbdevHWFillInScreenInfo user. Noticed by juergbi on IRC.
+
+commit 4c1492ac6df4296627d7d7d611cd1883965b2cae
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Jul 31 01:21:18 2004 +0000
+
+ Change several LoaderSymbol calls introduced by the bug #400 patch to
+ *Weak() resolver functions.
+
+commit 64ef1f4af16f769de6e0a96b0a4f5014016d82de
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Jul 30 20:30:52 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit db6514cea01a43ea7eb37216c921380a1e4bd96f
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Wed Jun 16 09:23:04 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 1e80fe1bf94d36217c89f71b03dd7d22f156bc22
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 19:31:36 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 5d8a0a2e47a5b6e304eea259de0b7d50af96c573
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:33:20 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 69d61895f3208c30c329b64ede25338509d16a7c
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:12:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 806863c5f6636c958e716a2f853cb06dcd883e64
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:35:52 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 595a614cd9291eacbed6241320c9e44e4e65204f
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:23:18 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 62bec818a1995fb4c7ea417625aa4f75ecf0ee20
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Jan 29 08:08:35 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 48e31aaed2340998e4e3b62aaae41d6fbce0ca88
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:28:36 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 3a00d913598207bea3ce36561b160f2d82c0266f
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 8b7ad1d26cdf2623aeac068aa61bd589cb709ed5
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index bb54910..50aeb42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-fbdev (1:0.4.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Refresh patch 01_fbdev_man.diff.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 19 Mar 2008 21:23:38 +0100
+
xserver-xorg-video-fbdev (1:0.3.1-4) unstable; urgency=low
* Upload to unstable
diff --git a/debian/patches/01_fbdev_man.diff b/debian/patches/01_fbdev_man.diff
index c072da8..10413c3 100644
--- a/debian/patches/01_fbdev_man.diff
+++ b/debian/patches/01_fbdev_man.diff
@@ -1,7 +1,5 @@
-Index: xserver-xorg-video-fbdev/man/fbdev.man
-===================================================================
---- xserver-xorg-video-fbdev.orig/man/fbdev.man 2007-04-22
03:52:00.000000000 +0200
-+++ xserver-xorg-video-fbdev/man/fbdev.man 2007-04-22 03:52:49.000000000
+0200
+--- xserver-xorg-video-fbdev.orig/man/fbdev.man
++++ xserver-xorg-video-fbdev/man/fbdev.man
@@ -38,8 +38,8 @@
driver and will use it if there are no video modes configured.
.PP
@@ -12,4 +10,4 @@ Index: xserver-xorg-video-fbdev/man/fbdev.man
+\-scanpci\*q
to figure out the correct values.
.PP
- The following driver
+ The following driver
commit a7bcb1dd423fe75508b63fab7016fb67cbf9f47c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Mar 19 21:22:16 2008 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 1957e7f..574571f 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.1 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, 2007, 2008 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 = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog 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@
@@ -119,6 +116,7 @@ DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRIVER_NAME = @DRIVER_NAME@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -130,6 +128,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +142,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -157,24 +156,23 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
-PCIACCESS_FALSE = @PCIACCESS_FALSE@
PCIACCESS_LIBS = @PCIACCESS_LIBS@
-PCIACCESS_TRUE = @PCIACCESS_TRUE@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
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@
@@ -186,6 +184,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@
@@ -214,8 +213,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
all: config.h
@@ -259,7 +261,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
@@ -281,7 +283,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.
@@ -314,8 +315,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 \
@@ -359,8 +359,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -385,8 +385,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in
$(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -396,13 +396,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -417,23 +416,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; \
@@ -447,7 +445,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`; \
@@ -455,6 +453,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -462,7 +462,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
@@ -471,6 +471,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -498,6 +502,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -537,7 +543,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 \
@@ -607,12 +613,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
@@ -633,24 +647,26 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.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 \
- 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
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
+
+.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-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
+ 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 aaae5ad..ef947f1 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.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 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,17 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically
`autoreconf'.])])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -101,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -176,7 +183,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=
@@ -203,6 +210,8 @@ file_magic*)
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -263,8 +272,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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
