qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-video-trident 1.3.4

Browse Source
This commit is contained in:
matthieu 2010-07-24 20:15:44 +00:00
parent b797fa7ce1
commit 5ef42429ee
14 changed files with 3042 additions and 1320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
driver/xf86-video-trident/COPYING
View File

@ -1,12 +1,63 @@
This is a stub file. This package has not yet had its complete licensing
information compiled. Please see the individual source files for details on
your rights to use and modify this software.
Copyright 1992-2003 by Alan Hourihane, North Wales, UK.
Please submit updated COPYING files to the Xorg bugzilla:
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation, and that the name of Alan Hourihane not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. Alan Hourihane makes no representations
about the suitability of this software for any purpose. It is provided
"as is" without express or implied warranty.
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
All licensing questions regarding this software should be directed at the
Xorg mailing list:
Copyright 1997-2003 by Alan Hourihane, North Wales, UK.
Copyright 2006 by Alan Hourihane, North Wales, UK.
Copyright (c) 2006, Jesse Barnes <jbarnes@virtuousgeek.org>
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation, and that the name of the authors not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. The authors make no representations
about the suitability of this software for any purpose. It is provided
"as is" without express or implied warranty.
THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
Copyright 2007 George Sapountzis
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
http://lists.freedesktop.org/mailman/listinfo/xorg

772
driver/xf86-video-trident/ChangeLog
View File

@ -1,155 +1,687 @@
2006-04-07 Adam Jackson <ajax@freedesktop.org>
commit b5d17329ae1746bc95ac211c1325df86982e0eb1
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:32:39 2010 +1000
* configure.ac:
* src/trident_driver.c:
Bump to 1.2.1 for Xv changes.
trident 1.3.4
2006-04-07 Aaron Plattner <aplattner@nvidia.com>
commit ea2f02a84ad5a51a39c0ae55fa5aa785360d3830
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 12:34:21 2010 -0400
* src/trident_video.c: (TRIDENTPutImage):
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2006-04-07 Adam Jackson <ajax@freedesktop.org>
commit cb7949bf5a4e99755677ce5df09f2e977a47da71
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:05:31 2010 -0800
* 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.
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2006-04-06 Adam Jackson <ajax@freedesktop.org>
commit c5ec01e6786280717675d3841d85337645b15753
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
* src/trident.h:
Coverity #500: Size the tridentRegsClock array properly.
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2006-03-14 Alan Hourihane <alanh@fairlite.demon.co.uk>
commit 1331623dbee4fbfa36188a4460a95bed4128f11e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 30 13:08:51 2009 -0500
* src/blade_accel_exa.c: (BladeExaInit):
* src/xp4_accel_exa.c: (XP4ExaInit):
Change virtualX to displayWidth (caught by Eric Anholt)
Make banking support properly conditional on ISA support
Signed-off-by: Adam Jackson <ajax@redhat.com>
2006-03-13 Alan Hourihane <alanh@fairlite.demon.co.uk>
commit d6f5105ff4bab91a2af4cf5655b88ff27cba74bd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:06 2009 -0500
* 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.
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
2006-02-21 Alan Hourihane <alanh@fairlite.demon.co.uk>
commit 3809fea7739b8639d855d790686c2b1eb1b91898
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
* 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)
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
2006-02-01 Alan Hourihane <alanh@fairlite.demon.co.uk>
commit 781094dd862b209022bb2f8cdf394e3479ab28c6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
* 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.
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
2006-01-27 Alan Hourihane <alanh@fairlite.demon.co.uk>
commit 11775de5025c32b65551497cb7fbb7040be9c314
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:22 2009 -0400
* 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
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 7401cbd387631e2678bbdfdfcc4e30e5a0ecd4c8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
* configure.ac:
Update package version for X11R7 release.
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit f688b70c64ceed3704db2510a17561524a3b6ef8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
* configure.ac:
Update package version number for final X11R7 release candidate.
xf86-video-trident: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 33fc86bade1c638300f1b17236cb0b0a492ac6d0
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Aug 5 10:26:35 2009 +1000
* man/Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
bump to 1.3.3 for release
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 3008fa244f8fdf8bf3306dd8c3b781221885ec1b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
* configure.ac:
Update package version number for X11R7 RC3 release.
trident: change to using ABI version check
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 314cb60172135abb5efe40fd0a0e6837f2662780
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:39 2009 +1000
* configure.ac:
Remove extraneous AC_MSG_RESULT.
trident: update for resources/RAC API removal
2005-11-29 Adam Jackson <ajax@freedesktop.org>
commit 6ef2f6e2e7628311e25d2fe35452372cd03bfb57
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:57:17 2009 +1000
* configure.ac:
Only build dlloader modules by default.
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 51d9968f5084f3c38c7459d2e0a1c28d355cbae2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:51:05 2009 -0400
* configure.ac:
Add check for DGA extension to fix issues when building with
separate build roots.
trident 1.3.2
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 5f638c14ebda6473dea664b3730844ae9792933e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:22:59 2009 -0400
* configure.ac:
Update package version number for X11R7 RC2 release.
Remove useless loader symbol lists.
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit d0e17d0a40c771ae484252ab6a1c093a60bddaa7
Author: Chris Ball <cjb@laptop.org>
Date: Fri Feb 27 10:58:07 2009 -0500
* configure.ac:
Update pkgcheck dependencies to work with separate build roots.
Revert "Build fix: set EXA_DRIVER_KNOWN_MAJOR=3"
This reverts commit b951fe81bb976704be716251a4925086f2c70013.
The EXA developers have backed out this ABI bump.
Signed-off-by: Chris Ball <cjb@laptop.org>
commit b951fe81bb976704be716251a4925086f2c70013
Author: Chris Ball <cjb@laptop.org>
Date: Wed Feb 25 13:00:12 2009 -0500
Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
EXA in server HEAD requires this now. Since this driver doesn't use
{Prepare,Finish}Access or UploadToScratch, the change is safe.
Remove unused {Prepare,Finish}Access empty functions.
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 4152c64a22e81a8f2e2d91507493c422aac301a3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:04:56 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
commit 52286f1c9c543d6e8105192dc4914fa6f934bf60
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:37:18 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
commit a4ae6379a5725e77837201bf1dc735124f7dc368
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 13:59:29 2008 +1000
trident 1.3.1
commit 34915ef8969596f2aca4700c02a08959b916ed1f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 01:01:32 2008 -0200
Correct macro IsPrimaryCard to check HAVE_ISA.
commit 73cbaec34866524deab838d04876408bbc93a102
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Nov 23 17:30:45 2008 -0500
Make ISA optional
commit 7119ae2424d7fea8eb67586be4ea9982000dcc3a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 15 14:08:10 2008 -0400
Uninclude xf86Version.h
commit a1cd2244b7457189630fab8be1532272e8eb7d64
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 6 14:47:14 2008 +0200
Link with -lm for sin()
commit ac4bce50754528efbf55daa87dd4992ac70c4af2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:42:53 2008 -0400
trident 1.3.0
commit 012794d5aa4cf862f7d5b83d744acc2d5a13bf52
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:41:46 2008 -0400
Fix distcheck
commit 6e64c2a2d8bfc9cf3daf5f0df430ede5a5d0d7fb
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:40:11 2008 -0400
Death to RCS tags.
commit 8419334ee64c977870194a651e2c5f05b6e89fa4
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:01:45 2008 +0100
Makefile.am: nuke RCS Id
commit a34c4ca7e1e8f2734aa443c0d597840f970e0eef
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Feb 18 16:51:10 2008 +1000
initial trident pciaccess support
commit 707a7c779c6859761c1b895b397239a36abef4c6
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun Feb 10 21:12:33 2008 +0000
bump to 1.2.4
commit 6e204c6f73ccf262cb9f1eaa68af9d4c86321bd8
Author: Kostas Georgiou <hannibal@astral.lodz.pl>
Date: Sun Feb 10 21:11:01 2008 +0000
Don't set VID_DOUBLE_LINEBUFFER_FOR_WIDE_SRC for XP4
commit 8e8eafa82c66873fcc0f159b56fd638c03304a6d
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun Jan 6 20:26:13 2008 +0000
Fix typo
commit 61a0dcfa57702fbe4d2a1832a014ce9bc5ddfc89
Author: Jan Darmochwal <jdarmochwal@gmx.de>
Date: Sun Jan 6 20:23:58 2008 +0000
Turn on colour key for XP4
commit 1a6bbe36a7f91d90e39251ba7759f3db5b6d4d24
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 11:53:13 2007 +0200
TRIDENT_*_VERSION using PACKAGE_VERSION_*
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

12
driver/xf86-video-trident/Makefile.am
View File

@ -18,5 +18,15 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL

26
driver/xf86-video-trident/Makefile.in
View File

@ -57,7 +57,7 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
$(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -97,6 +97,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -107,8 +108,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -133,6 +136,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -149,6 +153,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@ -173,6 +178,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_CC = @ac_ct_CC@
@ -223,8 +229,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -466,6 +472,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -592,6 +601,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -647,7 +657,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@ -659,6 +669,16 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

778
driver/xf86-video-trident/aclocal.m4 vendored
View File

@ -7636,29 +7636,23 @@ dnl
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 copy of this software and associated documentation files (the "Software"),
dnl to deal in the Software without restriction, including without limitation
dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
dnl and/or sell copies of the Software, and to permit persons to whom the
dnl Software is furnished to do so, subject to the following conditions:
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 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 The above copyright notice and this permission notice (including the next
dnl paragraph) shall be included in all copies or substantial portions of the
dnl 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.
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
dnl DEALINGS IN THE SOFTWARE.
# XORG_MACROS_VERSION(required-version)
# -------------------------------------
@ -7676,7 +7670,7 @@ dnl of the copyright holder.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.3.0])
m4_define([vers_have], [1.8.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@ -7744,9 +7738,12 @@ AC_SUBST(RAWCPPFLAGS)
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
# Override default settings by setting environment variables
# Added MAN_SUBSTS in version 1.8
# Added AC_PROG_SED in version 1.8
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_PROG_SED])
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
@ -7815,8 +7812,52 @@ AC_SUBST([FILE_MAN_DIR])
AC_SUBST([MISC_MAN_DIR])
AC_SUBST([DRIVER_MAN_DIR])
AC_SUBST([ADMIN_MAN_DIR])
XORG_MAN_PAGE="X Version 11"
AC_SUBST([XORG_MAN_PAGE])
MAN_SUBSTS="\
-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
AC_SUBST([MAN_SUBSTS])
]) # XORG_MANPAGE_SECTIONS
# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
# ------------------------
# Minimum version: 1.7.0
#
# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
# provided by xorg-sgml-doctools, if installed.
AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])])
XORG_SGML_PATH=
PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
[m4_ifval([$1],[:],
[if test x"$cross_compiling" != x"yes" ; then
AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
[XORG_SGML_PATH=$prefix/share/sgml])
fi])
])
if test "x$XORG_SGML_PATH" != "x" ; then
AC_MSG_RESULT([$XORG_SGML_PATH])
else
AC_MSG_RESULT([no])
fi
AC_SUBST(XORG_SGML_PATH)
]) # XORG_CHECK_SGML_DOCTOOLS
# XORG_CHECK_LINUXDOC
# -------------------
# Minimum version: 1.0.0
@ -7826,23 +7867,14 @@ 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],[
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
AC_REQUIRE([XORG_WITH_PS2PDF])
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([Whether to build documentation])
AC_MSG_CHECKING([whether to build documentation])
if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@ -7852,9 +7884,9 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
AC_MSG_RESULT([$BUILDDOC])
AC_MSG_CHECKING([Whether to build pdf documentation])
AC_MSG_CHECKING([whether to build pdf documentation])
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
else
BUILDPDFDOC=no
@ -7864,7 +7896,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
AC_MSG_RESULT([$BUILDPDFDOC])
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f"
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
MAKE_PDF="$PS2PDF"
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
@ -7884,48 +7916,44 @@ AC_SUBST(MAKE_HTML)
# 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],[
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
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 &&
AC_MSG_CHECKING([whether to build text documentation])
if test x$XORG_SGML_PATH != 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 &&
AC_MSG_CHECKING([whether to build PDF documentation])
if test x$XORG_SGML_PATH != 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 &&
AC_MSG_CHECKING([whether to build PostScript documentation])
if test x$XORG_SGML_PATH != 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 &&
AC_MSG_CHECKING([whether to build HTML documentation])
if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x &&
test x$BUILD_HTMLDOC != xno; then
BUILDHTMLDOC=yes
fi
@ -7943,6 +7971,490 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK
# XORG_WITH_XMLTO([MIN-VERSION])
# ----------------
# Minimum version: 1.5.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-xmlto option, it allows maximum flexibilty in making decisions
# as whether or not to use the xmlto package.
#
# Interface to module:
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
# XMLTO: returns the path of the xmlto program found
# returns the path set by the user in the environment
# --with-xmlto: 'yes' user instructs the module to use xmlto
# 'no' user instructs the module not to use xmlto
#
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_XMLTO],[
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto],
[Use xmlto to regenerate documentation (default: yes, if installed)]),
[use_xmlto=$withval], [use_xmlto=auto])
if test "x$use_xmlto" = x"auto"; then
AC_PATH_PROG([XMLTO], [xmlto])
if test "x$XMLTO" = "x"; then
AC_MSG_WARN([xmlto not found - documentation targets will be skipped])
have_xmlto=no
else
have_xmlto=yes
fi
elif test "x$use_xmlto" = x"yes" ; then
AC_PATH_PROG([XMLTO], [xmlto])
if test "x$XMLTO" = "x"; then
AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH])
fi
have_xmlto=yes
elif test "x$use_xmlto" = x"no" ; then
if test "x$XMLTO" != "x"; then
AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified])
fi
have_xmlto=no
else
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
fi
m4_ifval([$1],
[if test "$have_xmlto" = yes; then
# scrape the xmlto version
AC_MSG_CHECKING([the xmlto version])
xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
AC_MSG_RESULT([$xmlto_version])
AS_VERSION_COMPARE([$xmlto_version], [$1],
[if test "x$use_xmlto" = xauto; then
AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed])
have_xmlto=no
else
AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
fi])
fi])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
# XORG_WITH_ASCIIDOC([MIN-VERSION])
# ----------------
# Minimum version: 1.5.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
# as whether or not to use the asciidoc package.
#
# Interface to module:
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
# ASCIIDOC: returns the path of the asciidoc program found
# returns the path set by the user in the environment
# --with-asciidoc: 'yes' user instructs the module to use asciidoc
# 'no' user instructs the module not to use asciidoc
#
# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_ASCIIDOC],[
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
AC_ARG_WITH(asciidoc,
AS_HELP_STRING([--with-asciidoc],
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
[use_asciidoc=$withval], [use_asciidoc=auto])
if test "x$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test "x$ASCIIDOC" = "x"; then
AC_MSG_WARN([asciidoc not found - documentation targets will be skipped])
have_asciidoc=no
else
have_asciidoc=yes
fi
elif test "x$use_asciidoc" = x"yes" ; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test "x$ASCIIDOC" = "x"; then
AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH])
fi
have_asciidoc=yes
elif test "x$use_asciidoc" = x"no" ; then
if test "x$ASCIIDOC" != "x"; then
AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified])
fi
have_asciidoc=no
else
AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no'])
fi
m4_ifval([$1],
[if test "$have_asciidoc" = yes; then
# scrape the asciidoc version
AC_MSG_CHECKING([the asciidoc version])
asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2`
AC_MSG_RESULT([$asciidoc_version])
AS_VERSION_COMPARE([$asciidoc_version], [$1],
[if test "x$use_asciidoc" = xauto; then
AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed])
have_asciidoc=no
else
AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed])
fi])
fi])
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
]) # XORG_WITH_ASCIIDOC
# XORG_WITH_DOXYGEN([MIN-VERSION])
# --------------------------------
# Minimum version: 1.5.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-doxygen option, it allows maximum flexibilty in making decisions
# as whether or not to use the doxygen package.
#
# Interface to module:
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
# DOXYGEN: returns the path of the doxygen program found
# returns the path set by the user in the environment
# --with-doxygen: 'yes' user instructs the module to use doxygen
# 'no' user instructs the module not to use doxygen
#
# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_DOXYGEN],[
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen],
[Use doxygen to regenerate documentation (default: yes, if installed)]),
[use_doxygen=$withval], [use_doxygen=auto])
if test "x$use_doxygen" = x"auto"; then
AC_PATH_PROG([DOXYGEN], [doxygen])
if test "x$DOXYGEN" = "x"; then
AC_MSG_WARN([doxygen not found - documentation targets will be skipped])
have_doxygen=no
else
have_doxygen=yes
fi
elif test "x$use_doxygen" = x"yes" ; then
AC_PATH_PROG([DOXYGEN], [doxygen])
if test "x$DOXYGEN" = "x"; then
AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH])
fi
have_doxygen=yes
elif test "x$use_doxygen" = x"no" ; then
if test "x$DOXYGEN" != "x"; then
AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified])
fi
have_doxygen=no
else
AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no'])
fi
m4_ifval([$1],
[if test "$have_doxygen" = yes; then
# scrape the doxygen version
AC_MSG_CHECKING([the doxygen version])
doxygen_version=`$DOXYGEN --version 2>/dev/null`
AC_MSG_RESULT([$doxygen_version])
AS_VERSION_COMPARE([$doxygen_version], [$1],
[if test "x$use_doxygen" = xauto; then
AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed])
have_doxygen=no
else
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
fi])
fi])
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
]) # XORG_WITH_DOXYGEN
# XORG_WITH_GROFF
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-groff option, it allows maximum flexibilty in making decisions
# as whether or not to use the groff package.
#
# Interface to module:
# HAVE_GROFF: used in makefiles to conditionally generate documentation
# HAVE_GROFF_MM: the memorandum macros (-mm) package
# HAVE_GROFF_MS: the -ms macros package
# GROFF: returns the path of the groff program found
# returns the path set by the user in the environment
# --with-groff: 'yes' user instructs the module to use groff
# 'no' user instructs the module not to use groff
#
# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
#
# OS and distros often splits groff in a basic and full package, the former
# having the groff program and the later having devices, fonts and macros
# Checking for the groff executable is not enough.
#
# If macros are missing, we cannot assume that groff is useless, so we don't
# unset HAVE_GROFF or GROFF env variables.
# HAVE_GROFF_?? can never be true while HAVE_GROFF is false.
#
AC_DEFUN([XORG_WITH_GROFF],[
AC_ARG_VAR([GROFF], [Path to groff command])
AC_ARG_WITH(groff,
AS_HELP_STRING([--with-groff],
[Use groff to regenerate documentation (default: yes, if installed)]),
[use_groff=$withval], [use_groff=auto])
if test "x$use_groff" = x"auto"; then
AC_PATH_PROG([GROFF], [groff])
if test "x$GROFF" = "x"; then
AC_MSG_WARN([groff not found - documentation targets will be skipped])
have_groff=no
else
have_groff=yes
fi
elif test "x$use_groff" = x"yes" ; then
AC_PATH_PROG([GROFF], [groff])
if test "x$GROFF" = "x"; then
AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH])
fi
have_groff=yes
elif test "x$use_groff" = x"no" ; then
if test "x$GROFF" != "x"; then
AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified])
fi
have_groff=no
else
AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
fi
# We have groff, test for the presence of the macro packages
if test "x$have_groff" = x"yes"; then
AC_MSG_CHECKING([for ${GROFF} -ms macros])
if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then
groff_ms_works=yes
else
groff_ms_works=no
fi
AC_MSG_RESULT([$groff_ms_works])
AC_MSG_CHECKING([for ${GROFF} -mm macros])
if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then
groff_mm_works=yes
else
groff_mm_works=no
fi
AC_MSG_RESULT([$groff_mm_works])
fi
AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
]) # XORG_WITH_GROFF
# XORG_WITH_FOP
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-fop option, it allows maximum flexibilty in making decisions
# as whether or not to use the fop package.
#
# Interface to module:
# HAVE_FOP: used in makefiles to conditionally generate documentation
# FOP: returns the path of the fop program found
# returns the path set by the user in the environment
# --with-fop: 'yes' user instructs the module to use fop
# 'no' user instructs the module not to use fop
#
# If the user sets the value of FOP, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_FOP],[
AC_ARG_VAR([FOP], [Path to fop command])
AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop],
[Use fop to regenerate documentation (default: yes, if installed)]),
[use_fop=$withval], [use_fop=auto])
if test "x$use_fop" = x"auto"; then
AC_PATH_PROG([FOP], [fop])
if test "x$FOP" = "x"; then
AC_MSG_WARN([fop not found - documentation targets will be skipped])
have_fop=no
else
have_fop=yes
fi
elif test "x$use_fop" = x"yes" ; then
AC_PATH_PROG([FOP], [fop])
if test "x$FOP" = "x"; then
AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH])
fi
have_fop=yes
elif test "x$use_fop" = x"no" ; then
if test "x$FOP" != "x"; then
AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified])
fi
have_fop=no
else
AC_MSG_ERROR([--with-fop expects 'yes' or 'no'])
fi
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP
# XORG_WITH_PS2PDF
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
# as whether or not to use the ps2pdf package.
#
# Interface to module:
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
# PS2PDF: returns the path of the ps2pdf program found
# returns the path set by the user in the environment
# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf
# 'no' user instructs the module not to use ps2pdf
#
# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_PS2PDF],[
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
AC_ARG_WITH(ps2pdf,
AS_HELP_STRING([--with-ps2pdf],
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
[use_ps2pdf=$withval], [use_ps2pdf=auto])
if test "x$use_ps2pdf" = x"auto"; then
AC_PATH_PROG([PS2PDF], [ps2pdf])
if test "x$PS2PDF" = "x"; then
AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped])
have_ps2pdf=no
else
have_ps2pdf=yes
fi
elif test "x$use_ps2pdf" = x"yes" ; then
AC_PATH_PROG([PS2PDF], [ps2pdf])
if test "x$PS2PDF" = "x"; then
AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH])
fi
have_ps2pdf=yes
elif test "x$use_ps2pdf" = x"no" ; then
if test "x$PS2PDF" != "x"; then
AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified])
fi
have_ps2pdf=no
else
AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no'])
fi
AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
]) # XORG_WITH_PS2PDF
# XORG_ENABLE_DOCS (enable_docs=yes)
# ----------------
# Minimum version: 1.6.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a builder to skip all
# documentation targets except traditional man pages.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
# XORG_WITH_DOXYGEN --with-doxygen
# XORG_WITH_FOP --with-fop
# XORG_WITH_GROFF --with-groff
# XORG_WITH_PS2PDF --with-ps2pdf
#
# Interface to module:
# ENABLE_DOCS: used in makefiles to conditionally generate documentation
# --enable-docs: 'yes' user instructs the module to generate docs
# 'no' user instructs the module not to generate docs
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DOCS],[
default=$1
if test "x$default" = x ; then
default="yes"
fi
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
[Enable building the documentation (default: yes)]),
[build_docs=$enableval], [build_docs=$default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs])
]) # XORG_ENABLE_DOCS
# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes)
# ----------------
# Minimum version: 1.6.0
#
# This macro enables a builder to skip all developer documentation.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
# XORG_WITH_DOXYGEN --with-doxygen
# XORG_WITH_FOP --with-fop
# XORG_WITH_GROFF --with-groff
# XORG_WITH_PS2PDF --with-ps2pdf
#
# Interface to module:
# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs
# --enable-devel-docs: 'yes' user instructs the module to generate developer docs
# 'no' user instructs the module not to generate developer docs
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
devel_default=$1
if test "x$devel_default" = x ; then
devel_default="yes"
fi
AC_ARG_ENABLE(devel-docs,
AS_HELP_STRING([--enable-devel-docs],
[Enable building the developer documentation (default: yes)]),
[build_devel_docs=$enableval], [build_devel_docs=$devel_default])
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
AC_MSG_CHECKING([whether to build developer documentation])
AC_MSG_RESULT([$build_devel_docs])
]) # XORG_ENABLE_DEVEL_DOCS
# XORG_ENABLE_SPECS (enable_specs=yes)
# ----------------
# Minimum version: 1.6.0
#
# This macro enables a builder to skip all functional specification targets.
# Combined with the specific tool checking macros XORG_WITH_*, it provides
# maximum flexibilty in controlling documentation building.
# Refer to:
# XORG_WITH_XMLTO --with-xmlto
# XORG_WITH_ASCIIDOC --with-asciidoc
# XORG_WITH_DOXYGEN --with-doxygen
# XORG_WITH_FOP --with-fop
# XORG_WITH_GROFF --with-groff
# XORG_WITH_PS2PDF --with-ps2pdf
#
# Interface to module:
# ENABLE_SPECS: used in makefiles to conditionally generate specs
# --enable-specs: 'yes' user instructs the module to generate specs
# 'no' user instructs the module not to generate specs
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_SPECS],[
spec_default=$1
if test "x$spec_default" = x ; then
spec_default="yes"
fi
AC_ARG_ENABLE(specs,
AS_HELP_STRING([--enable-specs],
[Enable building the specs (default: yes)]),
[build_specs=$enableval], [build_specs=$spec_default])
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
AC_MSG_CHECKING([whether to build functional specifications])
AC_MSG_RESULT([$build_specs])
]) # XORG_ENABLE_SPECS
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@ -7972,7 +8484,8 @@ main() {
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
}],
[MALLOC_ZERO_RETURNS_NULL=yes],
[MALLOC_ZERO_RETURNS_NULL=no])
[MALLOC_ZERO_RETURNS_NULL=no],
[MALLOC_ZERO_RETURNS_NULL=yes])
fi
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
@ -7995,38 +8508,69 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
# ----------------
# Minimum version: 1.1.0
#
# Sets up flags for source checkers such as lint and sparse if --with-lint
# is specified. (Use --with-lint=sparse for sparse.)
# Sets $LINT to name of source checker passed with --with-lint (default: lint)
# Sets $LINT_FLAGS to flags to pass to source checker
# Sets LINT automake conditional if enabled (default: disabled)
# This macro enables the use of a tool that flags some suspicious and
# non-portable constructs (likely to be bugs) in C language source code.
# It will attempt to locate the tool and use appropriate options.
# There are various lint type tools on different platforms.
#
# Interface to module:
# LINT: returns the path to the tool found on the platform
# or the value set to LINT on the configure cmd line
# also an Automake conditional
# LINT_FLAGS: an Automake variable with appropriate flags
#
# --with-lint: 'yes' user instructs the module to use lint
# 'no' user instructs the module not to use lint (default)
#
# If the user sets the value of LINT, AC_PATH_PROG skips testing the path.
# If the user sets the value of LINT_FLAGS, they are used verbatim.
#
AC_DEFUN([XORG_WITH_LINT],[
# Allow checking code with lint, sparse, etc.
AC_ARG_VAR([LINT], [Path to a lint-style command])
AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command])
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
[Use a lint-style source code checker (default: disabled)])],
[use_lint=$withval], [use_lint=no])
if test "x$use_lint" = "xyes" ; then
LINT="lint"
# Obtain platform specific info like program name and options
# The lint program on FreeBSD and NetBSD is different from the one on Solaris
case $host_os in
*linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*)
lint_name=splint
lint_options="-badflag"
;;
*freebsd* | *netbsd*)
lint_name=lint
lint_options="-u -b"
;;
*solaris*)
lint_name=lint
lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
;;
esac
# Test for the presence of the program (either guessed by the code or spelled out by the user)
if test "x$use_lint" = x"yes" ; then
AC_PATH_PROG([LINT], [$lint_name])
if test "x$LINT" = "x"; then
AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH])
fi
elif test "x$use_lint" = x"no" ; then
if test "x$LINT" != "x"; then
AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified])
fi
else
LINT="$use_lint"
fi
if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
case $LINT in
lint|*/lint)
case $host_os in
solaris*)
LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
;;
esac
;;
esac
AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.])
fi
AC_SUBST(LINT)
AC_SUBST(LINT_FLAGS)
AM_CONDITIONAL(LINT, [test x$LINT != xno])
# User supplied flags override default flags
if test "x$LINT_FLAGS" != "x"; then
lint_options=$LINT_FLAGS
fi
AC_SUBST([LINT_FLAGS],[$lint_options])
AM_CONDITIONAL(LINT, [test "x$LINT" != x])
]) # XORG_WITH_LINT
@ -8036,28 +8580,29 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
#
# Sets up flags for building lint libraries for checking programs that call
# functions in the library.
# Disabled by default, enable with --enable-lint-library
# Sets:
# @LINTLIB@ - name of lint library file to make
# MAKE_LINT_LIB - automake conditional
#
# Interface to module:
# LINTLIB - Automake variable with the name of lint library file to make
# MAKE_LINT_LIB - Automake conditional
#
# --enable-lint-library: - 'yes' user instructs the module to created a lint library
# - 'no' user instructs the module not to create a lint library (default)
AC_DEFUN([XORG_LINT_LIBRARY],[
AC_REQUIRE([XORG_WITH_LINT])
# Build lint "library" for more indepth checks of programs calling this library
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
[Create lint library (default: disabled)])],
[make_lint_lib=$enableval], [make_lint_lib=no])
if test "x$make_lint_lib" != "xno" ; then
if test "x$LINT" = "xno" ; then
AC_MSG_ERROR([Cannot make lint library without --with-lint])
fi
if test "x$make_lint_lib" = "xyes" ; then
LINTLIB=llib-l$1.ln
else
LINTLIB=$make_lint_lib
fi
if test "x$make_lint_lib" = x"yes" ; then
LINTLIB=llib-l$1.ln
if test "x$LINT" = "x"; then
AC_MSG_ERROR([Cannot make lint library without --with-lint])
fi
elif test "x$make_lint_lib" != x"no" ; then
AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.])
fi
AC_SUBST(LINTLIB)
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
@ -8070,11 +8615,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
# Defines CWARNFLAGS to enable C compiler warnings.
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CC_C99])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
-Wbad-function-cast"
-Wbad-function-cast -Wformat=2"
case `$CC -dumpversion` in
3.4.* | 4.*)
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
@ -8087,7 +8632,6 @@ else
fi
fi
AC_SUBST(CWARNFLAGS)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
]) # XORG_CWARNFLAGS
# XORG_STRICT_OPTION
@ -8096,7 +8640,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
#
# Add configure option to enable strict compilation
AC_DEFUN([XORG_STRICT_OPTION], [
AC_REQUIRE([AC_PROG_CC])
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
AC_REQUIRE([AC_PROG_CC_C99])
AC_REQUIRE([XORG_CWARNFLAGS])
@ -8126,12 +8670,33 @@ AC_SUBST([CWARNFLAGS])
# Defines default options for X.Org modules.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
AC_REQUIRE([AC_PROG_INSTALL])
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
XORG_CHANGELOG
XORG_INSTALL
XORG_MANPAGE_SECTIONS
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
]) # XORG_DEFAULT_OPTIONS
# XORG_INSTALL()
# ----------------
# Minimum version: 1.4.0
#
# Defines the variable INSTALL_CMD as the command to copy
# INSTALL from $prefix/share/util-macros.
#
AC_DEFUN([XORG_INSTALL], [
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
AC_SUBST([INSTALL_CMD])
]) # XORG_INSTALL
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -8159,22 +8724,9 @@ dnl
# XORG_RELEASE_VERSION
# --------------------
# 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. Also
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
AS_HELP_STRING([--with-release-version=STRING],
[Use release version string in package name]),
[RELEASE_VERSION="$withval"],
[RELEASE_VERSION=""])
if test "x$RELEASE_VERSION" != "x"; then
PACKAGE="$PACKAGE-$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])
@ -8201,14 +8753,13 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
# Defines the variable CHANGELOG_CMD as the command to generate
# ChangeLog from git.
#
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
#
AC_DEFUN([XORG_CHANGELOG], [
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
echo 'git directory not found: installing possibly empty changelog.' >&2)"
AC_SUBST([CHANGELOG_CMD])
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
]) # XORG_CHANGELOG
dnl Copyright 2005 Red Hat, Inc
@ -8242,8 +8793,9 @@ dnl
# is defined, then add $1 to $REQUIRED_MODULES.
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "xorg-server.h"
#if !defined $1

2540
driver/xf86-video-trident/configure vendored
View File

File diff suppressed because it is too large Load Diff

14
driver/xf86-video-trident/configure.ac
View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
1.3.3,
1.3.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
@ -30,10 +30,16 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@ -60,7 +66,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
@ -94,9 +99,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=trident
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
Makefile
src/Makefile

41
driver/xf86-video-trident/man/Makefile.am
View File

@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation.
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the copyright holders shall
# not be used in advertising or otherwise to promote the sale, use or
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
drivermandir = $(DRIVER_MAN_DIR)

74
driver/xf86-video-trident/man/Makefile.in
View File

@ -16,28 +16,25 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation.
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the copyright holders shall
# not be used in advertising or otherwise to promote the sale, use or
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
srcdir = @srcdir@
@ -89,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -99,8 +97,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -125,6 +125,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -141,6 +142,18 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@ -165,6 +178,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_CC = @ac_ct_CC@
@ -224,18 +238,6 @@ CLEANFILES = $(driverman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
all: all-am
@ -250,9 +252,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
$(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

10
driver/xf86-video-trident/src/Makefile.in
View File

@ -104,6 +104,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -114,8 +115,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -140,6 +143,7 @@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XEXTPROTO_71_FALSE = @HAVE_XEXTPROTO_71_FALSE@
HAVE_XEXTPROTO_71_TRUE = @HAVE_XEXTPROTO_71_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -156,6 +160,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@ -180,6 +185,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
XEXT_LIBS = @XEXT_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_CC = @ac_ct_CC@
@ -276,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
$(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

7
driver/xf86-video-trident/src/trident.h
View File

@ -46,6 +46,13 @@
#include "xf86Pci.h"
#include "vbe.h"
/* Banked framebuffer only supported on ISA */
#ifdef HAVE_ISA
#define LINEAR() (pTrident->Linear)
#else
#define LINEAR() (1)
#endif
#define PCI_CHIP_2200 0x2200
typedef struct {

2
driver/xf86-video-trident/src/trident_dac.c
View File

@ -640,7 +640,7 @@ TridentInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
pReg->tridentRegs3C4[Protection] = 0x92;
pReg->tridentRegs3x4[LinearAddReg] = 0;
if (pTrident->Linear) {
if (LINEAR()) {
/* This is used for VLB, when we support it again in 4.0 */
if (pTrident->Chipset < CYBER9385)
pReg->tridentRegs3x4[LinearAddReg] |=

17
driver/xf86-video-trident/src/trident_driver.c
View File

@ -35,7 +35,9 @@
#include "fb.h"
#ifdef HAVE_ISA
#include "mibank.h"
#endif
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
@ -72,7 +74,6 @@
#include <X11/extensions/dpms.h>
#endif
#include "xf86xv.h"
static const OptionInfoRec * TRIDENTAvailableOptions(int chipid, int busid);
@ -1353,7 +1354,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
pTrident->OverrideBskew);
}
if (xf86ReturnOptValBool(pTrident->Options, OPTION_SHADOW_FB, FALSE)) {
if (!pTrident->Linear)
if (!LINEAR())
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Ignoring Option SHADOW_FB"
" in non-Linear Mode\n");
else {
@ -1365,7 +1366,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
}
pTrident->Rotate = 0;
if ((s = xf86GetOptValString(pTrident->Options, OPTION_ROTATE))) {
if (!pTrident->Linear)
if (!LINEAR())
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Ignoring Option ROTATE "
"in non-Linear Mode\n");
else {
@ -1415,7 +1416,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
/* FIXME ACCELERATION */
if (!UseMMIO) pTrident->NoAccel = TRUE;
if (pTrident->Linear) {
if (LINEAR()) {
if (pTrident->pEnt->device->MemBase != 0) {
/*
* XXX Should check that the config file value matches one of the
@ -2498,7 +2499,7 @@ TRIDENTMapMem(ScrnInfoPtr pScrn)
if (pTrident->IOBase == NULL)
return FALSE;
if (pTrident->Linear) {
if (LINEAR()) {
if (pTrident->FbMapSize != 0) {
#ifndef XSERVER_LIBPCIACCESS
pTrident->FbBase = xf86MapPciMem(pScrn->scrnIndex,
@ -2559,7 +2560,7 @@ TRIDENTUnmapMem(ScrnInfoPtr pScrn)
#endif
pTrident->IOBase = NULL;
if (pTrident->Linear) {
if (LINEAR()) {
if (pTrident->FbMapSize != 0) {
#ifdef XSERVER_LIBPCIACCESS
pci_device_unmap_range(pTrident->PciInfo, (pointer)pTrident->FbBase, pTrident->FbMapSize);
@ -2931,7 +2932,8 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!pTrident->ShadowFB)
TRIDENTDGAInit(pScreen);
if (!pTrident->Linear) {
#ifdef HAVE_ISA
if (!LINEAR()) {
miBankInfoPtr pBankInfo;
/* Setup the vga banking variables */
@ -2965,6 +2967,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
}
#endif
{
BoxRec AvailFBArea;

2
driver/xf86-video-trident/src/tvga_dac.c
View File

@ -110,7 +110,7 @@ TVGAInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
pReg->tridentRegs3C4[NewMode1] = 0x80;
if (pTrident->Linear)
if (LINEAR())
pReg->tridentRegs3x4[LinearAddReg] = ((pTrident->FbAddress >> 24) << 6)|
((pTrident->FbAddress >> 20) & 0x0F)|
0x20;