xserver-xorg-video-neomagic: Changes to 'debian-unstable'
.cvsignore | 19
ChangeLog | 353 +++++++++--
README | 2
TODO | 2
aclocal.m4 | 147 +++-
autogen.sh | 12
config.guess | 667 ++++++++++++---------
config.h.in | 9
config.sub | 230 +++++--
configure | 1544 +++++++++++++-------------------------------------
debian/changelog | 21
debian/control | 14
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 12
man/.cvsignore | 2
man/Makefile.am | 2
man/Makefile.in | 2
man/neomagic.man | 4
mkinstalldirs | 89 ++
src/.cvsignore | 6
src/neo_driver.c | 3
src/neo_macros.h | 2
src/neo_reg.h | 2
24 files changed, 1565 insertions(+), 1611 deletions(-)
New commits:
commit 6553c356127b2511d2573db0f4938cadc061143d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 23:05:44 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 4ddb38c..4d208ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,73 +1,326 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 5bc75e39c8ce1f891ff45128632d6086e4681524
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 10:51:24 2007 -0800
- * configure.ac:
- * src/neo_driver.c:
- Bump to 1.1.1 for Xv changes.
+ Replace references to XFree86/XF86Config in man page
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 9d8cf9f44a27c7bbf7283872af9bf64b29ba5952
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:35:16 2006 +0000
- * src/neo_video.c: (NEOPutVideo), (NEOPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Bump to 1.1.1 for Xv changes.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 4998d9b3a430bfd86c8d8054fa361b499d5a8a7a
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:09:50 2006 +0000
- * configure.ac:
- * src/neo.h:
- * src/neo_2070.c:
- * src/neo_2090.c:
- * src/neo_2097.c:
- * src/neo_2200.c:
- * src/neo_bank.c:
- * src/neo_cursor.c:
- * src/neo_dga.c:
- * src/neo_driver.c:
- * src/neo_i2c.c:
- * src/neo_shadow.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a68ca4369e55634c8122e5d14dcec4d9a05b14ad
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 19:24:45 2006 +0000
- * configure.ac:
- Update package version for X11R7 release.
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3e0451e0bafb2c3fd36b758bae713e38ed1d2200
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:00 2005 +0000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Update package version for X11R7 release.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit af44299657fa323d022c96bd5f1c6f3fd671e9d4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:53 2005 +0000
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Stub COPYING files
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a6f380ea4151ba53988110ae6d9965a91d17feaa
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:18 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Update package version number for final X11R7 release candidate.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 67b7d68f8c931232f832cff63ade5917cb46cc19
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:35 2005 +0000
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit bffb08ff621a99929fc418ad7a072e4caf23a5f7
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:34 2005 +0000
- * configure.ac:
- Only build dlloader modules by default.
+ Update package version number for X11R7 RC3 release.
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4271514cdfaa36122d22f28d571814e3eb42795b
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:09 2005 +0000
- * configure.ac:
- Add check for DGA extension to fix issues when building with
- separate build roots.
+ Remove extraneous AC_MSG_RESULT.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0e70207585eb2f62eca1510c26190edd64bccf11
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:59 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Only build dlloader modules by default.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b41aae412357d0433a025458c82ca86a34f13289
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:09 2005 +0000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ 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 ffe5004cace662157ac46b36dae47d2ef84dced3
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:15 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 196a61be797f3bbaef0f7e38399b9dc1ffa9b36d
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 15 05:42:03 2005 +0000
+
+ Add check for DGA extension to fix issues when building with separate build
+ roots.
+
+commit dfb50a49f52a6d50dd631f362eeed86e031f64e9
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:16 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 94a42748c09bd00b2c47cca3cc20a79556c1c302
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:53 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 70326ceebecc25bb03427b8c0ff2a7ea18bd7a4e
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:03 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit ed2c463fc74fd130654420ab451a2ebe147b21e4
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+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 2fd53a09828beaf0abc0fa0e05777130893cd91d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:34 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 779f221a72f911a8554a895aa8e19e83a74e6ded
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:04 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 392f13b748742e93dfccd3c4bebb323165eb8eb4
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Oct 4 21:36:51 2005 +0000
+
+ Link nvidida readme file into nvidia driver, Exclude duplicated neomagic
+ readme
+
+commit a114e9e031bf1250fbb1e03b81927198d376f6e0
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Sep 27 21:09:35 2005 +0000
+
+ Fix capitalization mistake
+
+commit c82ff116e460d5c89cb20a8f94632501b473ad09
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Sep 27 20:53:19 2005 +0000
+
+ Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
+ newport to accomodate various new documentation and utility files.
+
+commit dcfb76cc658d410669d9f78e4262ee1c35696272
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:47 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 688a609b8ffdc4f448ab5fec572e09f81022f8f8
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:44 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 8bc434f88799b9690d13bbc01ea24f5090f430aa
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 16:52:44 2005 +0000
+
+ Build system for neomagic
+
+commit 2bc76a644f02563d30d17043014e9515a6e0d30b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:52 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit dfdd64a3ddff6103ebe247f3a14e3947dc1bea1c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:55 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 5b044752c61f4b12173208ec788aa6e0e07e6f9a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:28 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 6c2581bf480c1fc189f0acc77ae6e6bcfbbfbf4e
+Author: Egbert Eich <eich@suse.de>
+Date: Mon Apr 11 09:50:33 2005 +0000
+
+ Fix several mode setting issues:
+ - eliminates DoubleScan modes above height == 1024.
+ - eliminates interlaced modes as we don't know how to turn on interlace.
+ - Fixes clock calculation to prevent lockups.
+
+commit 5f99296eb01ad853cf38c65f26d115767490c81d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Feb 25 16:38:34 2005 +0000
+
+ Bug #2605: Make the cyrix, dummy, glint, neomagic, tga, and trident drivers
+ build when BuildXF86DGA NO.
+ (also fix some datestamps in the changelog)
+
+commit e3f691e2dde1d10a0a0c95875b653984988adde6
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:43:09 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 18353e7a97fcc69add74c88f7441c1e36740b23d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Aug 16 09:13:14 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 dda5049dd4aa20ba63c52dc301edfaad5ecc1c0d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jul 31 01:21:18 2004 +0000
+
+ Change several LoaderSymbol calls introduced by the bug #400 patch to
+ *Weak() resolver functions.
+
+commit 57cea11892e956f4e6f07005e05d121fa48c3059
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Jul 30 22:21:32 2004 +0000
+
+ Adding experimental pseudocolor overlay stuff to NeoMagic driver.
+
+commit d12adabf2dc323f9e26dd13a9d3a7d3573e9612b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:53 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 610059a15fd94501b011459cd1557d63fb247c0b
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Mon Jul 26 23:14:38 2004 +0000
+
+ - Add Radeon DynamicClocks option
+ - Add small fixes and clean ups from ati's last code drop (typo_fixes,
+ remove_fudge, laptop, xvfix)
+ - fix possible segfault in mga_dri.c (Ryan Underwood)
+ - Add Xv support to pre-nm2160 neomagic chipsets
+
+commit 335b5f48e820064b38d3f8a41ac4d9d456dcb8f7
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:26 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 774a7a61ea1752af6b5b4b7552468aaf11d0db80
+Author: Egbert Eich <eich@suse.de>
+Date: Wed May 26 16:24:09 2004 +0000
+
+ Fixing setting of physical framebuffer base for several drivers. C&T
+ driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
+ driver: improved support for lowres double scan modes.
+
+commit b8978749df1558d3dabcc48e38814bba3d06eb3c
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:39:11 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 722d398c9c7a037780215d4da12a8a399998a4ce
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:26 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 643dd1ccf54508d5a1c006eb036a783273567510
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:20 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 0af5d7a46ea6d8517e6ae90c4a488e072add1cad
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:53 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f20041598ccb0a22dea1677a42a8fd405aa87995
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:20 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 07ba4256222964890db244b01b24e0e976fec358
+Author: Egbert Eich <eich@suse.de>
+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 875dcae6c9027502e744f2988f43915e505b1697
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:37 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 426b55eb490fc5f65af459eaa4b2b9c711710551
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 3685e43cbed68e378856bbf8135a0b5f5d7ac257
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 1fca1f5..5966145 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -118,6 +118,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/xf86dgastr.h>
#endif
+/* For abs() */
+#include <stdlib.h>
+
/* Mandatory functions */
static const OptionInfoRec * NEOAvailableOptions(int chipid, int busid);
static void NEOIdentify(int flags);
commit 00e14009112aea01ffcfc834ad0b6d7be81f0013
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 22:59:55 2007 +0200
Pull upstream manpage fix 5bc75e39c8ce1f891ff45128632d6086e4681524
diff --git a/debian/changelog b/debian/changelog
index f6af271..f5ba681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-neomagic (1:1.1.1-7) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-neomagic.
[ Brice Goglin ]
+ * Pull upstream manpage fix 5bc75e39c8ce1f891ff45128632d6086e4681524
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
commit a8535e4ac76acf736d1aba022c59e5ced388f8a7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:51:24 2007 -0800
Replace references to XFree86/XF86Config in man page
diff --git a/man/neomagic.man b/man/neomagic.man
index 6e5ae34..e5d59bf 100644
--- a/man/neomagic.man
+++ b/man/neomagic.man
@@ -14,7 +14,7 @@ neomagic \- Neomagic video driver
.fi
.SH DESCRIPTION
.B neomagic
-is an XFree86 driver for the Neomagic graphics chipsets found in many
+is an __xservername__ driver for the Neomagic graphics chipsets found in many
laptop computers.
.SH SUPPORTED HARDWARE
.B neomagic
@@ -46,7 +46,7 @@ and newer models. All visuals are supported in depth 8. TrueColor and
DirectColor visuals are supported in the other depths.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -90,7 +90,7 @@ following options are needed to avoid a lock-up of the graphic engine:
.fi
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich,
Mark Vojkovich, Alan Hourihane.
commit 8935ab708057514fbbd47816a7e6f2cebce98f7b
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 22:53:35 2007 +0200
Miscellaneous fixed in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-neomagic
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
diff --git a/debian/changelog b/debian/changelog
index fd84be6..f6af271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
xserver-xorg-video-neomagic (1:1.1.1-7) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-neomagic.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 13:53:09 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-video-neomagic
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 22:53:01 +0200
xserver-xorg-video-neomagic (1:1.1.1-6) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f97377a..25dac69 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-neomagic
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.6.1
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
Package: xserver-xorg-video-neomagic
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- Neomagic display driver
commonly found in laptops.
.
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 module can be found as the module 'driver/xf86-video-neomagic' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-neomagic driver module.
diff --git a/debian/rules b/debian/rules
index 6790619..60caade 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ 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-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 523ccb0e1b6e5d1d1fa262c38b9851153a7d4003
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:44:58 2007 -0500
Autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index e11bdd0..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6518,7 +6518,8 @@ installed software in a non-standard prefix.
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
@@ -6584,7 +6585,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.0
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -6653,27 +6654,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
AC_REQUIRE([AC_CANONICAL_HOST])
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
@@ -6683,14 +6674,9 @@ if test x$FILE_MAN_SUFFIX = x ; then
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
solaris*) MISC_MAN_SUFFIX=5 ;;
@@ -6698,25 +6684,17 @@ if test x$MISC_MAN_SUFFIX = x ; then
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# gnu* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# gnu* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -6753,18 +6731,17 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-AC_CHECK_FILE(
- [$prefix/share/X11/sgml/defs.ent],
- [DEFS_ENT_PATH=$prefix/share/X11/sgml],
- [DEFS_ENT_PATH=]
-)
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([Whether to build documentation])
-if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@@ -6776,7 +6753,7 @@ AC_MSG_RESULT([$BUILDDOC])
AC_MSG_CHECKING([Whether to build pdf documentation])
-if test x$PS2PDF != x ; then
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
else
BUILDPDFDOC=no
@@ -6786,10 +6763,10 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
AC_MSG_RESULT([$BUILDPDFDOC])
-MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
AC_SUBST(MAKE_TEXT)
AC_SUBST(MAKE_PS)
@@ -6797,6 +6774,72 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_LINUXDOC
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([Whether to build text documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
+ test x$BUILD_TXTDOC != xno; then
+ BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([Whether to build PDF documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
+ test x$BUILD_PDFDOC != xno; then
+ BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([Whether to build PostScript documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
+ test x$BUILD_PSDOC != xno; then
+ BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([Whether to build HTML documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
+ test x$BUILD_HTMLDOC != xno; then
+ BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@@ -6995,7 +7038,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -7008,6 +7052,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/config.guess b/config.guess
index 2fc3acc..396482d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2003-06-17'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@ timestamp='2003-06-17'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -53,7 +56,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,7 +107,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -136,13 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
- VENDOR=redhat ;
-else
- VENDOR= ;
-fi
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -203,50 +199,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
Reply to: