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

Update to xf86-video-tseng 1.2.4

Browse Source
This commit is contained in:
matthieu 2010-07-24 20:20:16 +00:00
parent 5ef42429ee
commit 905ad8720a
13 changed files with 2922 additions and 1407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
driver/xf86-video-tseng/COPYING
View File

@ -1,12 +1,85 @@
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 2000 by Rainer Keller, <Rainer.Keller@studmail.uni-stuttgart.de>.
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 1990,91 by Thomas Roell, Dinkelscherben, Germany.
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 Thomas Roell not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. Thomas Roell makes no representations
about the suitability of this software for any purpose. It is provided
"as is" without express or implied warranty.
THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL THOMAS ROELL 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 2005-2006 Luc Verhaegen.
Copyright 1993-1997 The XFree86 Project, Inc.
Copyright 1990-1991 Thomas Roell.
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, sub license,
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 NON-INFRINGEMENT. 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.
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

739
driver/xf86-video-tseng/ChangeLog
View File

@ -1,259 +1,582 @@
2006-04-11 Luc Verhaegen <libv@skynet.be>
commit f80842085c790c3acf611d3944939f9515e4bee2
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:16:09 2010 +1000
* src/tseng_mode.c: (TsengSave), (TsengRestore):
bump for release 1.2.4
Fix dotclock breakage on ET6000.
The fish crawled out of the swamp, but still had gills and fins.
The internal ramdac still has multiple dotclock registers, and the
previous change only fixed up the external ramdacs of ET4000W32ps.
(Reported by the other tseng owner: Adam Jackson)
commit eb4a39b11ece5dc4e34519286b3f406fecf9b5ae
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 12:49:55 2010 -0400
2006-03-08 Luc Verhaegen <libv@skynet.be>
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* src/tseng_mode.c: (STG1703Restore), (CH8398Store),
(TsengModeInit):
commit 9bb1b4995b8825944531d495262a0bb049a45f3e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 8 13:21:52 2010 -0400
Remove daft dependance on mode->ClockIndex. We used it to tell
vgaHWInit to use clock 2, while ClockIndex = -1 is clock 3. So
just use clock 3 for the ramdacs and be done with.
config: remove redundant compiler flags
These are available using --enable-strict-compilation
Use same configure option as all x.org modules
Only GCC was covered, not SUNCC or INTELCC
Introduced in commit 85397a4ef7a3a13f7e2940cb0e5c2fdbfea4c695
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2006-01-31 Luc Verhaegen <libv@skynet.be>
commit bd71f657daa44b8e5fc416f6eb48e5bc8216e838
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 18 13:13:44 2010 -0400
* src/tseng.h:
* src/tseng_driver.c: (TsengPreInit):
* src/tseng_mode.c: (STG1703Mode), (CH8398Mode),
(TsengSetupClockRange), (TsengSave), (TsengRestore),
(TsengModeInit):
Remove mibank.h reference
Signed-off-by: Adam Jackson <ajax@redhat.com>
Remove dual clockranges. ET4000W32p now always uses the dac bus
as 16bits wide.
commit 5bf78ef9a273b4bc56b9a2548e9715333aa885ad
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 6 20:16:21 2010 +0300
2006-01-29 Luc Verhaegen <libv@skynet.be>
Check xf86EnableAccess only in old servers
On new X servers this function is dummy. Similar functionality is now in place
using lock/unlock mechanism of the VGA arbitration, triggered inside the
server.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
* src/tseng_driver.c: (TsengPreInit):
* src/tseng_mode.c: (STG1703Detect), (STG1703Restore),
(STG1703Clock), (STG1703Mode), (CH8398Detect), (CH8398PrintRegs),
(CH8398Store), (CH8398Restore), (CH8398Clock), (CH8398Mode),
(TsengRAMDACProbe), (TsengSave), (TsengRestore), (TsengModeInit):
commit b918f6d35409a2c5e74232b540dffad57f85cf0a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:54:57 2010 -0800
Fully implement the Chrontel CH8398. This has the exact same
24bpp weirdness, so i guess this is an fb issue.
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2006-01-28 Luc Verhaegen <libv@skynet.be>
commit 78d94fb6981e5bb9ff19be9b9362a9b1f3707bb6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
* src/tseng.h:
* src/tseng_driver.c: (TsengGetRec), (TsengFreeRec),
(TsengPreInit):
* src/tseng_mode.c: (STG1703Detect), (STG1703PrintRegs),
(STG1703Store), (STG1703Restore), (STG1703Clock), (STG1703Mode),
(TsengRAMDACProbe), (tseng_set_ramdac_bpp), (TsengSave),
(TsengRestore), (TsengModeInit):
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>
Fully implement the SGS-Thomson STG-1703. This is working great
except for 24bpp, where there seems to be an offset issue. Red is
blue, green is red, blue is green. Will dig that one out later on.
8bpp and 16bpp (both with 8 and 16bit dac bus) and 32bpp are great.
commit 96b5eebb07ca02e607c02bd22911e8002882fbcd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:06 2009 -0500
2006-01-28 Luc Verhaegen <libv@skynet.be>
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
* src/tseng.h:
* src/tseng_mode.c: (tseng_set_ramdac_bpp), (ET6000CalcClock),
(TsengSave), (TsengRestore), (TsengModeInit):
- Remove pTseng->ModeReg
- Split ET6000 bpp, dotclock and ram clock handling from the
ET4000s ramdac code.
commit 4d3c8e7e1f1eebcad01418d2a312c8791a1773fb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
2006-01-27 Luc Verhaegen <libv@skynet.be>
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
* src/tseng.h:
* src/tseng_mode.c: (tseng_set_ramdac_bpp), (tseng_clock_setup),
(TsengModeInit):
commit 7dcae998561f95b79a981433a9b264cfe727918e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
Clear duplicate PrivFlag.
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-26 Luc Verhaegen <libv@skynet.be>
commit 9ef01ab3f2420c4fb27f605834fd165c919abdf6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:22 2009 -0400
* src/tseng.h:
* src/tseng_cursor.c: (ET4000CursorRead), (ET4000CursorWrite),
(TsengShowCursor), (TsengHideCursor), (TsengSetCursorPosition),
(TsengSetCursorColors), (TsengLoadCursorImage),
(TsengHWCursorInit), (TsengCursorStore), (TsengCursorRestore):
* src/tseng_driver.c: (TsengUnlock), (TsengLock),
(TsengPreInitPCI), (et6000_check_videoram), (TsengDetectMem),
(TsengProcessHibit), (TsengPreInit), (TsengEnterVT),
(TsengLeaveVT), (TsengSaveScreen):
* src/tseng_mode.c: (vgaHWReadDacReadAddr), (vgaHWWriteBank),
(vgaHWReadBank), (vgaHWWriteSegment), (vgaHWReadSegment),
(vgaHWWriteModeControl), (vgaHWHerculesSecondPage), (ET6000IORead),
(ET6000IOWrite), (TsengRAMDACProbe), (tseng_set_ramdac_bpp),
(TsengAdjustFrame), (TsengSave), (TsengRestore), (TsengModeInit),
(TsengCrtcDPMSSet), (TsengHVSyncDPMSSet):
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
Improve tseng driver transparency.
- move all VGA inbs/outbs to vgahw calls, provide our own when
relevant callbacks are missing.
- move ET4000 sprite accesses to ET4000CursorRead/Write.
- move ET6000 IO accesses to ET6000IORead/Write.
- fix regression with CH8398, introduced with the ramdac cleanup.
commit b9f6b124cf293cc508590774c0bd3f896326b4ba
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
2006-01-23 Luc Verhaegen <libv@skynet.be>
.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.
* src/Makefile.am:
* src/tseng.h:
* src/tseng_accel.c: (tseng_terminate_acl),
(tseng_recover_timeout), (tseng_init_acl),
(TsengSubsequentScanlineCPUToScreenColorExpandFill),
(TsengSubsequentColorExpandScanline),
(TsengSubsequentColorExpandScanline_8bpp),
(TsengSubsequentColorExpandScanline_16bpp),
(TsengSubsequentColorExpandScanline_24bpp),
(TsengSubsequentColorExpandScanline_32bpp),
(TsengSetupForCPUToScreenColorExpandFill),
(TsengSubsequentCPUToScreenColorExpandFill),
(TsengSetupForScreenToScreenColorExpandFill),
(TsengSubsequentScreenToScreenColorExpandFill),
(TsengXAAInit_Colexp), (TsengXAAInit):
* src/tseng_accel.h:
* src/tseng_acl.c:
* src/tseng_acl.h:
* src/tseng_clock.c:
* src/tseng_colexp.c:
* src/tseng_dpms.c:
* src/tseng_driver.c: (TsengSaveScreen), (TsengSwitchMode):
* src/tseng_inline.h:
* src/tseng_mode.c: (vgaHWReadDacWriteAddr), (tsengSTG170xDetect),
(tsengCH8398Detect), (TsengRAMDACProbe), (tseng_set_ramdac_bpp),
(tseng_clock_setup), (TsengcommonCalcClock), (TsengAdjustFrame),
(TsengValidMode), (TsengSave), (TsengRestore), (TsengModeInit),
(TsengCrtcDPMSSet), (TsengHVSyncDPMSSet):
* src/tseng_ramdac.c:
Reorganise code:
- move tseng_ramdac.c, tseng_clock.c, tseng_dpms.c, and
TsengAdjustFrame, TsengValidMode, TsengSave, TsengRestore,
TsengModeInit from tseng_driver.c into tseng_mode.c.
- move tseng_acl.c and tseng_colexp.c into tseng_accel.c
- move tseng_acl.h and tseng_inline.g into tseng_accel.h
- move all accel functions except for 2 to static, ifdef
out unused ones.
commit ebd3672b8e4f3ad97fd900304ed955558e2b181a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
2006-01-22 Luc Verhaegen <libv@skynet.be>
xf86-video-tseng: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* .cvsignore:
* man/.cvsignore:
* src/tseng.h:
* src/tseng_clock.c: (tseng_clock_setup):
* src/tseng_driver.c: (TsengProcessOptions), (TsengPreInit),
(TsengModeInit), (TsengSave), (TsengRestore), (ET4000Probe), (if):
* src/tseng_ramdac.c: (vgaHWReadDacWriteAddr),
(tsengSTG170xDetect), (tsengCH8398Detect), (TsengRAMDACProbe),
(tseng_set_ramdac_bpp):
commit 5734845c91179a1138d75aaad48102cb077a2b12
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 7 14:52:01 2009 +1000
Clean up ramdac handling.
- Remove all ramdacs except STG1703 and CH8398. Both are in my
possession, both are currently broken and have been for ages,
but both will be fixed. ICS5341 is out there somewhere too,
will be added when i get my hands on it.
- Cleanly split up ET4000 handling and ET6000 code, both for
dotclock, memory clocking and ramdac.
- Limit driver to either 8, 16, 24 or 32bits.
bump version to 1.2.3
2006-01-22 Luc Verhaegen <libv@skynet.be>
commit d095c1d51b1a895471ce0b1970ae21ee6499ae51
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
* src/Makefile.am:
* src/tseng.h:
* src/tseng_accel.c: (TsengXAAInit):
* src/tseng_acl.c: (tseng_init_acl):
* src/tseng_bank.c:
* src/tseng_colexp.c: (TsengXAAInit_Colexp):
* src/tseng_cursor.c: (TsengHWCursorInit):
* src/tseng_dga.c: (TsengDGAInit), (Tseng_OpenFramebuffer):
* src/tseng_driver.c: (TsengPreInitPCI), (TsengLimitMem),
(TsengProcessOptions), (TsengGetFbAddress), (TsengPreInit),
(TsengSetupAccelMemory), (TsengScreenInit), (TsengMapMem),
(TsengUnmapMem), (TsengModeInit):
tseng: change to using ABI version check
Tseng in the PCI era: Remove banked memory.
commit 17ebee6804a99af32747b801c5b979ba5248a9d8
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:40 2009 +1000
2006-01-22 Luc Verhaegen <libv@skynet.be>
tseng: update for resources/RAC API removal
* configure.ac:
* src/tseng.h:
* src/tseng_accel.c: (TsengXAAInit), (Tseng_setup_screencopy):
* src/tseng_acl.c: (tseng_recover_timeout), (tseng_init_acl):
* src/tseng_acl.h:
* src/tseng_clock.c: (tseng_clock_setup),
(Tseng_ET4000ClockSelect):
* src/tseng_colexp.c: (TsengXAAInit_Colexp),
(TsengSubsequentScanlineCPUToScreenColorExpandFill):
* src/tseng_cursor.c: (TsengShowCursor), (TsengHideCursor),
(TsengSetCursorPosition), (TsengSetCursorColors),
(TsengLoadCursorImage):
* src/tseng_driver.c: (TsengIdentify), (TsengProbe),
(TsengPreInitPCI), (TsengLimitMem), (TsengDetectMem),
(TsengProcessOptions), (TsengGetLinFbAddress), (TsengPreInit),
(TsengScreenInit), (TsengSaveScreen), (TsengModeInit), (TsengSave):
* src/tseng_inline.h:
* src/tseng_ramdac.c: (Check_Tseng_Ramdac), (tseng_set_ramdac_bpp):
commit 25548be8814796925625b11f390dca29b1e47358
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:53:03 2009 -0400
- -Wall and -pedantic are gccisms (Alan Coopersmith).
- Remove ET4000, ET4000W32 and ET4000W32I devices.
- Rework handling of remaining devices.
- Clean up Probe and PreInit to only handle pci devices.
tseng 1.2.2
2006-01-21 Luc Verhaegen <libv@skynet.be>
commit 1ce0bf811255b1faa00aa279e8972a1a027849ab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:23:41 2009 -0400
* configure.ac:
* src/tseng.h:
* src/tseng_driver.c: (TsengAssignFPtr), (TsengModeInit),
(TsengSave):
* src/tseng_ramdac.c: (tseng_set_ramdac_bpp):
It's 2006, maybe it's time to inform the tseng driver that humankind
survived the millenium bug.
Remove useless loader symbol lists.
First phase of changes:
- Fix a glaring problem that's been there since 1998: RegRec arrays
used beyond their boundaries.
- Add -Wall and -pedantic to CFLAGS.
- Fix VERSION redefinition.
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 7addf8709202634ac45b4c51d910e2798054271c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:05:06 2009 -0800
* configure.ac:
Update package version for X11R7 release.
Add README with pointers to mailing list, bugzilla & git repos
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 9d4aea1211de81fb27069d087bd4393d27355239
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:37:31 2009 -0800
* configure.ac:
Update package version number for final X11R7 release candidate.
Remove xorgconfig & xorgcfg from See Also list in man page
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 7f7e48cf5cf7512b5c1f5f3bf31eeafb201a9ad8
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 15:02:32 2008 +1000
* man/Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
tseng 1.2.1
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 5de98d43ddca983a43d30a27339427b1e60ded74
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 15 14:08:37 2008 -0400
* configure.ac:
Update package version number for X11R7 RC3 release.
Uninclude xf86Version.h
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 6312fd997afc4f739838ce53c19dcccf90900119
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jul 18 16:24:50 2008 -0300
* configure.ac:
Remove extraneous AC_MSG_RESULT.
Remove dependency on xf1bpp and xf4bpp
Not just don't include the header files.
2005-11-29 Adam Jackson <ajax@freedesktop.org>
commit 08b489a266d79cb650ec71249708412d5908c017
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 16:10:24 2008 -0400
* configure.ac:
Only build dlloader modules by default.
tseng 1.2.0
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 2d495250bc09ab037985ecd5be4229f40b9dca4a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 16:02:54 2008 -0400
* configure.ac:
Update package version number for X11R7 RC2 release.
Finish making xf1bpp/xf4bpp optional.
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit b3ea57ce98505fdafaacf80faff4ef1216682901
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:49:04 2008 -0400
* configure.ac:
Update pkgcheck dependencies to work with separate build roots.
Fix distcheck
commit 2d44541a6a5bb6b62db087b268d723e5a77320e5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 15:45:12 2008 -0400
Death to RCS tags.
commit 7ad7c5136ba51e3e9057afb85aaba04b8e465125
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:02:49 2008 +0100
Makefile.am: nuke RCS Id
commit 76fb068300fe3b6ff02215802d7c00c0c1db1faa
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Feb 27 14:09:24 2008 +1000
oops forgot pcirename file
commit ef47398dde445038e5c7303ef54f2002a633da55
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Feb 27 14:05:38 2008 +1000
blind pciaccess conversion
commit 116da81133b3242c7a4a809fcc320a93fea8671b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 27 13:09:52 2007 -0800
renamed: .cvsignore -> .gitignore
commit 6e9ae39e789316770780831a264507c92c42c694
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 27 13:09:15 2007 -0800
Replace XFree86 references in man page
commit 3c7520088ea9d78e453122e28d52274465c25b58
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 18:47:09 2006 -0400
Bump to 1.1.1
commit d34146a8daf51385e5b344b3b4e6c68ab6e81974
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Apr 11 21:43:00 2006 +0000
Tseng: Fix dotclock breakage on ET6000. The fish crawled out of the swamp,
but still had gills and fins. The internal ramdac still has multiple
dotclock registers, and the previous change only fixed up the external
ramdacs of ET4000W32ps. (Reported by the other tseng owner: Adam
Jackson)
commit d4bc751fa622616601a7d3213852d7a4f634be0b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 21:43:55 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
commit 3176982fbe4304beb43100db6b8756d2617abcb8
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Mar 8 16:51:00 2006 +0000
Remove daft dependance on mode->ClockIndex. We used it to tell vgaHWInit to
use clock 2, while ClockIndex = -1 is clock 3. So just use clock 3 for
the ramdacs and be done with.
commit 9111778901526b8d7f9a5c3977f51746bc4ffbd0
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 10:05:33 2006 +0000
Remove dual clockranges. ET4000W32p now always uses the dac bus as
16bits wide.
commit 58d6be9da00da4f6e2fa3cf3d78118012fcca436
Author: Luc Verhaegen <libv@skynet.be>
Date: Sun Jan 29 20:07:23 2006 +0000
Fully implement the Chrontel CH8398. This has the exact same 24bpp
weirdness, so i guess this is an fb issue.
commit 24564dc891ba42395b5c8db63dd65f9f3fad5417
Author: Luc Verhaegen <libv@skynet.be>
Date: Sat Jan 28 18:10:03 2006 +0000
Fully implement the SGS-Thomson STG-1703. This is working great except for
24bpp, where there seems to be an offset issue. Red is blue, green is
red, blue is green. Will dig that one out later on. 8bpp and 16bpp
(both with 8 and 16bit dac bus) and 32bpp are great.
commit 0fa3293187969cacd3368b6c2f13564d7ee63d44
Author: Luc Verhaegen <libv@skynet.be>
Date: Sat Jan 28 13:38:32 2006 +0000
- Remove pTseng->ModeReg
- Split ET6000 bpp, dotclock and ram clock handling from the ET4000s ramdac
code.
commit 9b03a1959d4266fda1cccaf77d9f11e23f81cce1
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Jan 27 10:25:46 2006 +0000
Tseng: Clear duplicate PrivFlag.
commit 50a68825a098d8c244dcbb88e80e30790c0d1901
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Jan 26 11:25:22 2006 +0000
Improve tseng driver transparency.
- move all VGA inbs/outbs to vgahw calls, provide our own when relevant
callbacks are missing.
- move ET4000 sprite accesses to ET4000CursorRead/Write.
- move ET6000 IO accesses to ET6000IORead/Write.
- fix regression with CH8398, introduced with the ramdac cleanup.
commit 8035fb04c5aa448bcd67251de4e0284101969dee
Author: Luc Verhaegen <libv@skynet.be>
Date: Mon Jan 23 10:45:43 2006 +0000
tseng: Reorganise code:
- move tseng_ramdac.c, tseng_clock.c, tseng_dpms.c, and TsengAdjustFrame,
TsengValidMode, TsengSave, TsengRestore, TsengModeInit from
tseng_driver.c into tseng_mode.c.
- move tseng_acl.c and tseng_colexp.c into tseng_accel.c
- move tseng_acl.h and tseng_inline.g into tseng_accel.h
- move all accel functions except for 2 to static, ifdef out unused ones.
commit 9b9458dd325154ae6753db656d7198c3645e5fda
Author: Luc Verhaegen <libv@skynet.be>
Date: Sun Jan 22 13:12:31 2006 +0000
tseng: Clean up ramdac handling.
- Remove all ramdacs except STG1703 and CH8398. Both are in my possession,
both are currently broken and have been for ages, but both will be
fixed. ICS5341 is out there somewhere too, will be added when i get my
hands on it.
- Cleanly split up ET4000 handling and ET6000 code, both for dotclock,
memory clocking and ramdac.
- Limit driver to either 8, 16, 24 or 32bpp.
commit 500a6368d375482cb14eb5fcf119bcc63a8326af
Author: Luc Verhaegen <libv@skynet.be>
Date: Sun Jan 22 09:48:15 2006 +0000
Tseng in the PCI era: Remove banked memory.
commit c2e3645e67580fc465e3b06322d85d14ea5cccc5
Author: Luc Verhaegen <libv@skynet.be>
Date: Sun Jan 22 08:33:37 2006 +0000
Further tseng changes.
- -Wall and -pedantic are gccisms (Alan Coopersmith).
- Remove ET4000, ET4000W32 and ET4000W32I devices.
- Rework handling of remaining devices.
- Clean up Probe and PreInit to only handle pci devices.
commit 85397a4ef7a3a13f7e2940cb0e5c2fdbfea4c695
Author: Luc Verhaegen <libv@skynet.be>
Date: Sat Jan 21 11:30:44 2006 +0000
It's 2006, maybe it's time to inform the tseng driver that humankind
survived the millenium bug.
First phase of changes:
- Fix a glaring problem that's been there since 1998: RegRec arrays used
beyond their boundaries.
- Add -Wall and -pedantic to CFLAGS.
- Fix VERSION redefinition.
commit 9c6c1ba8c71b805cc850e4f2e858b849b321becb
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:30:04 2005 +0000
Update package version for X11R7 release.
commit f3af75f8a15fc8642a2445ab0399a1035c6f775c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:56 2005 +0000
Stub COPYING files
commit 8ddbdb7acf64c1c191c69ed93d969d55529fcd4b
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 3a28a2af1aeae52a0ba501e83418a73f0e9b8083
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 a5e7061284a3d6c235e17527824c151eab4a500c
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 80f07603a74f9cdae8e78630ff1616432a0184ff
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:11 2005 +0000
Remove extraneous AC_MSG_RESULT.
commit 167226536dd62c5928791a5531ffb359420789a9
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:30:05 2005 +0000
Only build dlloader modules by default.
commit 03cd84412f72adb7e107ed1b5cdb5cce42157f40
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 622f53b0e18d9497798ffa031749787e280cc212
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:21 2005 +0000
Add .cvsignores for drivers.
commit 0e89a5ef18103630bf8eedbbf8571b2eba09e931
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 43c7cf3c3e7aba4c88abfb58fdcf39c1a5f3721c
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:56 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
commit d5715dd298ce195e8e7b6a45ecb40d84227b6dad
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:05 2005 +0000
Update package version number for RC1 release.
commit d45ce8aebeb350941b1a715da8122ae71448876f
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 498d6aaeac8c2de97c5e4f4f1ded434ad983a534
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 37b3af373d7cbbd1e37c4295acaee05ee2e718ae
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 c8438067e1fca1f43779129e54604fbe68cd8f5c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:54 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
commit 0060b45acde484363c5066fdbbc24ba9302029cf
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:46 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 c2d898c265670c74f8d0aa43d9a3538692f94060
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:51:03 2005 +0000
Build system for tseng
commit 34821cefd17fa78ca6ef1e42f0e5614c9c1e95eb
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 088f5a28df6b82b127e5ca67f8a6b567e61229b7
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:59 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
commit 158c29da25a3b31c31a5f962eae4b7d243533fc1
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 260b04232cc68431633aef0842bac3fdf94880aa
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sat Dec 4 00:43:10 2004 +0000
Encoding of numerous files changed to UTF-8
commit 9349d469fda7c1bf2ada01ac17e83da4f4b83fd0
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:24:09 2004 +0000
DRI XFree86-4_3_99_12-merge import
commit e43ddda495ed5ff4a39966fa2249125214a8e17e
Author: Egbert Eich <eich@suse.de>
Date: Wed May 26 16:24:09 2004 +0000
Fixing setting of physical framebuffer base for several drivers. C&T
driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
driver: improved support for lowres double scan modes.
commit 4ba842dddc8c6bb10a626bc01bc11f64a45be9fa
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:52:24 2004 +0000
Merging XORG-CURRENT into trunk
commit 9da00669ac5ceb1e8eefbc98689da9e3015bf59a
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:41 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 5a84a3f014543554b43037f9b39479d05c8dee5e
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:28 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 0dc3b939140595cd0fc190a6920a9b204cd9c557
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:55 2004 +0000
readding XFree86's cvs IDs
commit 946579498b6b02bdb271e6ead1ee6b7c8f375432
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 6145158569721959d6adb98eb2a26e8f850088da
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 795dc7c87de581d0b70926845620186e1a2e1a1f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:55 2003 +0000
XFree86 4.3.0.1
commit f8465308152c64c6e05ebf814794aec1022046c5
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:55 2003 +0000
Initial revision

12
driver/xf86-video-tseng/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-tseng/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@
@ -131,6 +134,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -147,6 +151,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@
@ -169,6 +174,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
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@
@ -219,8 +225,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
@ -462,6 +468,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 \
@ -588,6 +597,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
@ -643,7 +653,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 \
@ -655,6 +665,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-tseng/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

2533
driver/xf86-video-tseng/configure vendored
View File

File diff suppressed because it is too large Load Diff

18
driver/xf86-video-tseng/configure.ac
View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tseng],
1.2.3,
1.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tseng)
@ -30,19 +30,21 @@ 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
AC_PROG_CC
if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall -pedantic"
fi
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
@ -59,7 +61,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
@ -86,9 +87,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=tseng
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
Makefile
src/Makefile

41
driver/xf86-video-tseng/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-tseng/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@
@ -123,6 +123,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -139,6 +140,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@
@ -161,6 +174,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
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@
@ -220,18 +234,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
@ -246,9 +248,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 \

2
driver/xf86-video-tseng/src/Makefile.am
View File

@ -23,7 +23,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@
AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
tseng_drv_la_LTLIBRARIES = tseng_drv.la
tseng_drv_la_LDFLAGS = -module -avoid-version
tseng_drv_ladir = @moduledir@/drivers

12
driver/xf86-video-tseng/src/Makefile.in
View File

@ -100,6 +100,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@
@ -110,8 +111,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@
@ -134,6 +137,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -150,6 +154,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@
@ -172,6 +177,7 @@ STRIP = @STRIP@
VERSION = @VERSION@
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@
@ -228,7 +234,7 @@ target_alias = @target_alias@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@
AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
tseng_drv_la_LTLIBRARIES = tseng_drv.la
tseng_drv_la_LDFLAGS = -module -avoid-version
tseng_drv_ladir = @moduledir@/drivers
@ -255,9 +261,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 \

3
driver/xf86-video-tseng/src/tseng.h
View File

@ -25,9 +25,6 @@
/* All Tseng chips _need_ VGA register access, so multihead operation is out of the question */
#include "vgaHW.h"
/* Drivers using the mi banking wrapper need this */
#include "mibank.h"
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"

2
driver/xf86-video-tseng/src/tseng_mode.c
View File

@ -1522,7 +1522,9 @@ TsengCrtcDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
vgaHWPtr hwp = VGAHWPTR(pScrn);
CARD8 seq1, crtc34;
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8
xf86EnableAccess(pScrn);
#endif
switch (PowerManagementMode) {
case DPMSModeOn:
default: