xserver-xorg-video-trident: Changes to 'debian-unstable'
.gitignore | 20
ChangeLog | 573 +++++++++++----
Makefile.in | 4
aclocal.m4 | 288 +++----
autogen.sh | 12
config.guess | 75 -
config.h.in | 9
config.sub | 40 -
configure | 1894 ++++++++++++--------------------------------------
debian/changelog | 20
debian/control | 14
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 126 ---
man/.cvsignore | 2
man/Makefile.in | 2
mkinstalldirs | 89 +-
src/.cvsignore | 6
src/Makefile.am | 1
src/Makefile.in | 10
src/trident.h | 4
src/trident_driver.c | 4
src/trident_video.c | 13
23 files changed, 1255 insertions(+), 1983 deletions(-)
New commits:
commit 5e4b374f26a772b75511b9c84849a95adba9a45f
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 01:22:23 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 4809cab..a21321e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,155 +1,418 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/trident_driver.c:
- Bump to 1.2.1 for Xv changes.
-
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
-
- * src/trident_video.c: (TRIDENTPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/blade_accel.c:
- * src/blade_accel_exa.c:
- * src/image_accel.c:
- * src/trident.h:
- * src/trident_accel.c:
- * src/trident_bank.c:
- * src/trident_dac.c:
- * src/trident_dga.c:
- * src/trident_driver.c:
- * src/trident_i2c.c:
- * src/trident_shadow.c:
- * src/trident_tv.c:
- * src/trident_video.c:
- * src/tridenthelper.c:
- * src/tridentramdac.c:
- * src/tvga_dac.c:
- * src/xp4_accel.c:
- * src/xp4_accel_exa.c:
- * src/xp_accel.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.2.0.
-
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * src/trident.h:
- Coverity #500: Size the tridentRegsClock array properly.
-
-2006-03-14 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * src/blade_accel_exa.c: (BladeExaInit):
- * src/xp4_accel_exa.c: (XP4ExaInit):
- Change virtualX to displayWidth (caught by Eric Anholt)
-
-2006-03-13 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * src/blade_accel_exa.c: (BladeExaInit):
- * src/trident_driver.c: (TRIDENTPreInit):
- * src/xp4_accel_exa.c: (XP4ExaInit):
- EXA fixups for version 2
- Add missing break statement which confused XP4 & XP5.
- Force 128MB XP5 to 64MB for now.
-
-2006-02-21 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * man/trident.man:
- * src/Makefile.am:
- * src/blade_accel.c: (BladeXaaInit):
- * src/blade_accel_exa.c: (GetCopyROP), (GetDepth), (PrepareSolid),
- (Solid), (DoneSolid), (PrepareCopy), (Copy), (DoneCopy),
- (CheckComposite), (PrepareComposite), (Composite), (DoneComposite),
- (UploadToScreen), (DownloadFromScreen), (MarkSync),
- (BladeDisableClipping), (WaitMarker), (PrepareAccess),
- (FinishAccess), (BladeSetClippingRectangle),
- (BladeInitializeAccelerator), (BladeExaInit):
- * src/trident.h:
- * src/trident_driver.c: (tridentSetup), (TRIDENTProbe),
- (TRIDENTPreInit), (TRIDENTMapMem), (TRIDENTScreenInit),
- (TRIDENTLeaveVT), (TRIDENTCloseScreen):
- * src/trident_regs.h:
- * src/xp4_accel.c: (XP4InitializeAccelerator), (XP4XaaInit),
- (XP4Sync), (XP4SetupForScreenToScreenCopy),
- (XP4SubsequentScreenToScreenCopy), (XP4SetupForSolidLine),
- (XP4SubsequentSolidBresenhamLine), (XP4SubsequentSolidHorVertLine),
- (XP4SetupForDashedLine), (XP4SubsequentDashedBresenhamLine),
- (XP4SetupForFillRectSolid), (XP4SubsequentFillRectSolid),
- (MoveDWORDS), (MoveDWORDS_FixedBase),
- (XP4SetupForMono8x8PatternFill),
- (XP4SubsequentMono8x8PatternFillRect),
- (XP4SetupForCPUToScreenColorExpandFill),
- (XP4SubsequentCPUToScreenColorExpandFill):
- * src/xp4_accel_exa.c: (GetCopyROP), (GetPatternROP),
- (XP4WaitMarker), (XP4Done), (XP4PrepareSolid), (XP4Solid),
- (XP4PrepareCopy), (XP4Copy), (XP4ExaInit):
- Add XAA & EXA Acceleration for XP4 & XP5 Chipsets
- Add EXA Acceleration for Blade chipsets (Jesse Barnes)
-
-2006-02-01 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * src/trident_dac.c: (TridentInit), (TridentHWCursorInit):
- * src/trident_driver.c: (TRIDENTPreInit), (TRIDENTModeInit),
- (TRIDENTCloseScreen), (TRIDENTLcdDisplaySize):
- * src/trident_video.c: (tridentFixFrame):
- * src/tridenthelper.c: (TridentFindClock):
- Commit patch from https://bugs.freedesktop.org/show_bug.cgi?id=2785
- i.e. detect 1400x1050 panels from DDC information and a few other
- fixes for BladeXP chipsets - notably the Toshiba Tecra 8200.
-
-2006-01-27 Alan Hourihane <alanh@fairlite.demon.co.uk>
-
- * configure.ac:
- * src/trident.h:
- * src/trident_dac.c: (TridentInit), (TridentRestore),
- (TridentSave), (TridentHWCursorInit):
- * src/trident_driver.c: (TRIDENTPreInit), (TRIDENTModeInit):
- Add XGI (aka Trident) Volari XP5 support
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Add check for DGA extension to fix issues when building with
- separate build roots.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 03a15e04753620b39d4c9305fb2abaed82a4315f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jan 10 13:51:16 2007 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit 35e244f1907af6ab40b4ac1334ea4834c5002960
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jan 10 13:50:50 2007 -0800
+
+ Delete tridentramdac.c since all functions inside are unused
+
+commit 3d08f373272f5762e648e07114661bb9d2f0d768
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Fri Dec 1 11:12:02 2006 +0000
+
+ Fix PC98 systems with WAITFORVSYNC
+ Bug #5325
+
+commit aff5750bcb09806cd5b0e570dacb60be391a463d
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Fri Dec 1 11:03:28 2006 +0000
+
+ Add doublescan support (not tested on all chipsets).
+ Bug #5173
+
+commit ea28fcfa41b5583f2bff548562f37e33a1bb4890
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Fri Nov 3 16:32:22 2006 +0000
+
+ Bump to 1.2.3
+
+commit 1edecc1a72cf1e53a2800e2941cb3b49b9b7f97d
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Wed Oct 18 14:14:58 2006 +0100
+
+ Remove spurious line that stops blit's from working.
+
+commit 843d6f21c5d9ad1513ddd90c95d0aa460a2db9d7
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 18:46:16 2006 -0400
+
+ Bump to 1.2.2
+
+commit 85e4ed8ab4baf6b581ad4e94bd776ff17e71e4ed
+Author: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
+Date: Sat Sep 9 11:06:31 2006 -0700
+
+ use EXA_TWO_BITBLT_DIRECTIONS flag and remove PrepareCopy direction
+ check. This makes blits *much* faster in negative directions.
+
+commit 6617fece6a6174daf7cb98d2d2d3c7d5bbc5c574
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:51:12 2006 +0000
+
+ Bump to 1.2.1 for Xv changes.
+
+commit d9b3680a0ef046a18cb1c910f214336ab764d2ed
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:16:26 2006 +0000
+
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
+
+commit d878eb3c01ccc360d62f6522c7c4a1f490d8649d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:42:44 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.2.0.
+
+commit ecee33947792c55f983061b3895da2c656a04047
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 00:44:13 2006 +0000
+
+ Woops, wrong size.
+
+commit 5aeb4912aa94eae64e6149e9d9a32b01a8abc18b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 00:43:10 2006 +0000
+
+ Coverity #500: Size the tridentRegsClock array properly.
+
+commit b5eea84af30f5086ba0151453ed15df1fca507b2
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Tue Mar 14 20:09:04 2006 +0000
+
+ Change virtualX to displayWidth (caught by Eric Anholt)
+
+commit 2466da4f51142d78bd27fdc719bfed11cbb68a0d
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Mon Mar 13 10:33:34 2006 +0000
+
+ EXA fixups for version 2 Add missing break statement which confused XP4 &
+ XP5. Force 128MB XP5 to 64MB for now.
+
+commit 1ed618844c23dab7e06ac3ce01d73617f2641e0e
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Thu Mar 9 06:06:25 2006 +0000
+
+ Update drivers that support EXA for the new EXA ABI. This consists of
+ moving all the accel and card members into the driver ptr, filling in
+ the exa_major/ exa_minor fields, and always using LoadSubModule so we
+ can check the module version up front. Only tested on ATI.
+
+commit e7d93a288892226e2c9c1627d3afd788469b174d
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Sat Feb 25 19:03:36 2006 +0000
+
+ Do some cleanups that I should have done before sending the last checkin to
+ Alan: o remove old reference to blade_accel.c filename o remove
+ unused/broken functions o remove unused/broken clipping code o add TODO
+ list
+
+commit 825af17a87365d7f9c5b1fa5f9b8177cf92e3163
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Tue Feb 21 04:27:00 2006 +0000
+
+ Add XAA & EXA Acceleration for XP4 & XP5 Chipsets Add EXA Acceleration for
+ Blade chipsets (Jesse Barnes)
+
+commit 068a2240b0c8ac63820985002b5d3b154a24c463
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Wed Feb 1 14:55:03 2006 +0000
+
+ Commit patch from https://bugs.freedesktop.org/show_bug.cgi?id=2785 i.e.
+ detect 1400x1050 panels from DDC information and a few other fixes for
+ BladeXP chipsets - notably the Toshiba Tecra 8200.
+
+commit 6739dd1c974625ae63561de2e494d0a0bb3d895d
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Fri Jan 27 17:14:03 2006 +0000
+
+ Add XGI (aka Trident) Volari XP5 support
+
+commit 27df712a78be57213c6b91a648c186b7cfa461ac
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:04 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 753a160e390a61da137bb3bff5beacaa6414f92e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:56 2005 +0000
+
+ Stub COPYING files
+
+commit 2a9397020d713f53d464d5513812f500c08e1655
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:20 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit aa8f600b9e02e786356e26ddc4af2928be936d8a
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:40 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d40a0c982958f0d32b8a11276b6741f873aedeb8
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:36 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit c43a2acb6995c8f3aedf73a5419b5aed6006193a
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:45:18 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC3.
+
+commit 331dac68fb455f3b2ad8ddd4efd59a84704ce2e6
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:11 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 3d66357efafa876b8036d739ccf54f9d997760ca
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Dec 1 01:37:42 2005 +0000
+
+ Compile fix, since OUTW isn't a safe macro
+
+commit 0870b14cfdccfa47cb603bd23b2272276cde53b4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:05 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 8245e3754d921a620a498f49e108b7433a7999bf
+Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
+Date: Tue Nov 29 17:18:50 2005 +0000
+
+ //bugs.freedesktop.org/show_bug.cgi?id=736> Fix offset for later generation
+ trident chipsets so that Xv data is correctly grabbed from video
+ memory. Spotted by Guy Martin.
+ (approved by Kevin Martin)
+
+commit e9643d544856afd1925dcdeb77d0f0541115f19f
+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 be089d215a4424693ec240482c658eec4c6d1be0
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:21 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 9dccb166ecbcc58c3563e99d8654d5755d8d9e79
+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 34377e19400ec8b34a66438bd24409bf8f8f82db
+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 6b9d32a6c377b7c1d3f790e379bffb56644be361
+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 14263d324598799d2fd8c307ae9a228c7bb2a08d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:05 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 68ef79091467d2287745ecc80c8c3ae48f76e920
+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 88ec6f377e6e098c1a487acb73372535f2079794
+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 c498235210cce08ee9021d6521cdd6be19fd603f
+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 c00fe1ecce1ec1ccca1b80531e2f6b6e6f799767
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:53 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 7b056454e1e40dc2cc4ca237371c9c820cd464a0
+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 5fdfb936dda1156237851a66a935ca40e4b07788
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 23:50:00 2005 +0000
+
+ Build system for trident
+
+commit 0dfd8e6118bb19e35fa25be17e6e91a0fbe8ce1a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:30:06 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 6c6da4fe83dd3adfacfba9f8b33d7c527431714f
+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 e7c8c6f3ecee5c98b71d0ae67e903ee53b3f8b10
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:32 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 9d25428e100e5c1ea50f0b9637876c866faab5bb
+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 95ade3acbaa6686fb359c5f947bd00f1d5779829
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 20 00:55:44 2004 +0000
+
+ Bug #1202: Remove long-broken 1bpp and 4bpp support from trident driver.
+ (Jakub Stachowski)
+
+commit 7d9d969e5d284bc11facfe73eaee836d389dc85d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Sep 17 03:04:54 2004 +0000
+
+ Bug #1192: Remove cfb support from drivers where its use is an option.
+ Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+ to refer to fb rather than cfb.
+
+commit c9a8d5c10c790bef0679584b5d76afcdb01e260d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Aug 16 09:13:15 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 7d4c57a4c86634e15fb3cacdcb5fe93f88623b4f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Aug 3 02:44:21 2004 +0000
+
+ Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
+ DoLoadableServer NO builds work again.
+
+commit c0aee253f74df4289f9d8925ce51caa08f2b527e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:55 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 488e064bbfccce86583e7f2ad994cdcb4956c272
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:24:06 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 01ae1f06e3aff1a0f644d6c42d590a5c1ef35965
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:52:01 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit c294354b1420e28868d8c1904754fe18f1fba944
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:40 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit c8db80d030c7981b2177dd25f0124ffbd606fa18
+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 5146cc7c6cff956fdba8ffed48a72d409ec91690
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:55 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 7e2ec0695673eddc1ed629f76e0ff30b521d5aba
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 3a39b4ff86bb55ee763dcf6da12c1ad3d410a2db
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:41 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 03cfac30d2a93d40779725b97be0dfa3d3ba33f2
+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 a43c68bc5bc9cf42193a8aca56a1faa5d00392b4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:43 2003 +0000
+
+ Initial revision
+
+commit 05cd400034a85d1dcb6956cece5079f79376becf
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit b1d44d56b82021cf73fb3449faa9ddc4efd72a87
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit b1ed5cbb25d9cc86f960888e8330e167b2f316b4
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 01:11:01 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-trident
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 adb5868..03e5279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
xserver-xorg-video-trident (1:1.2.3-3) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-trident.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:35:02 +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-trident
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 01:10:08 +0200
xserver-xorg-video-trident (1:1.2.3-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 54d4f3a..adc5d7d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-trident
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-video-dev, x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+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-video-dev, x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git
Package: xserver-xorg-video-trident
Architecture: any
@@ -17,8 +19,8 @@ Description: X.Org X server -- Trident display driver
video cards.
.
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-trident' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-trident driver module.
diff --git a/debian/rules b/debian/rules
index 0b1a107..77c3836 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 --exclude=.la
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 78252ef990fab65b6b7bec9c6e453003ca69c8a6
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:45:11 2007 -0500
Autoreconf
diff --git a/Makefile.in b/Makefile.in
index bd3d980..21f61f8 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 bf3af98..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -219,14 +219,6 @@ AC_ARG_WITH([pic],
[pic_mode=default])
test -z "$pic_mode" && pic_mode=default
-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
-#
-# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
-# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
-# calls AC_LIBTOOL_CONFIG and creates libtool.
-#
-_LT_VERSION_CHECK
-
# Use C for the default configuration in the libtool script
tagname=
AC_LIBTOOL_LANG_C_CONFIG
@@ -234,41 +226,6 @@ _LT_AC_TAGCONFIG
])# AC_LIBTOOL_SETUP
-# _LT_VERSION_CHECK
-# -----------------
-AC_DEFUN([_LT_VERSION_CHECK],
-[AC_MSG_CHECKING([for correct ltmain.sh version])
-if test "x$ltmain" = "x" ; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** \$ltmain is not defined, please check the patch for consistency! ***
-])
-fi
-gentoo_lt_version="1.5.22"
-gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** libtool.m4 and ltmain.sh have a version mismatch! ***
-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
-
-Please run:
-
- libtoolize --copy --force
-
-if appropriate, please contact the maintainer of this
-package (or your distribution) for help.
-])
-else
- AC_MSG_RESULT(yes)
-fi
-])# _LT_VERSION_CHECK
-
-
# _LT_AC_SYS_COMPILER
# -------------------
AC_DEFUN([_LT_AC_SYS_COMPILER],
@@ -1399,30 +1356,6 @@ cygwin* | mingw* | pw32*)
esac
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- $archive_expsym_cmds="$archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
@@ -1464,18 +1397,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -1487,14 +1408,7 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -1505,12 +1419,6 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1644,7 +1552,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1673,7 +1581,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1682,7 +1590,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -2390,7 +2298,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2444,11 +2352,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
Reply to: