xserver-xorg-video-tdfx: Changes to 'debian-unstable'
.cvsignore | 19
ChangeLog | 390 +++++++++++-
Makefile.in | 4
aclocal.m4 | 306 +++++++---
autogen.sh | 12
config.guess | 47 +
config.h.in | 9
config.sub | 68 +-
configure | 1524 +++++++++++++-------------------------------------
debian/changelog | 20
debian/control | 14
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
man/.cvsignore | 2
man/Makefile.in | 6
mkinstalldirs | 89 ++
src/.cvsignore | 6
src/Makefile.in | 6
18 files changed, 1239 insertions(+), 1315 deletions(-)
New commits:
commit 8585c9ddc9fb33664915d32b7b2bad783476a9be
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 1 12:50:00 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 2562102..73076ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,76 +1,364 @@
-2006-06-17 Donnie Berkholz <spyderous@gentoo.org>
+commit c5b95a8d219dd4ef25c6aa14f44b70865d1a8be7
+Author: Alex Deucher <alex@t41p.(none)>
+Date: Wed Nov 22 12:15:48 2006 -0500
- * src/tdfx_priv.c: (TDFXResetFifo), (TDFXSyncFifo):
- Bug #7149 <https://bugs.freedesktop.org/show_bug.cgi?id=7149>
- Change use of getsecs to xf86getsecs (Gustavo Pichorim Boiko).
+ bump to 1.3.0 for release
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 4f76e63ac4f7beb802561807554b64386a22b6e1
+Author: Alex Deucher <alex@t41p.(none)>
+Date: Wed Nov 22 12:12:06 2006 -0500
- * configure.ac:
- * src/tdfx.h:
- Bump to 1.2.1 for Xv changes.
+ bump to 1.3.0 for release.
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit cd0808bd2dc6c77557e0691579a6119f8901adf6
+Author: Alex Deucher <alex@t41p.(none)>
+Date: Wed Nov 22 11:44:48 2006 -0500
- * src/tdfx_video.c: (TDFXPutImageTexture), (TDFXPutImageOverlay):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Fix locking in tdfx driver. Fixes bug 9032.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 867f0a956a3240466347e0ee17d7518740835048
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 18:45:16 2006 -0400
- * configure.ac:
- * src/tdfx.h:
- * src/tdfx_accel.c:
- * src/tdfx_dga.c:
- * src/tdfx_dri.c:
- * src/tdfx_driver.c:
- * src/tdfx_hwcurs.c:
- * src/tdfx_io.c:
- * src/tdfx_priv.c:
- * src/tdfx_sli.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.2.0.
+ Bump to 1.2.2
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit de5adbae146a4db8ee491a9387f65284ea919ff9
+Author: Donnie Berkholz <spyderous@gentoo.org>
+Date: Sat Jun 17 16:35:04 2006 +0000
- * configure.ac:
- Update package version for X11R7 release.
+ Bug #7149 <https://bugs.freedesktop.org/show_bug.cgi?id=7149> Change use of
+ getsecs to xf86getsecs (Gustavo Pichorim Boiko).
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit acee015839a798546a9d17fdc31e443b10630c76
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:50:08 2006 +0000
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Bump to 1.2.1 for Xv changes.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 55954625ff815b932d365422864745b31c4eadb4
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:15:56 2006 +0000
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e8c71c95ea67e5db17eeabaac9907924099e164f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:37:49 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Unlibcwrap. Bump server version requirement. Bump to 1.2.0.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8cfc6971a58e03894040c4f4f74da4734897df16
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:03 2005 +0000
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Update package version for X11R7 release.
-2005-11-20 Adam Jackson <ajax@freedesktop.org>
+commit 5300267cfe87b18139a95ec555f8d43cc1465669
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:55 2005 +0000
- * configure.ac:
- Bump libdrm dep to 2.0.
+ Stub COPYING files
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit c3882fb9c050d4a4b3d8bb6bff712cb9143ae97c
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:20 2005 +0000
- * configure.ac:
- Only build dlloader modules by default.
+ Update package version number for final X11R7 release candidate.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d214866d794e5125196c53ff96921debfb50ae74
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:39 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c8db07f0b1574a9cde265505552d318e5a1f21b1
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:36 2005 +0000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Update package version number for X11R7 RC3 release.
+
+commit 32e28c8f5c3b5c51fc46778d6c346cadec6ba440
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:11 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 0d640f8ed56da1782faac5c590efa3bc6ff76f7f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Nov 30 18:51:58 2005 +0000
+
+ Bump libdrm dep to 2.0.
+
+commit 84a6bfdd3ab8307071376c81349b6701242c82f5
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:05 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit e9d4eaa5c966e1c062a8585bc3a2e74795c6434f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:14 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 44af3f869cb0c401fe064f5ba16e77c3fcdd3524
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:20 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit a2427c29767471615c4a257dfc3b1d7db4e091c9
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:31:21 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 906f1bd3d4365e45dcdc5c40ea5d4940add79703
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:22 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 9558a7b9448b2a906abe52ec31fd76f141c54ca4
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:55 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 1a194e47f962da387af7d8682ef49deade787964
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sun Oct 23 18:30:19 2005 +0000
+
+ Bug #4829: Remove some useless DRI symbol checks.
+
+commit 0cf2b66e13412f1a07d002eb6bd2097debc91a20
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:05 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 99a441cb4e56066d1eca600a20eee8213dd55bcb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:55 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 74f86678173470b5413cd138565a0a102151e785
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:37 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit e3e08b9a2dacd40da3e5ef57b0cbc5ed9b20f58a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:07 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 0f8e96a0d81303acd705be15c666cb775a1ae52b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Sep 24 18:45:46 2005 +0000
+
+ Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen
+ stubs from drivers, comment the non-empty ones.
+
+commit efe1280e8f9c1d4ce06b9c11b5f8a64e6ecc9640
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Mon Aug 22 04:24:32 2005 +0000
+
+ Fix test for DRI headers, bump to 1.0.1.
+
+commit 436871d3174f56c8bf7acc8e132a81f5e6fe603a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:52 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 5d98e054f44c5cf1e51bb7b4646b07192cb6cb7a
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Mon Aug 15 07:30:06 2005 +0000
+
+ Egbert's 64bit fixes for mixed 32/64bit clients
+
+commit 1c68da251e1bf3828ca2c728a4d7b93bb59659a9
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Fri Aug 5 23:04:33 2005 +0000
+
+ I have resolved this by making all the "Direct rendering disabled" messages
+ X_WARNING and all the "Direct rendering enabled" messages X_INFO.
+ Ideally, we need to factor some of this stuff out to common code. There
+ is a *LOT* of duplication among the *_dri.c files under
+ programs/Xserver/hw/xfree86/drivers.
+ I'm trying to clean up as much low hanging fruit as I can and got tired of
+ waiting for ajax. :P
+
+commit 341cd708a7511dac3e728e260166b4b790df733f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sun Jul 31 17:19:29 2005 +0000
+
+ Post-merge fixups:
+ - Disable building the gamma driver
+ - Fix numerous Imakefiles to get header paths and subdirs right
+ - Symlink client-side GLX lib source from Mesa
+ - Add new shader subdirs to the Mesa core build
+ - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
+ since they don't generate protocol, and it was breaking the build.
+
+commit 397246d1d1b55227456dd9092581871da7d17323
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:45 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 535a7c83e000a3410b11ffa6769127eae1464b3b
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 27 21:23:29 2005 +0000
+
+ Add xf86driproto to dependencies for drivers with DRI support. Patch from
+ Donnie Berkholz
+
+commit 38a86d5b1897427147543b933a1991a780f9b103
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 23:47:49 2005 +0000
+
+ Build system for tdfx
+
+commit 4cb0dd1252ed112a2e3be6de417d2ce8d849c5fe
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:30:02 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit d254bed4315a09eca7c41ce26efd575b60db2526
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 01:06:22 2005 +0000
+
+ Fix the build with DRI enabled. Still at least one runtime issue...
+
+commit cd1894c3df1ab667a755852085143fcc261eb985
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sun Jul 10 21:36:32 2005 +0000
+
+ First cut at driver build skeleton.
+
+commit 2c5f2e65f81699c619854b183d9f7825f350e118
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:57 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 2f8fb13b9c14ff9bc24f6737658d79ea647befc7
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed May 18 17:47:36 2005 +0000
+
+ Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
+ number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
+ version number. Modify DRIQueryVersion to return the libdri version
+ number, which all DDXes were requesting implicitly. Fix the DDXes to
+ check for the DRIINFO version they were compiled against.
+
+commit 4db50246111e420ad5e6ae9ac8c7e03ec0d5d704
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:30 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 9b0caee37f7ee99831735e819d97f9ccf155562a
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Oct 4 21:14:44 2004 +0000
+
+ Manual pages fixes (XFree86 bugzilla #1487, Nicolas Joly).
+
+commit a490c1eec95ec111bdc3555d29b77192bf8caf90
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:44:00 2004 +0000
+
+ Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
+ with the following notes:
+ - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
+ insecurity.
+ - VIA driver converted to new drmContext and drmHandle names.
+ - Radeon driver merge conflicted in many places, and MergedFB at least
+ could probably use some checking at this point.
+
+commit 5172fd205abbbe649205b21fc24f47df5cc5ac8a
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:27:19 2004 +0000
+
+ DRI trunk-20040613 import
+
+commit 982a12c6ae9d15e4d22d579de4f2c8fac1a2dcee
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:24:02 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 6f6d502351b3c7da0585791375b0102aa65e48be
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:49:53 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 38f39f7f4a75693866227156a7ef3673b587e3de
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:37 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit e91530f65fe7ef236459c97c06f2203cac507736
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:27 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 3cef3b10af1d67b237bde8a71ffddcef6bc7ba65
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:55 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d97a6f7a36b93bbd12e9d878cddfe1625f87e21d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:27 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 7aa6b58d626657e97cc5e72d43a2bd4c1b8611ce
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:37 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit a5301d652c98dbf07869a62c4198bae2d3f83571
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:43 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit d95aec56ffcf85524ee04d34caeb07d9b95ab463
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit c4dd1bf20f2bae6d34db059ae47f053012d8a822
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit 7b49b9b5c458d57b229b331cabd0e5cff6bf33ef
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 1 12:47:56 2007 +0200
autoreconf
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# 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
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index fab0aa3..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
commit 2b8121e83f34c8e77b0f6bf8a9047b90447d2c45
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 1 12:47:03 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-tdfx
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 db1b121..02e9b32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
xserver-xorg-video-tdfx (1:1.3.0-3) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-tdfx.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:31:44 +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-tdfx
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 01 May 2007 12:46:26 +0200
xserver-xorg-video-tdfx (1:1.3.0-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 25c2454..80c7adb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-tdfx
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), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-gl-dev, x11proto-video-dev, x11proto-xf86dga-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tdfx.git
Package: xserver-xorg-video-tdfx
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- tdfx display driver
derivatives.
.
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-tdfx' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-tdfx driver module.
diff --git a/debian/rules b/debian/rules
index c79c53d..4353512 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 c5ecce8becc7309a88197e94c35c1a5a12890bf9
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 21:56:27 2007 -0500
Revert accidental commit of a debian/patches patch
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index 0a374f4..765c716 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -309,22 +309,6 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
return FALSE;
}
- /* Disable DRI if using a 16Mb card with virtual resolution higher than
- * 1024x768 because DRI does not have enough memory available for textures
- * at higher resolutions, and will not operate correctly.
- */
- xf86DrvMsg(pScreen->myNum, X_INFO, "[dri] VideoRAM = %d, VirtualXres = %d, VirtualYres= %d,\n",
- pScrn->videoRam, pScrn->virtualX, pScrn->virtualY);
-
- if ( (pTDFX->ChipType == PCI_CHIP_VOODOO3) || (pTDFX->ChipType == PCI_CHIP_BANSHEE) ) {
- if (pScrn->videoRam <= 16384 && ((pScrn->virtualX * pScrn->virtualY) > (1024 * 768)) ) {
- xf86DrvMsg(pScreen->myNum, X_WARNING,
- "[dri] To use DRI, with a 16Mb Voodoo 3 or Banshee card, you must\n"
- "\tinvoke the server using a maximum resolution of 1024x768 or lower.\n");
- return FALSE;
- }
- }
-
/* Check that the GLX, DRI, and DRM modules have been loaded by testing
for canonical symbols in each module. */
if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 18df0e3..b9be362 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -46,8 +46,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Overlay planes
*/
-#include <stdlib.h>
-
/*
* These are X and server generic header files.
*/
@@ -2411,16 +2409,8 @@ TDFXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
TDFXPtr pTDFX;
TDFXTRACE("TDFXValidMode start\n");
- if (mode->HDisplay>2048) {
- xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution %d"
- " exceeding maximum of 2048\n", mode->HDisplay);
- return MODE_BAD;
- }
- if (mode->VDisplay>1536) {
- xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with vertical resolution %d"
- " exceeding maximum of 1536\n", mode->VDisplay);
+ if ((mode->HDisplay>2048) || (mode->VDisplay>1536))
return MODE_BAD;
- }
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
@@ -2434,19 +2424,13 @@ TDFXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
return MODE_OK;
break;
default:
- xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with unsupported"
- " interlace flag\n");
return MODE_BAD;
break;
}
}
/* In clock doubled mode widths must be divisible by 16 instead of 8 */
- if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16)) {
- xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution %d"
- " not divisibile by 16 and clock %d greater than %d\n",
- mode->HDisplay, mode->Clock, TDFX2XCUTOFF);
+ if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16))
return MODE_BAD;
- }
return MODE_OK;
}
diff --git a/src/tdfx_priv.c b/src/tdfx_priv.c
index ca9fcc9..74c20ed 100644
--- a/src/tdfx_priv.c
+++ b/src/tdfx_priv.c
@@ -4,13 +4,11 @@
#include "config.h"
#endif
-#include "tdfx.h"
-
#include "xf86.h"
-#include "xf86_ansic.h" /* For getsecs() */
#include "xf86_OSproc.h"
#include "xf86fbman.h"
#include "compiler.h"
+#include "tdfx.h"
/*
Memory layout of card is as follows:
commit 454bff7c021591441d1f09ab5a6a40de2d2f1b67
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:45:09 2007 -0500
Autoreconf
diff --git a/Makefile.in b/Makefile.in
index c30cf8a..7fe234f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ host_triplet = @host@
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
+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,7 +66,7 @@ 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
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff --git a/aclocal.m4 b/aclocal.m4
index e95712d..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
@@ -6537,35 +6538,69 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
dnl
-dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
+dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, and/or sell copies of the Software, and to permit persons
+dnl to whom the Software is furnished to do so, provided that the above
+dnl copyright notice(s) and this permission notice appear in all copies of
+dnl the Software and that both the above copyright notice(s) and this
+dnl permission notice appear in supporting documentation.
+dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of a copyright holder
+dnl shall not be used in advertising or otherwise to promote the sale, use
+dnl or other dealings in this Software without prior written authorization
+dnl of the copyright holder.
+
+# XORG_MACROS_VERSION(required-version)
+# -------------------------------------
+# Minimum version: 1.1.0
+#
+# If you're using a macro added in Version 1.1 or newer, include this in
+# your configure.ac with the minimum required version, such as:
+# XORG_MACROS_VERSION(1.1)
+#
+# To force at least a version with this macro defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+#
+#
+# See the "minimum version" comment for each macro you use to see what
+# version you require.
+AC_DEFUN([XORG_MACROS_VERSION],[
+ [XORG_MACROS_needed_version=$1
+ 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.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
+ AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
+ fi
+ if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
+ AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
+ fi
+ AC_MSG_RESULT([yes, $XORG_MACROS_version])
+]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
# ------------------
+# Minimum version: 1.0.0
+#
# Find cpp program and necessary flags for use in pre-processing text files
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
Reply to: