Update to xf86-video-apm 1.2.3
This commit is contained in:
matthieu
parent
cbc29667e5
commit
e4792f2596
@ -1,12 +1,21 @@
|
||||
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 2007 George Sapountzis
|
||||
|
||||
Please submit updated COPYING files to the Xorg bugzilla:
|
||||
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:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
The above copyright notice and this permission notice (including the next
|
||||
paragraph) shall be included in all copies or substantial portions of the
|
||||
Software.
|
||||
|
||||
All licensing questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
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
|
||||
|
||||
@ -1,67 +1,810 @@
|
||||
2006-04-07 Adam Jackson <ajax@freedesktop.org>
|
||||
commit 876d8aea6c4c442756c03dd6cd64e14e42658d0b
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Jul 23 15:13:02 2010 -0700
|
||||
|
||||
* configure.ac:
|
||||
* src/apm_driver.c:
|
||||
Bump to 1.1.1 for Xv changes.
|
||||
xf86-video-apm 1.2.3
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
2006-04-07 Aaron Plattner <aplattner@nvidia.com>
|
||||
commit cf36c50f7994ed2c2bba7dc76aadbe03bf5ad84e
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Jul 23 15:12:26 2010 -0700
|
||||
|
||||
* src/apm_video.c: (ReputImage), (PutImage):
|
||||
Add a DrawablePtr argument to the XV functions to pave the way for
|
||||
redirected video.
|
||||
Remove xorgconfig reference from the README
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
2006-04-06 Adam Jackson <ajax@freedesktop.org>
|
||||
commit c78c6c81cb4cf88696010c3028bab68d7f027f8d
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Jul 21 16:49:04 2010 -0400
|
||||
|
||||
* configure.ac:
|
||||
* src/apm.h:
|
||||
* src/apm_dga.c:
|
||||
* src/apm_driver.c:
|
||||
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
|
||||
config: add comments for main statements
|
||||
|
||||
* src/apm_driver.c:
|
||||
Fix a missed VERSION -> APM_VERSION.
|
||||
commit bf03417c2c40c9c59ab3d8f9384353f9697a3a01
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Jul 21 16:07:00 2010 -0400
|
||||
|
||||
2005-12-26 Adam Jackson <ajax@freedesktop.org>
|
||||
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* src/apm_driver.c:
|
||||
Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck)
|
||||
commit 8843f296b9e6b786b28e10bc49ee85987ba7fe32
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Jul 21 14:05:22 2010 -0400
|
||||
|
||||
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* configure.ac:
|
||||
Update package version for X11R7 release.
|
||||
commit 95598411c41871b05ae33f91491beda7ea34ef0a
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Jul 21 09:27:42 2010 -0400
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
config: complete AC_INIT m4 quoting
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
commit a98fd5c4759031d6318fa1926773f8ac68e52379
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Jul 20 20:24:42 2010 -0400
|
||||
|
||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
config: remove unrequired AC_HEADER_STDC
|
||||
|
||||
Autoconf says:
|
||||
"This macro is obsolescent, as current systems have conforming
|
||||
header files. New programs need not use this macro".
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* man/Makefile.am:
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
commit 3971681ab2e4e2672da2824e2f4a5eb184a4728f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Jul 20 19:41:30 2010 -0400
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
|
||||
|
||||
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
|
||||
AC_PROG_C_C99. This sets gcc with -std=gnu99.
|
||||
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
commit cce7f168f50a81b9fea97a93dd43fd1040236808
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Jul 20 18:45:18 2010 -0400
|
||||
|
||||
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
config: update AC_PREREQ statement to 2.60
|
||||
|
||||
Unrelated to the previous patches, the new value simply reflects
|
||||
the reality that the minimum level for autoconf to configure
|
||||
all x.org modules is 2.60 dated June 2006.
|
||||
|
||||
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* configure.ac:
|
||||
Remove extraneous AC_MSG_RESULT.
|
||||
commit 9d10ac3f487f0a94f250b38afced24e11a39d43a
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Jul 20 16:15:29 2010 -0400
|
||||
|
||||
2005-11-29 Adam Jackson <ajax@freedesktop.org>
|
||||
config: upgrade to util-macros 1.8 for additional man page support
|
||||
|
||||
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
|
||||
The value of MAN_SUBST is the same for all X.Org packages.
|
||||
|
||||
* configure.ac:
|
||||
Only build dlloader modules by default.
|
||||
commit 0a7bb1b3655efcd15b9021d6e0753477d0e991db
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Jun 13 16:31:08 2010 -0400
|
||||
|
||||
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
README: keep the text version of README, discard the sgml version
|
||||
|
||||
The linuxdoc doc tool is deprecated.
|
||||
README files are exclusively text files.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC2 release.
|
||||
commit f27eacc529529f7a38728db389ce66fba33ef6a9
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Jun 13 15:50:42 2010 -0400
|
||||
|
||||
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
README: fix linuxdoc content
|
||||
|
||||
defs.ent are located under X11 directory
|
||||
ident tag is not a Linuxdoc tag
|
||||
replace docbook email tag with linuxdoc email tag
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
* configure.ac:
|
||||
Update pkgcheck dependencies to work with separate build roots.
|
||||
commit 44244998c7b4171c33d78a0df3d86ba905b283a6
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sat Jun 12 10:25:31 2010 -0400
|
||||
|
||||
COPYING: replace stub file with Copyright notice
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit aa26b72a5f76012e8246de1e885f707f29e5fc4c
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue May 18 12:59:36 2010 -0400
|
||||
|
||||
Remove mibank.h reference
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
|
||||
commit 55ea2bfc3720e5f3c8e412a31cde547e88726bf5
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Apr 6 10:56:05 2010 -0400
|
||||
|
||||
pciaccess: remove test for the XSERVER_PCIACCESS #define
|
||||
|
||||
This symbol is always defined in xorg-xserver.h.
|
||||
ISA bus is no longer supported, pciaccess is required.
|
||||
|
||||
Acked-by: Matt Turner <mattst88@gmail.com>
|
||||
Reviewed-by: Rémi Cardona <remi@gentoo.org>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 6bf81aad67c2e535b674db535840432c38ab33a5
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Feb 8 12:59:33 2010 -0500
|
||||
|
||||
config: remove MFB usage as it is no longer in xserver
|
||||
|
||||
As of commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c
|
||||
dated August 2007, xfree86 xf1bpp and xf4bpp have been removed
|
||||
in the xserver.
|
||||
|
||||
Acked-by: Matt Turner <mattst88@gmail.com>
|
||||
Reviewed-by: Rémi Cardona <remi@gentoo.org>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 7347b7d2196a6a2aed31259824321758e0265b85
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Feb 7 22:11:53 2010 -0500
|
||||
|
||||
config: remove ISA bus code, support removed in xserver
|
||||
|
||||
Remove declaration check and AM conditional HAVE_ISA along
|
||||
with the code conditionnaly included.
|
||||
|
||||
Acked-by: Matt Turner <mattst88@gmail.com>
|
||||
Reviewed-by: Rémi Cardona <remi@gentoo.org>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 04fd172cc61036732f22cc8d30c60e89c954dede
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Feb 7 20:45:52 2010 -0500
|
||||
|
||||
config: remove support for obsolete xf86rush extension
|
||||
|
||||
The Alliance ProMotion video card driver has an option to
|
||||
build with the xf86rush extension which is no longer available
|
||||
since X11R7.3.
|
||||
|
||||
Acked-by: Matt Turner <mattst88@gmail.com>
|
||||
Reviewed-by: Rémi Cardona <remi@gentoo.org>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 05d0d0fcee0ecf596f489554ac4688dda0cd815d
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Feb 8 20:08:52 2010 -0500
|
||||
|
||||
config: move compiler flags from configure.ac to Makefile.am
|
||||
|
||||
CFLAGS is an automake defined variable that should not be set
|
||||
by the module. It should not be AC_SUBST either, it already is.
|
||||
|
||||
Use AM_CFLAGS in Makefile.am. This will allow the user to override
|
||||
the flags as they will be in the right order.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit ec2d3b6055d5f4eda11f924e3f52e80a093307e8
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Feb 8 19:07:22 2010 -0500
|
||||
|
||||
config: remove unrequired '-I$(top_srcdir)/src'
|
||||
|
||||
The current dir is already included by default in the makefile
|
||||
top_builddir = ..
|
||||
DEFAULT_INCLUDES = -I. -I$(top_builddir)
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 61bb9c15e6b265f8a7e65a6222695bb777c758c0
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Feb 8 18:42:52 2010 -0500
|
||||
|
||||
config: remove unused INCLUDES='-I$(top_srcdir)/src'
|
||||
|
||||
This statement is redundant and not used in the makefile
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 0777bb611872bbf8956d5bdb228a553c55f3906c
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Feb 8 17:35:14 2010 -0500
|
||||
|
||||
config: removed unused variables XORG_INCS and XF86RUSH_INCS
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 9b2537d1560edaa4e6345632892dc9a7bce34d50
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 15 15:52:34 2010 -0800
|
||||
|
||||
Update Sun license notices to current X.Org standard form
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit ca4a76ab4afeca43db4e103e5345ae7eb2e69c13
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Dec 15 20:59:17 2009 -0500
|
||||
|
||||
configure.ac: sdkdir usage duplicates the sdk include dir
|
||||
|
||||
The sdkdir variable provides a duplicate copy of the include/xorg
|
||||
directory. The statement is removed as this was it's only used.
|
||||
In the Makefile, there is now only one instance of the -I sdkdir
|
||||
The sdkdir is provided in XORG_CFLAGS
|
||||
|
||||
Acked-by: Dan Nicholson <dbn.lists at gmail.com>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 8337651f91372ec6f16c1bdc7fe2c9af2d450db8
|
||||
Author: Michael Olbrich <m.olbrich@pengutronix.de>
|
||||
Date: Fri Dec 11 08:32:08 2009 -0500
|
||||
|
||||
configure.ac: remove wrong include path. #24674
|
||||
|
||||
Don't use $(prefix)/include as include path. It can break things
|
||||
when cross-compiling with DESTDIR and prefix=/usr
|
||||
|
||||
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 71eecf7aa4deabb81a1b460e521187a01ed389cd
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Nov 23 09:25:05 2009 -0500
|
||||
|
||||
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||
|
||||
Now that the INSTALL file is generated.
|
||||
Allows running make maintainer-clean.
|
||||
|
||||
commit e4ce7d5542567c4a79335048bb8a852340fea33f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:41:41 2009 -0400
|
||||
|
||||
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||
|
||||
Automake 'foreign' option is specified in configure.ac.
|
||||
Remove from Makefile.am
|
||||
|
||||
commit c6b4a7bfe6ea4830353a6aae699aca2d7973822b
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:09:09 2009 -0400
|
||||
|
||||
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.
|
||||
|
||||
commit 578138140719a64c1aec5a516533daa0f2bbd949
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Oct 26 12:54:20 2009 -0400
|
||||
|
||||
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
|
||||
|
||||
commit e84843a54a2e5a423705eea274da0908f2b42061
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Oct 22 12:34:16 2009 -0400
|
||||
|
||||
.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.
|
||||
|
||||
commit 34a88fb7da3a77d00f8b0ff3584823deff865215
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Sep 7 11:12:13 2009 -0400
|
||||
|
||||
xf86-video-apm: Remove unused .cvsignore file #23776
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit ec3e90e90b6e1c30122056466593bc53496773b4
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Thu Jul 30 11:20:31 2009 +1000
|
||||
|
||||
apm: bump for 1.2.2 release
|
||||
|
||||
commit 457f84f373b33838355dbb059892c118bed51409
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Thu Jul 30 11:19:35 2009 +1000
|
||||
|
||||
apm: fix up ABI properly
|
||||
|
||||
commit c2d90960dcd57b1380266188ca7155e981b50bb9
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jul 28 13:32:28 2009 +1000
|
||||
|
||||
apm: update for resources/RAC API removal
|
||||
|
||||
commit 09347dfc78b7f291313057863976bf4b679362d1
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Thu Jul 16 11:26:14 2009 +1000
|
||||
|
||||
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>
|
||||
|
||||
commit f985346aef9c15eaa1669ab8317e5e470eb143dc
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu May 28 14:41:37 2009 -0400
|
||||
|
||||
Remove useless loader symbol lists.
|
||||
|
||||
commit c2f0cf8d34cb4a8838586bc93b9166415e9277d7
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sun Jan 25 19:39:27 2009 +0100
|
||||
|
||||
Typo fix
|
||||
|
||||
This was introduced in "xf1/4 bpp conversion"
|
||||
(commit 5e0510dd0144c8ee85b2bd8bde58ae212f0d8453)
|
||||
|
||||
commit fb0378635d5840152716bd6834148012fee90e00
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 9 16:25:17 2009 -0800
|
||||
|
||||
Remove xorgconfig & xorgcfg from See Also list in man page
|
||||
|
||||
commit aa1df17848f6238def86a41eadb662b4480ee762
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Mon Dec 22 14:12:50 2008 +1000
|
||||
|
||||
apm 1.2.1
|
||||
|
||||
commit ba440693cb40cb6eb414bbad86fea8d444bd0cac
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Dec 19 10:18:44 2008 -0500
|
||||
|
||||
Stop using XVCALL macro
|
||||
|
||||
commit c0a4a2528dbaba95fec181552ccb0f00e1ede2ea
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Sun Nov 23 17:50:37 2008 -0500
|
||||
|
||||
Make ISA optional
|
||||
|
||||
commit 33edd3514fbfbd8b36a8568dbe021d0df99e6743
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Aug 15 15:20:16 2008 -0400
|
||||
|
||||
Actually use the DDC results we get.
|
||||
|
||||
commit 51ac7b1d182730ab1b9aaac412ac6cc40904bce3
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Fri Aug 15 13:58:29 2008 -0400
|
||||
|
||||
Uninclude xf86Version.h
|
||||
|
||||
commit 230858d8b3dfc18098cb89cdee3599714ac95375
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Mon Jul 21 15:38:00 2008 -0300
|
||||
|
||||
Protect xf86rush dependent code around #ifdef XF86RUSH
|
||||
|
||||
Also correct an incorrect #ifndef -> #ifdef, so that the driver now
|
||||
doesn't have any calls to non existent symbols.
|
||||
|
||||
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
|
||||
commit 3cbb51c4a94b1d19cdc5b9542449281cc0952356
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Mar 19 12:10:48 2008 -0400
|
||||
|
||||
apm 1.2.0
|
||||
|
||||
commit 6c374fadd3b81a6d58c4f5d361d957c85cab1d4a
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Mar 19 11:05:14 2008 -0400
|
||||
|
||||
Death to RCS tags.
|
||||
|
||||
commit 9c5bd06addbd5470c891760b1ba84c27eddeecad
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Mar 11 10:50:32 2008 +1000
|
||||
|
||||
further build fixes
|
||||
|
||||
commit 5e0510dd0144c8ee85b2bd8bde58ae212f0d8453
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Mar 11 10:48:19 2008 +1000
|
||||
|
||||
xf1/4 bpp conversion
|
||||
|
||||
commit d1e29902483a82e86b07cd30d41d411e71b776ea
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Mar 11 10:45:08 2008 +1000
|
||||
|
||||
pcirename conversion
|
||||
|
||||
commit 5d2abb8ff9fdcfab6d5fe4f16acf302cb6811d58
|
||||
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
|
||||
Date: Sat Mar 8 23:20:13 2008 +0100
|
||||
|
||||
Makefile.am: nuke RCS Id
|
||||
|
||||
commit ca78b41a6fcb4110d8e19636baa8dfb4a9ef07bd
|
||||
Author: Brice Goglin <bgoglin@debian.org>
|
||||
Date: Tue Aug 7 10:15:10 2007 +0200
|
||||
|
||||
Define APM_*_VERSION using PACKAGE_VERSION_*
|
||||
|
||||
commit 5c471bae5933a3e915d8aba2dbf7c4f68c3086b7
|
||||
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
|
||||
Date: Thu Mar 1 17:46:28 2007 -0500
|
||||
|
||||
Remove useless mfb.h include.
|
||||
|
||||
commit 3419d02714e4d10fa267b427af012de81c447a23
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Mar 1 10:40:39 2007 -0800
|
||||
|
||||
renamed: .cvsignore -> .gitignore
|
||||
|
||||
commit a56ca8d06b4286d8c4e4188e6056eff00a2209f5
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Mar 1 10:40:15 2007 -0800
|
||||
|
||||
Replace references to XFree86/XF86Config in man page
|
||||
|
||||
commit 03e919c17ff7981bc2d8d03eaf0955adbb03a7b0
|
||||
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
|
||||
Date: Thu Dec 14 14:41:11 2006 -0500
|
||||
|
||||
Naming change: Security*Access -> Dix*Access
|
||||
|
||||
commit 392b8d45b08b9e87facb7f23cb2226fcd5062425
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Sat Apr 8 01:14:51 2006 +0000
|
||||
|
||||
Bump to 1.1.1 for Xv changes.
|
||||
|
||||
commit 8f9172e2814b98b58fcc2e57cde720e10477b9c1
|
||||
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Fri Apr 7 23:04:59 2006 +0000
|
||||
|
||||
Add a DrawablePtr argument to the XV functions to pave the way for
|
||||
redirected video.
|
||||
|
||||
commit 8541e7775e75cd6ce0fb69ddb8922b6032489441
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Apr 7 18:55:04 2006 +0000
|
||||
|
||||
Fix a missed VERSION -> APM_VERSION.
|
||||
|
||||
commit cdfc8e010e230763250eb8b57d0106d20cf40080
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Apr 7 18:34:37 2006 +0000
|
||||
|
||||
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
|
||||
|
||||
commit bf98a33803e6c74f6b0015add1271e7f843e5ac6
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Dec 26 18:18:04 2005 +0000
|
||||
|
||||
Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck)
|
||||
|
||||
commit 25ac65dfd98ff8dcb948b07d8ca4e8124e40bf60
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Dec 21 02:29:59 2005 +0000
|
||||
|
||||
Update package version for X11R7 release.
|
||||
|
||||
commit a4e41512842d5a91fa80e7ae5f071a156a538d9e
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Dec 19 16:25:52 2005 +0000
|
||||
|
||||
Stub COPYING files
|
||||
|
||||
commit 8f2f41847a4cfdca3ab3c166941780c9b83a3db0
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:16 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit 16ca24864892502829c37118d81c3bf9d7564069
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Dec 6 22:48:33 2005 +0000
|
||||
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
|
||||
commit cab75d09cb977e9b946f1067c9e98e206c0e7d23
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:32 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit d05d3cafeafbdb667706290b0a7bbc9eb4a38a8e
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Dec 2 02:16:07 2005 +0000
|
||||
|
||||
Remove extraneous AC_MSG_RESULT.
|
||||
|
||||
commit 4775074a27eae9c379c0e26b226811f0f1fdb1e0
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Tue Nov 29 23:29:57 2005 +0000
|
||||
|
||||
Only build dlloader modules by default.
|
||||
|
||||
commit ce3092b8cdff25d771765fd64d391b56017b5735
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Nov 28 22:04:08 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 c63cfdbe97d19ea664f23dda7fe07627325649ae
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Mon Nov 21 10:49:09 2005 +0000
|
||||
|
||||
Add .cvsignores for drivers.
|
||||
|
||||
commit 459f7490f879ee4e7232e4653ce3f4cd03d04eb2
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Nov 9 21:15:14 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC2 release.
|
||||
|
||||
commit 88d85d65fa2aeef87a03019dbe87bf4ff7b0c3ed
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Nov 1 15:08:52 2005 +0000
|
||||
|
||||
Update pkgcheck depedencies to work with separate build roots.
|
||||
|
||||
commit 49db1e530eb8df10b2ac64b3cc9f7d368d09dc04
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:48:02 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit e0feaa362f56ac5f82baaee90d0a5886e1e8efa9
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:46:56 2005 +0000
|
||||
|
||||
lib/Xcomposite/Xcomposite.h
|
||||
lib/Xft/Imakefile
|
||||
lib/Xft/Xft.h Update library version numbers to match updated package
|
||||
versions.
|
||||
Update driver version numbers for RC1.
|
||||
|
||||
commit 4660df3bf81e1da5beb3a32da7941ad880f1626c
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Tue Oct 18 00:01:52 2005 +0000
|
||||
|
||||
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
|
||||
substitutions to work better with BSD make
|
||||
|
||||
commit 1613d814b235f849fb2ddc8655a25f02bbc3dda0
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Oct 17 22:57:32 2005 +0000
|
||||
|
||||
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
|
||||
of indirectly
|
||||
|
||||
commit a7990a8eb38e547ef6f277b6f8a55fd653649424
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Oct 17 00:09:01 2005 +0000
|
||||
|
||||
Use sed & cpp to substitute variables in driver man pages
|
||||
|
||||
commit 3134bbad0f248868ba3cfeae8b5afe3c295d7aa2
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Oct 4 20:01:03 2005 +0000
|
||||
|
||||
Check in generated README files
|
||||
|
||||
commit 7b90aace06d6e4abaf81073f49604f5068a60ee8
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon Oct 3 21:22:06 2005 +0000
|
||||
|
||||
- For all drivers that have a <driver>.sgml file, add code in their build
|
||||
system to build the README file at make dist time
|
||||
- in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
|
||||
will check if the required tools and files exist, and if so set a
|
||||
conditional.
|
||||
- util/modular/symlink.sh
|
||||
- Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
|
||||
- Add all the README.<driver> to the list of excluded files
|
||||
- xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
|
||||
it spew less warnings when the text file is built.
|
||||
|
||||
commit 6b16d0c1fc57da0f3319791e9b928d0f3fb673d1
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Sep 27 20:53:19 2005 +0000
|
||||
|
||||
Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
|
||||
newport to accomodate various new documentation and utility files.
|
||||
|
||||
commit 1f46a5a39c128aa885b462af178370f43d7ad56e
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Sun Aug 21 17:10:05 2005 +0000
|
||||
|
||||
Make building of Rush optional, bump to 1.0.1.
|
||||
|
||||
commit 9c77cb886ab91770f0788caadead23f0a1f5e851
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Thu Aug 18 09:03:45 2005 +0000
|
||||
|
||||
Update autogen.sh to one that does objdir != srcdir.
|
||||
|
||||
commit 44aca00a9e046b4fb7fa4eb4f00e76ad8b9a2b9a
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed Aug 10 14:07:24 2005 +0000
|
||||
|
||||
Don\'t lose existing CFLAGS in all the input drivers and some of the video
|
||||
drivers
|
||||
|
||||
commit 59a6546a4fd64bceed54f94ee2aea2c2981de775
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:42 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 180b7881a91ebce19e26d192fd287d5477003d11
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed Jul 13 22:00:46 2005 +0000
|
||||
|
||||
Engang til for prins Knud
|
||||
|
||||
commit c76f0d6449b380ba5d2a042c8541a522f014cc8c
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed Jul 13 18:07:44 2005 +0000
|
||||
|
||||
Add accidentally left out PKG_CHECK_MODULES
|
||||
|
||||
commit f46d068d8f05dae035c1e4c9da1eb32d72538cc0
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Wed Jul 13 17:33:47 2005 +0000
|
||||
|
||||
Build system for apm video driver
|
||||
|
||||
commit 5141e20bdd1281d340136f86969f75aa6f8afb9c
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Jul 11 02:29:44 2005 +0000
|
||||
|
||||
Prep for modular builds by adding guarded #include "config.h" everywhere.
|
||||
|
||||
commit 75d8d467221fa68e1fde58b7f9456f6a6dc84d68
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Sun Jul 3 08:53:43 2005 +0000
|
||||
|
||||
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
|
||||
|
||||
commit 3a78bd6437927963d996866b6ad627e02337f6dd
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Fri Jul 1 22:43:11 2005 +0000
|
||||
|
||||
Change all misc.h and os.h references to <X11/foo.h>.
|
||||
|
||||
commit 3c5799ac5f6f685dec989b15ac65e02b12a00288
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Sat Jun 25 21:16:52 2005 +0000
|
||||
|
||||
Bug #3626: _X_EXPORT tags for video and input drivers.
|
||||
|
||||
commit bdbc205e36dbceb1c9c21e20dd9d2e4bf828989e
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Wed Apr 20 12:25:22 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 40912339a041c7193f1134befc94d62c5c3bd75b
|
||||
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
|
||||
Date: Sat Dec 4 00:42:59 2004 +0000
|
||||
|
||||
Encoding of numerous files changed to UTF-8
|
||||
|
||||
commit 3032cb6cda0e6527cf40fba692e2e5782858445a
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Tue Aug 3 02:44:20 2004 +0000
|
||||
|
||||
Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
|
||||
DoLoadableServer NO builds work again.
|
||||
|
||||
commit 8b0f17920a54bdf3d54c0d07b4293d617d2ff964
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Jul 30 20:30:51 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 5f64cbc462a1a841bebe1fa5bae57560a8def42f
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Wed Jun 16 09:22:41 2004 +0000
|
||||
|
||||
DRI XFree86-4_3_99_12-merge import
|
||||
|
||||
commit 6003db3c2a88658f9254f1c346ad1960250b30b2
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 19:25:03 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit 07687be411485ed9af8a296a3956ca7c283a4e0f
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:33:16 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit 978cfe424df18a4571ec59cc4b8ffef6438a1bd7
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:12:15 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit 8972243cd2834a918149f0d7a1c5d5b06765f98e
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:35:46 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit f4c9cb03041b727c3223f751c88d86c29c3f114d
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:23:14 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit bd1b28d04cdc01e0f08f9b67f515beea3f8c4fd1
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Tue Nov 25 19:28:34 2003 +0000
|
||||
|
||||
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
|
||||
|
||||
commit 7b32f79c87e4acaf95017c9ff075285f3e332704
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:55 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit 696e90e916d6f0db4057826115d74c5d968eb5e7
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:55 2003 +0000
|
||||
|
||||
Initial revision
|
||||
|
||||
commit 4a50a1da2ff5601a5721d1a06a23c7f75db958c4
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:49 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
291
driver/xf86-video-apm/INSTALL
Normal file
291
driver/xf86-video-apm/INSTALL
Normal file
@ -0,0 +1,291 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is free documentation; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, and a
|
||||
file `config.log' containing compiler output (useful mainly for
|
||||
debugging `configure').
|
||||
|
||||
It can also use an optional file (typically called `config.cache'
|
||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||
the results of its tests to speed up reconfiguring. Caching is
|
||||
disabled by default to prevent problems with accidental use of stale
|
||||
cache files.
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If you are using the cache, and at
|
||||
some point `config.cache' contains results you don't want to keep, you
|
||||
may remove or edit it.
|
||||
|
||||
The file `configure.ac' (or `configure.in') is used to create
|
||||
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
|
||||
Running `configure' might take a while. While running, it prints
|
||||
some messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation.
|
||||
|
||||
5. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
also a `make maintainer-clean' target, but that is intended mainly
|
||||
for the package's developers. If you use it, you may have to get
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
6. Often, you can also type `make uninstall' to remove the installed
|
||||
files again.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. Run `./configure --help'
|
||||
for details on some of the pertinent environment variables.
|
||||
|
||||
You can give `configure' initial values for configuration parameters
|
||||
by setting variables in the command line or in the environment. Here
|
||||
is an example:
|
||||
|
||||
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||
|
||||
*Note Defining Variables::, for more details.
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
installed the package for one architecture, use `make distclean' before
|
||||
reconfiguring for another architecture.
|
||||
|
||||
On MacOS X 10.5 and later systems, you can create libraries and
|
||||
executables that work on multiple system types--known as "fat" or
|
||||
"universal" binaries--by specifying multiple `-arch' options to the
|
||||
compiler but only a single `-arch' option to the preprocessor. Like
|
||||
this:
|
||||
|
||||
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CPP="gcc -E" CXXCPP="g++ -E"
|
||||
|
||||
This is not guaranteed to produce working output in all cases, you
|
||||
may have to build one architecture at a time and combine the results
|
||||
using the `lipo' tool if you have problems.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX'.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||
PREFIX as the prefix for installing programs and libraries.
|
||||
Documentation and other data files still use the regular prefix.
|
||||
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them.
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
to try
|
||||
|
||||
./configure CC="cc"
|
||||
|
||||
and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' cannot figure out
|
||||
automatically, but needs to determine by the type of machine the package
|
||||
will run on. Usually, assuming the package is built to be run on the
|
||||
_same_ architectures, `configure' can figure that out, but if it prints
|
||||
a message saying it cannot guess the machine type, give it the
|
||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the machine type.
|
||||
|
||||
If you are _building_ compiler tools for cross-compiling, you should
|
||||
use the option `--target=TYPE' to select the type of system they will
|
||||
produce code for.
|
||||
|
||||
If you want to _use_ a cross compiler, that generates code for a
|
||||
platform different from the build platform, you should specify the
|
||||
"host" platform (i.e., that on which the generated programs will
|
||||
eventually be run) with `--host=TYPE'.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Defining Variables
|
||||
==================
|
||||
|
||||
Variables not defined in a site shell script can be set in the
|
||||
environment passed to `configure'. However, some packages may run
|
||||
configure again during the build, and the customized values of these
|
||||
variables may be lost. In order to avoid this problem, you should set
|
||||
them in the `configure' command line, using `VAR=value'. For example:
|
||||
|
||||
./configure CC=/usr/local2/bin/gcc
|
||||
|
||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||
overridden in the site shell script).
|
||||
|
||||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||
|
||||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||
|
||||
`configure' Invocation
|
||||
======================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--help'
|
||||
`-h'
|
||||
Print a summary of all of the options to `configure', and exit.
|
||||
|
||||
`--help=short'
|
||||
`--help=recursive'
|
||||
Print a summary of the options unique to this package's
|
||||
`configure', and exit. The `short' variant lists options used
|
||||
only in the top level, while the `recursive' variant lists options
|
||||
also present in any nested packages.
|
||||
|
||||
`--version'
|
||||
`-V'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Enable the cache: use and save the results of the tests in FILE,
|
||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||
disable caching.
|
||||
|
||||
`--config-cache'
|
||||
`-C'
|
||||
Alias for `--cache-file=config.cache'.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made. To
|
||||
suppress all normal output, redirect it to `/dev/null' (any error
|
||||
messages will still be shown).
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *Note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
`--no-create'
|
||||
`-n'
|
||||
Run the configure checks, but stop before creating any output
|
||||
files.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options. Run
|
||||
`configure --help' for more details.
|
||||
|
||||
@ -18,13 +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
|
||||
|
||||
if BUILD_LINUXDOC
|
||||
README: README.sgml
|
||||
$(MAKE_TEXT) README.sgml && mv README.txt README
|
||||
endif
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
EXTRA_DIST = README.sgml
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
||||
@ -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@
|
||||
@ -104,15 +105,13 @@ AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
|
||||
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
|
||||
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
|
||||
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -137,7 +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@
|
||||
INCLUDES = @INCLUDES@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -148,17 +147,13 @@ LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINUXDOC = @LINUXDOC@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKE_HTML = @MAKE_HTML@
|
||||
MAKE_PDF = @MAKE_PDF@
|
||||
MAKE_PS = @MAKE_PS@
|
||||
MAKE_TEXT = @MAKE_TEXT@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -173,7 +168,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PS2PDF = @PS2PDF@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
@ -182,12 +176,9 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XF86RUSH_CFLAGS = @XF86RUSH_CFLAGS@
|
||||
XF86RUSH_FALSE = @XF86RUSH_FALSE@
|
||||
XF86RUSH_LIBS = @XF86RUSH_LIBS@
|
||||
XF86RUSH_TRUE = @XF86RUSH_TRUE@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
@ -236,9 +227,8 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
EXTRA_DIST = README.sgml
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -480,6 +470,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 \
|
||||
@ -606,6 +599,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
|
||||
@ -661,7 +655,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 \
|
||||
@ -674,8 +668,15 @@ uninstall-info: uninstall-info-recursive
|
||||
tags tags-recursive uninstall uninstall-am uninstall-info-am
|
||||
|
||||
|
||||
@BUILD_LINUXDOC_TRUE@README: README.sgml
|
||||
@BUILD_LINUXDOC_TRUE@ $(MAKE_TEXT) README.sgml && mv README.txt README
|
||||
.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:
|
||||
|
||||
@ -1,113 +1,148 @@
|
||||
$XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/README,v 1.5 2000/02/11 22:35:55 dawes Exp $
|
||||
Information for Alliance Promotion chipset users
|
||||
Loic Grenie ( <mailto:grenie@math.jussieu.fr>), Henrik
|
||||
Harmsen ( <mailto:Henrik.Harmsen@erv.ericsson.se>)
|
||||
6 March 2000
|
||||
____________________________________________________________
|
||||
|
||||
Note 1: This driver is work in progress. It might not work at all.
|
||||
Want to help? Docs are at
|
||||
ftp://beta.xfree86.org/pub/xf86/devel/Documentation/apm
|
||||
|
||||
This is the Alliance Promotion driver for XFree86 4.0+. It currently only
|
||||
supports the AT3D, AT25 chipsets (found on various Voodoo-Rush cards) and AT24.
|
||||
There is incomplete support for the 6422. The 6422 chips are supported in the
|
||||
XFree86 3.3.x series.
|
||||
|
||||
What has worked on my computer :
|
||||
- XAA for 8/16/24/32 bpp
|
||||
- DGA and DGA2
|
||||
- DPMS
|
||||
- glide2x
|
||||
- using as a module
|
||||
- shadow framebuffer
|
||||
- AT3D
|
||||
- AT24
|
||||
- AP6422 (although with problems, including locks)
|
||||
- multi card setup (with and without Xinerama)
|
||||
- Xv images, even with (slightly modified) glide2x ; note that there is
|
||||
still a little problem with vertical offset.
|
||||
|
||||
There is some support for PC-98 with the help of Isao Ohishi
|
||||
(ohishi@aero.rim.or.jp). It's still under development. I hope that 8bpp
|
||||
works correctly.
|
||||
|
||||
What has not worked :
|
||||
- I2C (I'm not sure my card, Hercules 128/3D, has proper cabling)
|
||||
|
||||
What is untested :
|
||||
|
||||
What should be done :
|
||||
- overlays (with the video engine, everything should be overlayable
|
||||
with everything)
|
||||
- (why not) 3210 support
|
||||
Table of Contents
|
||||
|
||||
|
||||
Loïc Grenié
|
||||
|
||||
Authors:
|
||||
-----------------------------------------------------------------------
|
||||
Kent Hamilton Initial creation.
|
||||
Henrik Harmsen Lots of additions and fixes. <hch@cd.chalmers.se>
|
||||
Loic Grenie Conversion to 4.0. <grenie@lami.univ-evry.fr>
|
||||
Additions and fixes.
|
||||
1. Support chipsets
|
||||
2. Acceleration
|
||||
3. DGA
|
||||
4. Video
|
||||
5. Shadow framebuffer
|
||||
6. Configuration
|
||||
7. glide2x
|
||||
8. Questions
|
||||
|
||||
|
||||
History:
|
||||
-----------------------------------------------------------------------
|
||||
Created by Kent Hamilton for Xfree86 from source from Alliance
|
||||
______________________________________________________________________
|
||||
|
||||
Modified 1997-06 by Henrik Harmsen
|
||||
- Added support for AT3D
|
||||
- Acceleration added for 8,16,32bpp: (for AT3D and AT24)
|
||||
- Filled rectangles
|
||||
- Screen-screen bitblts
|
||||
- Host-screen color expansion bitblts for text
|
||||
- DPMS support
|
||||
- Enabled hardware cursor code (also in 8bpp)
|
||||
- Set to programmable VCLK clock
|
||||
- Set MCLK to 57.3 MHz on AT3D.
|
||||
- Various bugfixes and cleanups
|
||||
1. Support chipsets
|
||||
|
||||
Modified 1997-07-06 by Henrik Harmsen
|
||||
- Fixed bug that made the HW cursor screw up on VT switches
|
||||
- Probably fixed bug that screwed up the screen when using
|
||||
screen-screen bitblts. This forced me to put an ApmSync() at
|
||||
the end of ApmSubsequentScreenToScreenCopy() which makes
|
||||
me unhappy... But: Better it works than not...
|
||||
The apm driver in the SVGA server is for Alliance Promotion graphics
|
||||
chipsets. The following chipsets are supported:
|
||||
|
||||
Modified 1997-10-19 by Henrik Harmsen
|
||||
- HW line drawing.
|
||||
- HW clipping.
|
||||
- Added support for ROP's.
|
||||
- Text acceleration now lots faster and support for accelerated
|
||||
proportional text. (Uses SCANLINE_PAD_DWORD + clipping).
|
||||
- Combined write for many register writes gives good
|
||||
general speedup. (write x+y as a single 32 bit entity, rather
|
||||
obvious, really...:-)
|
||||
- Now waits for correct number of free slots in FIFO before
|
||||
issuing writes to the card.
|
||||
This seems to have eliminated the last instances of dropped
|
||||
interrupts from serial IO and no more lost packets in PPP :-)
|
||||
- Converted cursor support to use XAA interface.
|
||||
- Fixed ApmSync(). Finally removed call to ApmSync at end of
|
||||
ApmSubsequentScreenToScreenCopy() :-)
|
||||
|
||||
Modified 1998-03-29 by Henrik Harmsen
|
||||
- Added DGA support.
|
||||
- Added accel support for AP6422. Fixed AT24 accel support.
|
||||
- Fixed clock register calculation for AP6422 and AT24.
|
||||
- DPMS support for AT24 & AP6422.
|
||||
- 2% faster text accel for AT24/AT3D :-)
|
||||
o 6422
|
||||
|
||||
Modified 1998-12-18 by Loic Grenie
|
||||
- Converted to Xfree86 4.0 driver interface. (Only support for
|
||||
AT25/AT3D chips).
|
||||
Old chipset. The driver is still very unstable and has computer
|
||||
crashes. You should use XFree86 3.3.x for this chipset.
|
||||
|
||||
|
||||
o AT24
|
||||
|
||||
As found in Diamond Stealth Video 2500. Quite similar to AT3D.
|
||||
|
||||
o AT25, AT3D
|
||||
|
||||
AT3D is found in Hercules Stingray 128/3D. Most other Voodoo Rush
|
||||
based cards use the AT25 which is identical except it doesn't have
|
||||
the 3D stuff in it.
|
||||
|
||||
|
||||
2. Acceleration
|
||||
|
||||
The apm driver uses the XAA in the SVGA server. It has support for the
|
||||
following acceleration:
|
||||
|
||||
|
||||
o Bitblts (rectangle copy operation)
|
||||
|
||||
o Lines (solid, single pixel)
|
||||
|
||||
o Filled rectangles
|
||||
|
||||
o CPU->Screen image transfers.
|
||||
|
||||
o CPU->Screen colour expansion (text accel).
|
||||
|
||||
o Screen->Screen colour expansion (cached text accel).
|
||||
|
||||
o Mono 8x8 pattern fill. Not for 6422.
|
||||
|
||||
o Colour 8x8 pattern fill (in 8bpp). Not for 6422.
|
||||
|
||||
o Hardware cursor.
|
||||
|
||||
o Pixmap caching.
|
||||
|
||||
All in 8, 16 and 32 bpp modes. In 24bpp mode only Bitblts and Filled
|
||||
rectangles is supported. Also VESA DPMS power save mode is fully
|
||||
supported with "standby", "suspend" and "off" modes (set with with the
|
||||
"xset dpms" command).
|
||||
|
||||
|
||||
3. DGA
|
||||
|
||||
Full DGA 2.0 support with framebuffer access and drawing acceleration.
|
||||
|
||||
|
||||
4. Video
|
||||
|
||||
It has limited hardware support for video decoding on the AT24 and
|
||||
AT25/3D. It can also display an image in YUV colours inside the
|
||||
desktop. There are some more exotic formats such as YUV 4.1.1, YUV
|
||||
4.0.0 and RGB 8,16.32bpp.
|
||||
|
||||
|
||||
5. Shadow framebuffer
|
||||
|
||||
There is a mode, called shadow framebuffer, where the graphics are
|
||||
used to display the images. All rendering is done in memory in a so-
|
||||
called shadow framebuffer. This mode is useful if you need lots of
|
||||
reading in the video memory and to use it you will have to put
|
||||
|
||||
Option "ShadowFB"
|
||||
|
||||
|
||||
|
||||
in your xorg.conf file.
|
||||
|
||||
|
||||
6. Configuration
|
||||
|
||||
You can turn off hardware cursor by inserting the following line in
|
||||
the Device section of the xorg.conf file:
|
||||
|
||||
Option "SWcursor"
|
||||
|
||||
|
||||
|
||||
Or turn off hardware acceleration:
|
||||
|
||||
Option "noaccel"
|
||||
|
||||
|
||||
|
||||
Or turn off MMIO
|
||||
|
||||
|
||||
Option "nolinear"
|
||||
|
||||
|
||||
|
||||
Do not specify either the amount of video RAM or which chipset in the
|
||||
config file. It is better to let the driver probe for this. Also don't
|
||||
put any "clocks" line in the device section since these chips have a
|
||||
fully programmable clock that can almost take any modeline you throw
|
||||
at it. It might though fail at some specific clock values but in that
|
||||
case you should just try a slightly different clock and it should
|
||||
work.
|
||||
|
||||
|
||||
7. glide2x
|
||||
|
||||
There is support for the XF86Rush extension for use with the glide2x
|
||||
library.
|
||||
|
||||
|
||||
8. Questions
|
||||
|
||||
Any questions regarding this driver should be sent to Loic Grenie. It
|
||||
should be possible to add support for the 3210 chipset if someone
|
||||
needs it.
|
||||
|
||||
Modified 1999-03-14 by Henrik Harmsen
|
||||
- Various fixes to bring it up to 3.9Pd.
|
||||
- Added preliminary (completely untested) support for dynamic
|
||||
loading.
|
||||
|
||||
Modified 1999-07-07 by Loïc Grenié
|
||||
- Converted to new RAC. Support for DGA and DGA2, I2C, Rush extension.
|
||||
|
||||
Modified 2000-02-10 by Loïc Grenié
|
||||
- Bug fixes
|
||||
- AP6422 (bugged !)
|
||||
- Xv driver
|
||||
|
||||
@ -1,122 +0,0 @@
|
||||
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
|
||||
<!ENTITY % defs SYSTEM "defs.ent"> %defs;
|
||||
]>
|
||||
|
||||
<article>
|
||||
<title> Information for Alliance Promotion chipset users
|
||||
<author> Loïc Grenié (<email>grenie@math.jussieu.fr</email>),
|
||||
Henrik Harmsen (<email>Henrik.Harmsen@erv.ericsson.se</email>)
|
||||
<date> 6 March 2000
|
||||
<ident>
|
||||
$Id: README.sgml,v 1.1.1.1 2006/11/26 19:58:56 matthieu Exp $
|
||||
</ident>
|
||||
<toc>
|
||||
|
||||
<sect> Support chipsets
|
||||
<p>
|
||||
The apm driver in the SVGA server is for Alliance Promotion
|
||||
graphics chipsets. The following chipsets are supported:
|
||||
|
||||
<itemize>
|
||||
<item> 6422
|
||||
|
||||
Old chipset. The driver is still very unstable and has computer
|
||||
crashes. You should use XFree86 3.3.x for this chipset.
|
||||
|
||||
|
||||
<item> AT24
|
||||
|
||||
As found in Diamond Stealth Video 2500. Quite similar to AT3D.
|
||||
|
||||
<item> AT25, AT3D
|
||||
|
||||
AT3D is found in Hercules Stingray 128/3D. Most other Voodoo
|
||||
Rush based cards use the AT25 which is identical except it
|
||||
doesn't have the 3D stuff in it.
|
||||
</itemize>
|
||||
|
||||
<sect> Acceleration
|
||||
<p>
|
||||
The apm driver uses the XAA in the
|
||||
SVGA server. It has support for the following acceleration:
|
||||
|
||||
<itemize>
|
||||
<item> Bitblts (rectangle copy operation)
|
||||
<item> Lines (solid, single pixel)
|
||||
<item> Filled rectangles
|
||||
<item> CPU->Screen image transfers.
|
||||
<item> CPU->Screen colour expansion (text accel).
|
||||
<item> Screen->Screen colour expansion (cached text accel).
|
||||
<item> Mono 8x8 pattern fill. Not for 6422.
|
||||
<item> Colour 8x8 pattern fill (in 8bpp). Not for 6422.
|
||||
<item> Hardware cursor.
|
||||
<item> Pixmap caching.
|
||||
</itemize>
|
||||
|
||||
All in 8, 16 and 32 bpp modes. In 24bpp mode only Bitblts and Filled rectangles
|
||||
is supported. Also VESA DPMS power save mode is fully supported with "standby",
|
||||
"suspend" and "off" modes (set with with the "xset dpms" command).
|
||||
|
||||
<sect> DGA
|
||||
<p>
|
||||
Full DGA 2.0 support with framebuffer access and drawing acceleration.
|
||||
|
||||
<sect> Video
|
||||
<p>
|
||||
It has limited hardware support for video decoding on the AT24 and AT25/3D. It can
|
||||
also display an image in YUV colours inside the desktop. There are some more exotic
|
||||
formats such as YUV 4.1.1, YUV 4.0.0 and RGB 8,16.32bpp.
|
||||
|
||||
<sect> Shadow framebuffer
|
||||
<p>
|
||||
There is a mode, called shadow framebuffer, where the graphics are used
|
||||
to display the images. All rendering is done in memory in a so-called shadow
|
||||
framebuffer. This mode is useful if you need lots of reading in the video
|
||||
memory and to use it you will have to put
|
||||
<verb>
|
||||
Option "ShadowFB"
|
||||
</verb>
|
||||
|
||||
in your xorg.conf file.
|
||||
|
||||
<sect> Configuration
|
||||
<p>
|
||||
First: Run the xorgconfig program to create a correct
|
||||
configuration.
|
||||
|
||||
You can turn off hardware cursor by inserting the following line in the
|
||||
Device section of the xorg.conf file:
|
||||
<verb>
|
||||
Option "SWcursor"
|
||||
</verb>
|
||||
|
||||
Or turn off hardware acceleration:
|
||||
<verb>
|
||||
Option "noaccel"
|
||||
</verb>
|
||||
|
||||
Or turn off MMIO
|
||||
|
||||
<verb>
|
||||
Option "nolinear"
|
||||
</verb>
|
||||
|
||||
Do not specify either the amount of video RAM or which chipset
|
||||
in the config file. It is better to let the driver probe for this. Also
|
||||
don't put any "clocks" line in the device section since these chips have
|
||||
a fully programmable clock that can almost take any modeline you throw
|
||||
at it. It might though fail at some specific clock values but in that case
|
||||
you should just try a slightly different clock and it should work.
|
||||
|
||||
<sect> glide2x
|
||||
<p>
|
||||
There is support for the XF86Rush extension for use with the glide2x library.
|
||||
|
||||
<sect> Questions
|
||||
<p>
|
||||
Any questions regarding this driver should be sent to Loïc
|
||||
Grenié. It should be possible to add support for the 3210 chipset
|
||||
if someone needs it.
|
||||
|
||||
|
||||
</article>
|
||||
939
driver/xf86-video-apm/aclocal.m4
vendored
939
driver/xf86-video-apm/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -8,9 +8,6 @@
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Have ISA support */
|
||||
#undef HAVE_ISA
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
@ -38,12 +35,6 @@
|
||||
/* xextproto 7.1 available */
|
||||
#undef HAVE_XEXTPROTO_71
|
||||
|
||||
/* Have 1bpp support */
|
||||
#undef HAVE_XF1BPP
|
||||
|
||||
/* Have 4bpp support */
|
||||
#undef HAVE_XF4BPP
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
|
||||
4247
driver/xf86-video-apm/configure
vendored
4247
driver/xf86-video-apm/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -20,93 +20,61 @@
|
||||
#
|
||||
# Process this file with autoconf to produce a configure script
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xf86-video-apm],
|
||||
1.2.2,
|
||||
[1.2.3],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-video-apm)
|
||||
|
||||
[xf86-video-apm])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Checks for programs.
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
# Initialize libtool
|
||||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_CC
|
||||
|
||||
AH_TOP([#include "xorg-server.h"])
|
||||
|
||||
# Define a configure option for an alternate module directory
|
||||
AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
|
||||
[ moduledir="$withval" ],
|
||||
[ moduledir="$libdir/xorg/modules" ])
|
||||
AC_SUBST(moduledir)
|
||||
|
||||
|
||||
# Checks for extensions
|
||||
# Store the list of server defined optional extensions in REQUIRED_MODULES
|
||||
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
|
||||
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
|
||||
XORG_DRIVER_CHECK_EXT(XV, videoproto)
|
||||
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
|
||||
|
||||
# Checks for pkg-config packages
|
||||
# Obtain compiler/linker options for the driver dependencies
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
|
||||
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)
|
||||
|
||||
PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no)
|
||||
AM_CONDITIONAL(XF86RUSH, test "x$have_xf86rush" = xyes)
|
||||
AC_SUBST([XF86RUSH_LIBS])
|
||||
AC_SUBST([XF86RUSH_CFLAGS])
|
||||
|
||||
CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
|
||||
INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
|
||||
AC_SUBST([CFLAGS])
|
||||
AC_SUBST([INCLUDES])
|
||||
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$XORG_CFLAGS"
|
||||
AC_CHECK_DECL(xf86ConfigIsaEntity,
|
||||
[AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
|
||||
[],
|
||||
[#include "xf86.h"])
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
# Checks for libraries.
|
||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
|
||||
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
||||
[XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
|
||||
[#include "xorg-server.h"])
|
||||
AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
|
||||
AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
|
||||
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
|
||||
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
|
||||
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
|
||||
fi
|
||||
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
|
||||
|
||||
DRIVER_NAME=apm
|
||||
AC_SUBST([DRIVER_NAME])
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
XORG_CHECK_LINUXDOC
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
@ -2127,17 +2127,6 @@ EOF
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
# The preopen pass in lib mode reverses $deplibs; put it back here
|
||||
# so that -L comes before libs that need it for instance...
|
||||
if test "$linkmode,$pass" = "lib,link"; then
|
||||
## FIXME: Find the place where the list is rebuilt in the wrong
|
||||
## order, and fix it there properly
|
||||
tmp_deplibs=
|
||||
for deplib in $deplibs; do
|
||||
tmp_deplibs="$deplib $tmp_deplibs"
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
fi
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
|
||||
@ -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)
|
||||
@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
|
||||
|
||||
CLEANFILES = $(driverman_DATA)
|
||||
|
||||
SED = sed
|
||||
|
||||
# Strings to replace in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
|
||||
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
|
||||
|
||||
.man.$(DRIVER_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
@ -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@
|
||||
@ -96,15 +94,13 @@ AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
|
||||
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
|
||||
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
|
||||
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -129,7 +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@
|
||||
INCLUDES = @INCLUDES@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -140,17 +136,13 @@ LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINUXDOC = @LINUXDOC@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKE_HTML = @MAKE_HTML@
|
||||
MAKE_PDF = @MAKE_PDF@
|
||||
MAKE_PS = @MAKE_PS@
|
||||
MAKE_TEXT = @MAKE_TEXT@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -165,21 +157,17 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PS2PDF = @PS2PDF@
|
||||
RANLIB = @RANLIB@
|
||||
SED = sed
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XF86RUSH_CFLAGS = @XF86RUSH_CFLAGS@
|
||||
XF86RUSH_FALSE = @XF86RUSH_FALSE@
|
||||
XF86RUSH_LIBS = @XF86RUSH_LIBS@
|
||||
XF86RUSH_TRUE = @XF86RUSH_TRUE@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
@ -234,21 +222,7 @@ driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
|
||||
EXTRA_DIST = @DRIVER_NAME@.man
|
||||
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'
|
||||
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
|
||||
all: all-am
|
||||
|
||||
@ -263,9 +237,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 \
|
||||
@ -435,7 +409,7 @@ uninstall-am: uninstall-drivermanDATA uninstall-info-am
|
||||
|
||||
|
||||
.man.$(DRIVER_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
# 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:
|
||||
|
||||
@ -24,6 +24,9 @@
|
||||
# -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) $(PCIACCESS_CFLAGS)
|
||||
|
||||
apm_drv_la_LTLIBRARIES = apm_drv.la
|
||||
apm_drv_la_LDFLAGS = -module -avoid-version
|
||||
apm_drv_ladir = @moduledir@/drivers
|
||||
@ -38,11 +41,6 @@ apm_drv_la_SOURCES = \
|
||||
apm_regs.h \
|
||||
apm_pcirename.h
|
||||
|
||||
if XF86RUSH
|
||||
apm_drv_la_SOURCES += apm_rush.c
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
apm_funcs.c \
|
||||
apm_video.c \
|
||||
apm_rush.c
|
||||
apm_video.c
|
||||
|
||||
@ -34,6 +34,12 @@
|
||||
# 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.
|
||||
|
||||
# this is obnoxious:
|
||||
# -module lets us name the module exactly how we want
|
||||
# -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.
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -56,7 +62,6 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@XF86RUSH_TRUE@am__append_1 = apm_rush.c
|
||||
subdir = src
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@ -76,12 +81,8 @@ am__installdirs = "$(DESTDIR)$(apm_drv_ladir)"
|
||||
apm_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(apm_drv_la_LTLIBRARIES)
|
||||
apm_drv_la_LIBADD =
|
||||
am__apm_drv_la_SOURCES_DIST = apm_accel.c apm_cursor.c apm_dga.c \
|
||||
apm_driver.c apm.h apm_i2c.c apm_regs.h apm_pcirename.h \
|
||||
apm_rush.c
|
||||
@XF86RUSH_TRUE@am__objects_1 = apm_rush.lo
|
||||
am_apm_drv_la_OBJECTS = apm_accel.lo apm_cursor.lo apm_dga.lo \
|
||||
apm_driver.lo apm_i2c.lo $(am__objects_1)
|
||||
apm_driver.lo apm_i2c.lo
|
||||
apm_drv_la_OBJECTS = $(am_apm_drv_la_OBJECTS)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
@ -95,7 +96,7 @@ CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(apm_drv_la_SOURCES)
|
||||
DIST_SOURCES = $(am__apm_drv_la_SOURCES_DIST)
|
||||
DIST_SOURCES = $(apm_drv_la_SOURCES)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@ -105,6 +106,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@
|
||||
@ -112,15 +114,13 @@ AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
BUILD_LINUXDOC_FALSE = @BUILD_LINUXDOC_FALSE@
|
||||
BUILD_LINUXDOC_TRUE = @BUILD_LINUXDOC_TRUE@
|
||||
BUILD_PDFDOC_FALSE = @BUILD_PDFDOC_FALSE@
|
||||
BUILD_PDFDOC_TRUE = @BUILD_PDFDOC_TRUE@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -145,7 +145,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@
|
||||
INCLUDES = @INCLUDES@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -156,17 +156,13 @@ LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||
LINUXDOC = @LINUXDOC@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKE_HTML = @MAKE_HTML@
|
||||
MAKE_PDF = @MAKE_PDF@
|
||||
MAKE_PS = @MAKE_PS@
|
||||
MAKE_TEXT = @MAKE_TEXT@
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -181,7 +177,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PS2PDF = @PS2PDF@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
@ -190,12 +185,9 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XF86RUSH_CFLAGS = @XF86RUSH_CFLAGS@
|
||||
XF86RUSH_FALSE = @XF86RUSH_FALSE@
|
||||
XF86RUSH_LIBS = @XF86RUSH_LIBS@
|
||||
XF86RUSH_TRUE = @XF86RUSH_TRUE@
|
||||
XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
@ -244,21 +236,23 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
|
||||
# this is obnoxious:
|
||||
# -module lets us name the module exactly how we want
|
||||
# -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) $(PCIACCESS_CFLAGS)
|
||||
apm_drv_la_LTLIBRARIES = apm_drv.la
|
||||
apm_drv_la_LDFLAGS = -module -avoid-version
|
||||
apm_drv_ladir = @moduledir@/drivers
|
||||
apm_drv_la_SOURCES = apm_accel.c apm_cursor.c apm_dga.c apm_driver.c \
|
||||
apm.h apm_i2c.c apm_regs.h apm_pcirename.h $(am__append_1)
|
||||
apm_drv_la_SOURCES = \
|
||||
apm_accel.c \
|
||||
apm_cursor.c \
|
||||
apm_dga.c \
|
||||
apm_driver.c \
|
||||
apm.h \
|
||||
apm_i2c.c \
|
||||
apm_regs.h \
|
||||
apm_pcirename.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
apm_funcs.c \
|
||||
apm_video.c \
|
||||
apm_rush.c
|
||||
apm_video.c
|
||||
|
||||
all: all-am
|
||||
|
||||
@ -273,9 +267,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 \
|
||||
@ -334,7 +328,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apm_dga.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apm_driver.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apm_i2c.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apm_rush.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
|
||||
@ -20,20 +20,9 @@
|
||||
/* All drivers using the vgahw module need this */
|
||||
#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"
|
||||
|
||||
/* Needed for the 1 and 4 bpp framebuffers */
|
||||
#ifdef HAVE_XF1BPP
|
||||
#include "xf1bpp.h"
|
||||
#endif
|
||||
#ifdef HAVE_XF4BPP
|
||||
#include "xf4bpp.h"
|
||||
#endif
|
||||
|
||||
#include "fb.h"
|
||||
|
||||
/* Drivers using the XAA interface ... */
|
||||
|
||||
@ -89,13 +89,6 @@ static PciChipsets ApmPciChipsets[] = {
|
||||
{ -1, -1, RES_UNDEFINED }
|
||||
};
|
||||
|
||||
#ifdef HAVE_ISA
|
||||
static IsaChipsets ApmIsaChipsets[] = {
|
||||
{ PCI_CHIP_AP6422, RES_EXCLUSIVE_VGA},
|
||||
{-1, RES_UNDEFINED}
|
||||
};
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
OPTION_SET_MCLK,
|
||||
OPTION_SW_CURSOR,
|
||||
@ -236,57 +229,6 @@ ApmAvailableOptions(int chipid, int busid)
|
||||
return ApmOptions;
|
||||
}
|
||||
|
||||
#ifdef HAVE_ISA
|
||||
static int
|
||||
ApmFindIsaDevice(GDevPtr dev)
|
||||
{
|
||||
char save = rdinx(0x3C4, 0x10);
|
||||
int i;
|
||||
int apmChip = -1;
|
||||
|
||||
/*
|
||||
* Start by probing the VGA chipset.
|
||||
*/
|
||||
outw(0x3C4, 0x1210);
|
||||
if (rdinx(0x3C4, 0x11) == 'P' && rdinx(0x3C4, 0x12) == 'r' &&
|
||||
rdinx(0x3C4, 0x13) == 'o') {
|
||||
char id_ap6420[] = "6420";
|
||||
char id_ap6422[] = "6422";
|
||||
char id_at24[] = "6424";
|
||||
char id_at3d[] = "AT3D";
|
||||
char idstring[] = " ";
|
||||
|
||||
/*
|
||||
* Must be an Alliance !!!
|
||||
*/
|
||||
for (i = 0; i < 4; i++)
|
||||
idstring[i] = rdinx(0x3C4, 0x14 + i);
|
||||
if (!memcmp(id_ap6420, idstring, 4) ||
|
||||
!memcmp(id_ap6422, idstring, 4))
|
||||
apmChip = AP6422;
|
||||
else if (!memcmp(id_at24, idstring, 4))
|
||||
apmChip = AT24;
|
||||
else if (!memcmp(id_at3d, idstring, 4))
|
||||
apmChip = AT3D;
|
||||
if (apmChip >= 0) {
|
||||
int apm_xbase;
|
||||
|
||||
apm_xbase = (rdinx(0x3C4, 0x1F) << 8) | rdinx(0x3C4, 0x1E);
|
||||
|
||||
if (!(wrinx(0x3C4, 0x1D, 0xCA >> 2), inb(apm_xbase + 2))) {
|
||||
/*
|
||||
* TODO Not PCI
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
wrinx(0x3C4, 0x10, save);
|
||||
|
||||
return apmChip;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
ApmAssignFPtr(ScrnInfoPtr pScrn)
|
||||
{
|
||||
@ -357,28 +299,6 @@ ApmProbe(DriverPtr drv, int flags)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAVE_ISA
|
||||
/* Check for non-PCI cards */
|
||||
numUsed = xf86MatchIsaInstances(APM_NAME, ApmChipsets,
|
||||
ApmIsaChipsets, drv, ApmFindIsaDevice, DevSections,
|
||||
numDevSections, &usedChips);
|
||||
if (numUsed > 0) {
|
||||
if (flags & PROBE_DETECT)
|
||||
foundScreen = TRUE;
|
||||
else for (i = 0; i < numUsed; i++) {
|
||||
ScrnInfoPtr pScrn = NULL;
|
||||
if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, usedChips[i],
|
||||
ApmIsaChipsets, NULL, NULL, NULL,
|
||||
NULL, NULL))) {
|
||||
/*
|
||||
* Fill in what we can of the ScrnInfoRec
|
||||
*/
|
||||
ApmAssignFPtr(pScrn);
|
||||
foundScreen = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
xfree(DevSections);
|
||||
return foundScreen;
|
||||
@ -1072,18 +992,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
|
||||
/* Load bpp-specific modules */
|
||||
switch (pScrn->bitsPerPixel) {
|
||||
#ifdef HAVE_XF1BPP
|
||||
case 1:
|
||||
mod = "xf1bpp";
|
||||
req = "xf1bppScreenInit";
|
||||
break;
|
||||
#endif
|
||||
#ifdef HAVE_XF4BPP
|
||||
case 4:
|
||||
mod = "xf4bpp";
|
||||
req = "xf4bppScreenInit";
|
||||
break;
|
||||
#endif
|
||||
case 8:
|
||||
case 16:
|
||||
case 24:
|
||||
@ -1899,22 +1807,6 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
|
||||
miSetPixmapDepths();
|
||||
|
||||
switch (pScrn->bitsPerPixel) {
|
||||
#ifdef HAVE_XF1BPP
|
||||
case 1:
|
||||
ret = xf1bppScreenInit(pScreen, FbBase,
|
||||
pScrn->virtualX, pScrn->virtualY,
|
||||
pScrn->xDpi, pScrn->yDpi,
|
||||
pScrn->displayWidth);
|
||||
break;
|
||||
#endif
|
||||
#ifdef HAVE_XF4BPP
|
||||
case 4:
|
||||
ret = xf4bppScreenInit(pScreen, FbBase,
|
||||
pScrn->virtualX, pScrn->virtualY,
|
||||
pScrn->xDpi, pScrn->yDpi,
|
||||
pScrn->displayWidth);
|
||||
break;
|
||||
#endif
|
||||
case 8:
|
||||
case 16:
|
||||
case 24:
|
||||
|
||||
@ -1,733 +0,0 @@
|
||||
/*
|
||||
* Copyright Loïc Grenié 1999
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "apm.h"
|
||||
#include "xaalocal.h"
|
||||
|
||||
extern DriverRec APM;
|
||||
|
||||
static Bool RushDestroyPixmap(PixmapPtr);
|
||||
static __inline__ void __xf86UnlockPixmap(ApmPtr, PixmapLinkPtr);
|
||||
static int xf86RushLockPixmap(int, PixmapPtr);
|
||||
static void xf86RushUnlockPixmap(int, PixmapPtr);
|
||||
static void xf86RushUnlockAllPixmaps(void);
|
||||
|
||||
static Bool RushDestroyPixmap(PixmapPtr pPix)
|
||||
{
|
||||
APMDECL(xf86Screens[pPix->drawable.pScreen->myNum]);
|
||||
ApmPixmapPtr pPriv = APM_GET_PIXMAP_PRIVATE(pPix);
|
||||
|
||||
if (pPriv->num)
|
||||
pApm->RushY[pPriv->num - 1] = 0;
|
||||
return (*pApm->DestroyPixmap)(pPix);
|
||||
}
|
||||
|
||||
static PixmapPtr RushCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
||||
{
|
||||
APMDECL(xf86Screens[pScreen->myNum]);
|
||||
PixmapPtr pPix = (*pApm->CreatePixmap)(pScreen, w, h, depth);
|
||||
ApmPixmapPtr pPriv = APM_GET_PIXMAP_PRIVATE(pPix);
|
||||
|
||||
bzero(pPriv, sizeof(*pPriv));
|
||||
return pPix;
|
||||
}
|
||||
|
||||
static int
|
||||
xf86RushLockPixmap(int scrnIndex, PixmapPtr pix)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
|
||||
APMDECL(pScrn);
|
||||
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
|
||||
ApmPixmapPtr pApmPriv = APM_GET_PIXMAP_PRIVATE(pix);
|
||||
XAAPixmapPtr pXAAPriv = XAA_GET_PIXMAP_PRIVATE(pix);
|
||||
FBAreaPtr area = pXAAPriv->offscreenArea;
|
||||
int p2, width = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
|
||||
|
||||
if (pScrn->drv != &APM || pApm->Chipset != AT3D)
|
||||
return 0;
|
||||
pApm->apmLock = TRUE;
|
||||
pApmPriv->num = 0;
|
||||
if (area && pApm->pixelStride) {
|
||||
if (area->RemoveAreaCallback) {
|
||||
(*area->RemoveAreaCallback)(area);
|
||||
xf86FreeOffscreenArea(area);
|
||||
area = NULL;
|
||||
}
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
if (area) {
|
||||
/*
|
||||
* 1) Make it unmovable so that XAA won't know we're playing
|
||||
* with the cache.
|
||||
* 2) Play musical chairs if needed.
|
||||
*/
|
||||
pApmPriv->MoveAreaCallback = area->MoveAreaCallback;
|
||||
area->MoveAreaCallback = NULL;
|
||||
pApmPriv->RemoveAreaCallback = area->RemoveAreaCallback;
|
||||
area->RemoveAreaCallback = NULL;
|
||||
pApmPriv->devPriv = area->devPrivate.ptr;
|
||||
}
|
||||
else {
|
||||
pApmPriv->MoveAreaCallback = NULL;
|
||||
pApmPriv->RemoveAreaCallback = NULL;
|
||||
pApmPriv->devPriv = NULL;
|
||||
}
|
||||
if (pApm->pixelStride || !area ||
|
||||
(((pix->drawable.x + pScrn->displayWidth * pix->drawable.y) *
|
||||
pScrn->bitsPerPixel) & 32767)) {
|
||||
int p1, i;
|
||||
|
||||
/*
|
||||
* Not aligned on a 4KB boundary, need to move it around.
|
||||
*/
|
||||
if (area)
|
||||
xf86FreeOffscreenArea(area);
|
||||
if (pApm->pixelStride) {
|
||||
area = xf86AllocateLinearOffscreenArea(pScrn->pScreen,
|
||||
((pix->drawable.width * pix->drawable.height *
|
||||
pix->drawable.depth) / pScrn->bitsPerPixel) +
|
||||
4095,
|
||||
pScrn->displayWidth, NULL, NULL, NULL);
|
||||
if (!area) {
|
||||
xf86PurgeUnlockedOffscreenAreas(pScrn->pScreen);
|
||||
area = xf86AllocateLinearOffscreenArea(pScrn->pScreen,
|
||||
((pix->drawable.width * pix->drawable.height *
|
||||
pix->drawable.depth) / pScrn->bitsPerPixel) +
|
||||
4095,
|
||||
pScrn->displayWidth, NULL, NULL, NULL);
|
||||
}
|
||||
if (area) {
|
||||
if (!pApmPriv->devPriv) {
|
||||
PixmapLinkPtr pLink;
|
||||
ScreenPtr pScreen = pScrn->pScreen;
|
||||
PixmapPtr pScreenPix;
|
||||
|
||||
pLink = xalloc(sizeof(PixmapLink));
|
||||
if (!pLink) {
|
||||
xf86FreeOffscreenArea(area);
|
||||
return 0;
|
||||
}
|
||||
pXAAPriv->flags |= OFFSCREEN;
|
||||
pix->devKind = pApm->pixelStride;
|
||||
pScreenPix = (*pScreen->GetScreenPixmap)(pScreen);
|
||||
pix->devPrivate.ptr = pScreenPix->devPrivate.ptr;
|
||||
pLink->next = infoRec->OffscreenPixmaps;
|
||||
pLink->pPix = pix;
|
||||
infoRec->OffscreenPixmaps = pLink;
|
||||
}
|
||||
for (i = 0; i < 7; i++)
|
||||
if (!pApm->RushY[i])
|
||||
break;
|
||||
pApmPriv->num = i + 1;
|
||||
pix->drawable.y = area->box.y1 + (i+1)*pApm->CurrentLayout.Scanlines;
|
||||
pApm->RushY[i] = area->box.y1;
|
||||
pix->drawable.x = (32768 - (((area->box.x1 + pScrn->displayWidth * area->box.y1) * pScrn->bitsPerPixel) & 32767)) / pApm->CurrentLayout.bitsPerPixel;
|
||||
if (pix->drawable.x == 32768 / pApm->CurrentLayout.bitsPerPixel)
|
||||
pix->drawable.x = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
p2 = 1;
|
||||
while (!(p2 & width))
|
||||
p2 *= 2;
|
||||
p1 = 4096 / p2 - 1;
|
||||
switch(pScrn->bitsPerPixel) {
|
||||
case 16:
|
||||
p2 /= 2;
|
||||
break;
|
||||
case 32:
|
||||
p2 /= 4;
|
||||
break;
|
||||
}
|
||||
area = xf86AllocateOffscreenArea(pScrn->pScreen,
|
||||
(pix->drawable.width * pix->drawable.bitsPerPixel) /
|
||||
pScrn->bitsPerPixel,
|
||||
pix->drawable.height + p1,
|
||||
p2, NULL, NULL, pApmPriv->devPriv);
|
||||
if (!area) {
|
||||
xf86PurgeUnlockedOffscreenAreas(pScrn->pScreen);
|
||||
area = xf86AllocateOffscreenArea(pScrn->pScreen,
|
||||
(pix->drawable.width * pix->drawable.bitsPerPixel) /
|
||||
pScrn->bitsPerPixel,
|
||||
pix->drawable.height + p1,
|
||||
p2, NULL, NULL, pApmPriv->devPriv);
|
||||
}
|
||||
if (area) {
|
||||
int devKind = (pScrn->bitsPerPixel * pScrn->displayWidth) / 8;
|
||||
int off = devKind * p1, h;
|
||||
int goal = (-area->box.x1 * (pScrn->bitsPerPixel >> 3) - area->box.y1 * devKind) & 4095;
|
||||
|
||||
if (!pApmPriv->devPriv) {
|
||||
PixmapLinkPtr pLink;
|
||||
ScreenPtr pScreen = pScrn->pScreen;
|
||||
PixmapPtr pScreenPix;
|
||||
|
||||
pLink = xalloc(sizeof(PixmapLink));
|
||||
if (!pLink) {
|
||||
xf86FreeOffscreenArea(area);
|
||||
return 0;
|
||||
}
|
||||
pXAAPriv->flags |= OFFSCREEN;
|
||||
pix->devKind = pApm->CurrentLayout.bytesPerScanline;
|
||||
pScreenPix = (*pScreen->GetScreenPixmap)(pScreen);
|
||||
pix->devPrivate.ptr = pScreenPix->devPrivate.ptr;
|
||||
pLink->next = infoRec->OffscreenPixmaps;
|
||||
pLink->pPix = pix;
|
||||
infoRec->OffscreenPixmaps = pLink;
|
||||
}
|
||||
pix->drawable.x = area->box.x1;
|
||||
for (h = p1; h >= 0; h--, off -= devKind)
|
||||
if ((off & 4095) == goal)
|
||||
break;
|
||||
for (i = 0; i < 7; i++)
|
||||
if (!pApm->RushY[i])
|
||||
break;
|
||||
pApmPriv->num = i + 1;
|
||||
pix->drawable.y = area->box.y1 + h + (i+1)*pApm->CurrentLayout.Scanlines;
|
||||
pApm->RushY[i] = area->box.y1 + h;
|
||||
}
|
||||
}
|
||||
if (!area && (pXAAPriv->flags & OFFSCREEN)) {
|
||||
/*
|
||||
* Failed, return the old one
|
||||
*/
|
||||
switch(pScrn->bitsPerPixel) {
|
||||
case 24:
|
||||
case 8: p2 = 4; break;
|
||||
case 16: p2 = 2; break;
|
||||
case 32: p2 = 1; break;
|
||||
default: p2 = 0; break;
|
||||
}
|
||||
pXAAPriv->offscreenArea =
|
||||
area = xf86AllocateOffscreenArea(pScrn->pScreen,
|
||||
pix->drawable.width, pix->drawable.height,
|
||||
p2,
|
||||
pApmPriv->MoveAreaCallback,
|
||||
pApmPriv->RemoveAreaCallback,
|
||||
pApmPriv->devPriv);
|
||||
/* The allocate can not fail: we just removed the old one. */
|
||||
pix->drawable.x = area->box.x1;
|
||||
pix->drawable.y = area->box.y1;
|
||||
}
|
||||
if (!area)
|
||||
return 0;
|
||||
pXAAPriv->offscreenArea = area;
|
||||
}
|
||||
return pApm->LinAddress +
|
||||
((pix->drawable.x + pScrn->displayWidth *
|
||||
(pix->drawable.y % pApm->CurrentLayout.Scanlines)) * pApm->CurrentLayout.bitsPerPixel) / 8;
|
||||
}
|
||||
|
||||
static __inline__ void
|
||||
__xf86UnlockPixmap(ApmPtr pApm, PixmapLinkPtr pLink)
|
||||
{
|
||||
PixmapPtr pix = pLink->pPix;
|
||||
ApmPixmapPtr pApmPriv = APM_GET_PIXMAP_PRIVATE(pix);
|
||||
XAAPixmapPtr pXAAPriv = XAA_GET_PIXMAP_PRIVATE(pix);
|
||||
FBAreaPtr area = pXAAPriv->offscreenArea;
|
||||
int i;
|
||||
|
||||
if (!area)
|
||||
area = pLink->area;
|
||||
if ((pXAAPriv->flags & OFFSCREEN) && !area->MoveAreaCallback && !area->RemoveAreaCallback) {
|
||||
area->MoveAreaCallback = pApmPriv->MoveAreaCallback;
|
||||
area->RemoveAreaCallback = pApmPriv->RemoveAreaCallback;
|
||||
area->devPrivate.ptr = pApmPriv->devPriv;
|
||||
}
|
||||
i = pApmPriv->num;
|
||||
if (i) {
|
||||
pApm->RushY[i - 1] = 0;
|
||||
pix->drawable.y %= pApm->CurrentLayout.Scanlines;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
xf86RushUnlockPixmap(int scrnIndex, PixmapPtr pix)
|
||||
{
|
||||
APMDECL(xf86Screens[scrnIndex]);
|
||||
PixmapLinkPtr pLink = GET_XAAINFORECPTR_FROM_SCREEN(xf86Screens[scrnIndex]->pScreen)->OffscreenPixmaps;
|
||||
|
||||
if (xf86Screens[scrnIndex]->drv != &APM || pApm->Chipset != AT3D)
|
||||
return;
|
||||
if (pApm->apmLock) {
|
||||
/*
|
||||
* This is just an attempt, because Daryll is tampering with MY
|
||||
* registers.
|
||||
*/
|
||||
if (!pApm->noLinear) {
|
||||
CARD8 db;
|
||||
|
||||
db = RDXB(0xDB);
|
||||
WRXB(0xDB, (db & 0xF4) | 0x0A);
|
||||
ApmWriteSeq(0x1B, 0x20);
|
||||
ApmWriteSeq(0x1C, 0x2F);
|
||||
}
|
||||
else {
|
||||
CARD8 db;
|
||||
|
||||
db = RDXB_IOP(0xDB);
|
||||
WRXB_IOP(0xDB, (db & 0xF4) | 0x0A);
|
||||
wrinx(pApm->xport, 0x1B, 0x20);
|
||||
wrinx(pApm->xport, 0x1C, 0x2F);
|
||||
}
|
||||
pApm->apmLock = FALSE;
|
||||
}
|
||||
while (pLink && pLink->pPix != pix)
|
||||
pLink = pLink->next;
|
||||
if (pLink)
|
||||
__xf86UnlockPixmap(pApm, pLink);
|
||||
}
|
||||
|
||||
static void
|
||||
xf86RushUnlockAllPixmaps()
|
||||
{
|
||||
int scrnIndex;
|
||||
|
||||
for (scrnIndex = 0; scrnIndex < screenInfo.numScreens; scrnIndex++) {
|
||||
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
|
||||
APMDECL(pScrn);
|
||||
PixmapLinkPtr pLink = GET_XAAINFORECPTR_FROM_SCREEN(pScrn->pScreen)->OffscreenPixmaps;
|
||||
|
||||
if (pScrn->drv != &APM || pApm->Chipset != AT3D)
|
||||
continue;
|
||||
while(pLink) {
|
||||
__xf86UnlockPixmap(pApm, pLink);
|
||||
pLink = pLink->next;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Copyright (c) 1998 Daryll Strauss
|
||||
|
||||
*/
|
||||
|
||||
#define NEED_REPLIES
|
||||
#define NEED_EVENTS
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include "misc.h"
|
||||
#include "dixstruct.h"
|
||||
#include "extnsionst.h"
|
||||
#include "scrnintstr.h"
|
||||
#define _XF86RUSH_SERVER_
|
||||
#include <X11/extensions/xf86rushstr.h>
|
||||
|
||||
static unsigned char RushReqCode = 0;
|
||||
static int RushErrorBase;
|
||||
|
||||
static DISPATCH_PROC(ProcXF86RushDispatch);
|
||||
static DISPATCH_PROC(ProcXF86RushQueryVersion);
|
||||
static DISPATCH_PROC(ProcXF86RushLockPixmap);
|
||||
static DISPATCH_PROC(ProcXF86RushUnlockPixmap);
|
||||
static DISPATCH_PROC(ProcXF86RushUnlockAllPixmaps);
|
||||
static DISPATCH_PROC(ProcXF86RushSetCopyMode);
|
||||
#if 0
|
||||
static DISPATCH_PROC(ProcXF86RushSetPixelStride);
|
||||
#endif
|
||||
static DISPATCH_PROC(ProcXF86RushOverlayPixmap);
|
||||
static DISPATCH_PROC(ProcXF86RushStatusRegOffset);
|
||||
static DISPATCH_PROC(ProcXF86RushAT3DEnableRegs);
|
||||
static DISPATCH_PROC(ProcXF86RushAT3DDisableRegs);
|
||||
|
||||
static int rush_ext_generation = -1;
|
||||
|
||||
static DISPATCH_PROC(SProcXF86RushDispatch);
|
||||
|
||||
static void XF86RushResetProc(ExtensionEntry* extEntry);
|
||||
|
||||
void
|
||||
XFree86RushExtensionInit(ScreenPtr pScreen)
|
||||
{
|
||||
ExtensionEntry* extEntry;
|
||||
|
||||
#ifdef PANORAMIX
|
||||
if (!noPanoramiXExtension)
|
||||
return;
|
||||
#endif
|
||||
if (rush_ext_generation == serverGeneration) {
|
||||
if (xf86Screens[pScreen->myNum]->drv == &APM &&
|
||||
APMPTR(xf86Screens[pScreen->myNum])->Chipset == AT3D) {
|
||||
pScreen->CreatePixmap = RushCreatePixmap;
|
||||
pScreen->DestroyPixmap = RushDestroyPixmap;
|
||||
}
|
||||
return;
|
||||
}
|
||||
rush_ext_generation = serverGeneration;
|
||||
if ((extEntry = AddExtension(XF86RUSHNAME,
|
||||
XF86RushNumberEvents,
|
||||
XF86RushNumberErrors,
|
||||
ProcXF86RushDispatch,
|
||||
SProcXF86RushDispatch,
|
||||
XF86RushResetProc,
|
||||
StandardMinorOpcode))) {
|
||||
RushReqCode = (unsigned char)extEntry->base;
|
||||
RushErrorBase = extEntry->errorBase;
|
||||
if (xf86Screens[pScreen->myNum]->drv == &APM &&
|
||||
APMPTR(xf86Screens[pScreen->myNum])->Chipset == AT3D) {
|
||||
pScreen->CreatePixmap = RushCreatePixmap;
|
||||
pScreen->DestroyPixmap = RushDestroyPixmap;
|
||||
}
|
||||
}
|
||||
else {
|
||||
pScreen->CreatePixmap = APMPTR(xf86Screens[pScreen->myNum])->CreatePixmap;
|
||||
pScreen->DestroyPixmap = APMPTR(xf86Screens[pScreen->myNum])->DestroyPixmap;
|
||||
}
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
XF86RushResetProc (ExtensionEntry *extEntry)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushQueryVersion(register ClientPtr client)
|
||||
{
|
||||
xXF86RushQueryVersionReply rep;
|
||||
register int n;
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushQueryVersionReq);
|
||||
rep.type = X_Reply;
|
||||
rep.length = 0;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
rep.majorVersion = XF86RUSH_MAJOR_VERSION;
|
||||
rep.minorVersion = XF86RUSH_MINOR_VERSION;
|
||||
if (client->swapped) {
|
||||
swaps(&rep.sequenceNumber, n);
|
||||
swapl(&rep.length, n);
|
||||
}
|
||||
WriteToClient(client, sz_xXF86RushQueryVersionReply, (char *)&rep);
|
||||
return (client->noClientException);
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushLockPixmap(register ClientPtr client)
|
||||
{
|
||||
REQUEST(xXF86RushLockPixmapReq);
|
||||
xXF86RushLockPixmapReply rep;
|
||||
PixmapPtr pix;
|
||||
|
||||
if (stuff->screen > screenInfo.numScreens)
|
||||
return BadValue;
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushLockPixmapReq);
|
||||
rep.type = X_Reply;
|
||||
rep.length = 0;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
pix = (PixmapPtr)SecurityLookupIDByType(client,
|
||||
stuff->pixmap, RT_PIXMAP,
|
||||
DixReadAccess);
|
||||
rep.addr = xf86RushLockPixmap(stuff->screen, pix);
|
||||
|
||||
WriteToClient(client, SIZEOF(xXF86RushLockPixmapReply), (char*)&rep);
|
||||
return client->noClientException;
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushUnlockPixmap(register ClientPtr client)
|
||||
{
|
||||
REQUEST(xXF86RushUnlockPixmapReq);
|
||||
PixmapPtr pix;
|
||||
|
||||
if (stuff->screen > screenInfo.numScreens)
|
||||
return BadValue;
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushUnlockPixmapReq);
|
||||
pix = (PixmapPtr)SecurityLookupIDByType(client,
|
||||
stuff->pixmap, RT_PIXMAP,
|
||||
DixReadAccess);
|
||||
xf86RushUnlockPixmap(stuff->screen, pix);
|
||||
return client->noClientException;
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushUnlockAllPixmaps(register ClientPtr client)
|
||||
{
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushUnlockAllPixmapsReq);
|
||||
xf86RushUnlockAllPixmaps();
|
||||
return client->noClientException;
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushSetCopyMode(register ClientPtr client)
|
||||
{
|
||||
REQUEST(xXF86RushSetCopyModeReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushSetCopyModeReq);
|
||||
APMPTR(xf86Screens[stuff->screen])->CopyMode = stuff->CopyMode;
|
||||
return client->noClientException;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int
|
||||
ProcXF86RushSetPixelStride(register ClientPtr client)
|
||||
{
|
||||
REQUEST(xXF86RushSetPixelStrideReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushSetPixelStrideReq);
|
||||
APMPTR(xf86Screens[stuff->screen])->pixelStride = stuff->PixelStride;
|
||||
return client->noClientException;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
ProcXF86RushDispatch (register ClientPtr client)
|
||||
{
|
||||
REQUEST(xReq);
|
||||
|
||||
if (!LocalClient(client))
|
||||
return RushErrorBase + XF86RushClientNotLocal;
|
||||
|
||||
switch (stuff->data)
|
||||
{
|
||||
case X_XF86RushQueryVersion:
|
||||
return ProcXF86RushQueryVersion(client);
|
||||
case X_XF86RushLockPixmap:
|
||||
return ProcXF86RushLockPixmap(client);
|
||||
case X_XF86RushUnlockPixmap:
|
||||
return ProcXF86RushUnlockPixmap(client);
|
||||
case X_XF86RushUnlockAllPixmaps:
|
||||
return ProcXF86RushUnlockAllPixmaps(client);
|
||||
case X_XF86RushSetCopyMode:
|
||||
return ProcXF86RushSetCopyMode(client);
|
||||
#if 0
|
||||
case X_XF86RushSetPixelStride:
|
||||
return ProcXF86RushSetPixelStride(client);
|
||||
#endif
|
||||
case X_XF86RushOverlayPixmap:
|
||||
return ProcXF86RushOverlayPixmap(client);
|
||||
case X_XF86RushStatusRegOffset:
|
||||
return ProcXF86RushStatusRegOffset(client);
|
||||
case X_XF86RushAT3DEnableRegs:
|
||||
return ProcXF86RushAT3DEnableRegs(client);
|
||||
case X_XF86RushAT3DDisableRegs:
|
||||
return ProcXF86RushAT3DDisableRegs(client);
|
||||
default:
|
||||
return BadRequest;
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
SProcXF86RushDispatch (register ClientPtr client)
|
||||
{
|
||||
return RushErrorBase + XF86RushClientNotLocal;
|
||||
}
|
||||
|
||||
#include "xvdix.h"
|
||||
/*
|
||||
* The one below is just a subtle modification of ProcXvShmPutImage
|
||||
*/
|
||||
|
||||
static int
|
||||
ProcXF86RushOverlayPixmap(ClientPtr client)
|
||||
{
|
||||
DrawablePtr pDraw;
|
||||
ScrnInfoPtr pScrn;
|
||||
PixmapPtr pPixmap;
|
||||
XvPortPtr pPort;
|
||||
XvImagePtr pImage = NULL;
|
||||
GCPtr pGC;
|
||||
int status, i;
|
||||
unsigned char *offset;
|
||||
ApmPtr pApm;
|
||||
ApmPixmapPtr pPriv;
|
||||
REQUEST(xXF86RushOverlayPixmapReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushOverlayPixmapReq);
|
||||
|
||||
VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
|
||||
|
||||
pScrn = xf86Screens[pDraw->pScreen->myNum];
|
||||
pApm = APMPTR(pScrn);
|
||||
if (pScrn->drv != &APM || pApm->Chipset != AT3D)
|
||||
return (_XvBadPort);
|
||||
|
||||
if(!(pPort = LOOKUP_PORT(stuff->port, client) )) {
|
||||
client->errorValue = stuff->port;
|
||||
return (_XvBadPort);
|
||||
}
|
||||
|
||||
if (pPort->id != stuff->port) {
|
||||
if ((status = (*pPort->pAdaptor->ddAllocatePort)(stuff->port, pPort, &pPort)) != Success) {
|
||||
client->errorValue = stuff->port;
|
||||
return (status);
|
||||
}
|
||||
}
|
||||
|
||||
if (!(pPort->pAdaptor->type & XvImageMask) ||
|
||||
!(pPort->pAdaptor->type & XvInputMask)) {
|
||||
client->errorValue = stuff->port;
|
||||
return (BadMatch);
|
||||
}
|
||||
|
||||
status = XvdiMatchPort(pPort, pDraw);
|
||||
if (status != Success)
|
||||
return status;
|
||||
|
||||
pPixmap = (PixmapPtr)SecurityLookupIDByType(client,
|
||||
stuff->pixmap, RT_PIXMAP,
|
||||
DixReadAccess);
|
||||
if (!pPixmap) {
|
||||
client->errorValue = stuff->pixmap;
|
||||
return (BadPixmap);
|
||||
}
|
||||
status = XvdiMatchPort(pPort, (DrawablePtr)pPixmap);
|
||||
if (status != Success)
|
||||
return status;
|
||||
pPriv = APM_GET_PIXMAP_PRIVATE(pPixmap);
|
||||
pApm = APMPTR(pScrn);
|
||||
if (pPriv->num == 0) {
|
||||
client->errorValue = stuff->pixmap;
|
||||
return (BadMatch);
|
||||
}
|
||||
offset = (unsigned char *)pApm->FbBase +
|
||||
pApm->RushY[pPriv->num - 1] * pApm->CurrentLayout.bytesPerScanline +
|
||||
pPixmap->drawable.x * pScrn->bitsPerPixel / 8;
|
||||
|
||||
for(i = 0; i < pPort->pAdaptor->nImages; i++) {
|
||||
if(pPort->pAdaptor->pImages[i].id == stuff->id) {
|
||||
pImage = &(pPort->pAdaptor->pImages[i]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(!pImage)
|
||||
return BadMatch;
|
||||
|
||||
pApm->PutImageStride = pPixmap->devKind;
|
||||
status = XvdiPutImage(client, pDraw, pPort, pGC,
|
||||
stuff->src_x, stuff->src_y,
|
||||
stuff->src_w, stuff->src_h,
|
||||
stuff->drw_x, stuff->drw_y,
|
||||
stuff->drw_w, stuff->drw_h,
|
||||
pImage, offset, TRUE,
|
||||
pPixmap->drawable.width,
|
||||
pPixmap->drawable.height);
|
||||
pApm->PutImageStride = 0;
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushStatusRegOffset(ClientPtr client)
|
||||
{
|
||||
int scrnIndex;
|
||||
ScrnInfoPtr pScrn;
|
||||
ApmPtr pApm;
|
||||
REQUEST(xXF86RushStatusRegOffsetReq);
|
||||
xXF86RushStatusRegOffsetReply rep;
|
||||
register int n;
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushStatusRegOffsetReq);
|
||||
scrnIndex = stuff->screen;
|
||||
if (scrnIndex < 0 || scrnIndex > screenInfo.numScreens)
|
||||
return BadValue;
|
||||
pScrn = xf86Screens[scrnIndex];
|
||||
pApm = APMPTR(pScrn);
|
||||
if (pScrn->drv != &APM || pApm->Chipset != AT3D)
|
||||
return BadMatch;
|
||||
rep.type = X_Reply;
|
||||
rep.length = 0;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
rep.offset = 0xFFEDF4;
|
||||
if (client->swapped) {
|
||||
swapl(&rep.offset, n);
|
||||
}
|
||||
WriteToClient(client, sz_xXF86RushStatusRegOffsetReply, (char *)&rep);
|
||||
|
||||
return client->noClientException;
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushAT3DEnableRegs(ClientPtr client)
|
||||
{
|
||||
u32 db, tmp;
|
||||
int scrnIndex;
|
||||
ScrnInfoPtr pScrn;
|
||||
ApmPtr pApm;
|
||||
REQUEST(xXF86RushAT3DEnableRegsReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushAT3DEnableRegsReq);
|
||||
scrnIndex = stuff->screen;
|
||||
if (scrnIndex < 0 || scrnIndex > screenInfo.numScreens)
|
||||
return BadValue;
|
||||
pScrn = xf86Screens[scrnIndex];
|
||||
pApm = APMPTR(pScrn);
|
||||
if (pScrn->drv != &APM || pApm->Chipset != AT3D)
|
||||
return BadMatch;
|
||||
pApm->Rush = 0x04;
|
||||
if (!pApm->noLinear) {
|
||||
db = RDXL(0xDB);
|
||||
WRXL(0xDB, db | 0x04);
|
||||
WRXB(0x110, 0x03);
|
||||
tmp = RDXB(0x1F0);
|
||||
WRXB(0x1F0, tmp | 0xD0);
|
||||
tmp = RDXB(0x1F1);
|
||||
WRXB(0x1F1, (tmp & ~0xC0) | 0x10);
|
||||
tmp = RDXB(0x1F2);
|
||||
WRXB(0x1F2, tmp | 0x10);
|
||||
}
|
||||
else {
|
||||
db = RDXL(0xDB);
|
||||
WRXL_IOP(0xDB, db | 0x04);
|
||||
WRXB_IOP(0x110, 0x03);
|
||||
tmp = RDXB_IOP(0x1F0);
|
||||
WRXB_IOP(0x1F0, tmp | 0xD0);
|
||||
tmp = RDXB_IOP(0x1F1);
|
||||
WRXB_IOP(0x1F1, (tmp & ~0xC0) | 0x10);
|
||||
tmp = RDXB_IOP(0x1F2);
|
||||
WRXB_IOP(0x1F2, tmp | 0x10);
|
||||
}
|
||||
|
||||
return client->noClientException;
|
||||
}
|
||||
|
||||
static int
|
||||
ProcXF86RushAT3DDisableRegs(ClientPtr client)
|
||||
{
|
||||
u32 db, tmp;
|
||||
int scrnIndex;
|
||||
ScrnInfoPtr pScrn;
|
||||
ApmPtr pApm;
|
||||
REQUEST(xXF86RushAT3DDisableRegsReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXF86RushAT3DDisableRegsReq);
|
||||
scrnIndex = stuff->screen;
|
||||
if (scrnIndex < 0 || scrnIndex > screenInfo.numScreens)
|
||||
return BadValue;
|
||||
pScrn = xf86Screens[scrnIndex];
|
||||
pApm = APMPTR(pScrn);
|
||||
if (pScrn->drv != &APM || pApm->Chipset != AT3D)
|
||||
return BadMatch;
|
||||
if (!pApm->noLinear) {
|
||||
tmp = RDXB(0x1F2);
|
||||
WRXB(0x1F2, tmp & ~0x10);
|
||||
tmp = RDXB(0x1F0);
|
||||
WRXB(0x1F0, tmp & ~0xD0);
|
||||
WRXB(0x110, 0);
|
||||
pApm->Rush = 0x00;
|
||||
db = RDXL(0xDB);
|
||||
WRXL(0xDB, db & ~0x04);
|
||||
}
|
||||
else {
|
||||
tmp = RDXB_IOP(0x1F2);
|
||||
WRXB_IOP(0x1F2, tmp & ~0x10);
|
||||
tmp = RDXB_IOP(0x1F0);
|
||||
WRXB_IOP(0x1F0, tmp & ~0xD0);
|
||||
WRXB_IOP(0x110, 0);
|
||||
pApm->Rush = 0x00;
|
||||
db = RDXL_IOP(0xDB);
|
||||
WRXL_IOP(0xDB, db & ~0x04);
|
||||
}
|
||||
|
||||
return client->noClientException;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user