.gitignore | 1
ChangeLog | 426 ++++++++++++++++++++
Makefile.in | 4
config.sub | 14
configure | 278 +++++++++++--
configure.ac | 14
debian/changelog | 37 +
debian/control | 13
debian/copyright | 3
debian/rules | 2
debian/xsfbs/xsfbs.mk | 36 +
debian/xsfbs/xsfbs.sh | 7
man/Makefile.in | 4
mga_PInS.txt | 28 +
src/Makefile.in | 4
src/clientlx.c | 16
src/mga.h | 90 ++++
src/mga_bios.c | 15
src/mga_dac3026.c | 10
src/mga_dacG.c | 63 ++
src/mga_dri.c | 293 +++++++++++--
src/mga_driver.c | 1053 ++++++++++++++++++++++++++++++++------------------
src/mga_exa.c | 133 +++++-
src/mga_macros.h | 20
src/mga_map.h | 17
src/mga_merge.c | 6
src/mga_storm.c | 215 ----------
src/mga_vga.c | 211 ++++++++--
src/mga_video.c | 780 ++++++++++++++++++++++++++++++++++++-
util/Makefile.in | 4
util/stormdwg.c | 10
31 files changed, 2988 insertions(+), 819 deletions(-)
New commits:
commit 0300837df54070c918c85b0174475c449a607aee
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Thu Sep 13 08:30:57 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8786ca1..f041eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xserver-xorg-video-mga (1:1.4.7.dfsg.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-mga (1:1.4.7.dfsg.1-1) experimental; urgency=low
* New upstream release.
+ Increase the minimal frequency on G550 so that 320x240 works,
closes: #430112.
* Build against xserver 1.4.
* Add upstream URL to debian/copyright.
+ * Add myself to Uploaders, add remove Branden with his permission.
- -- Brice Goglin <[EMAIL PROTECTED]> Thu, 13 Sep 2007 08:19:27 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Thu, 13 Sep 2007 08:30:08 +0200
xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f8c0345..a22435b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-mga
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4),
x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev,
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev,
x11proto-xext-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
commit 887df3e24a14d0df7df1f487ca47fd9929dcf806
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Thu Sep 13 08:20:35 2007 +0200
Build against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index 9c245ab..8786ca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-mga (1:1.4.7.dfsg.1-1) UNRELEASED;
urgency=low
* New upstream release.
+ Increase the minimal frequency on G550 so that 320x240 works,
closes: #430112.
+ * Build against xserver 1.4.
* Add upstream URL to debian/copyright.
-- Brice Goglin <[EMAIL PROTECTED]> Thu, 13 Sep 2007 08:19:27 +0200
diff --git a/debian/control b/debian/control
index cab76df..f8c0345 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev |
libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev,
x11proto-render-dev, x11proto-xext-dev, libdrm-dev (>> 2.0) [!hurd-i386],
x11proto-xf86dri-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4),
x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev,
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev,
x11proto-xext-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mga.git
commit 91477f0c0e7eb005899bd09dd5a5cf0e27b83ac3
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Thu Sep 13 08:20:09 2007 +0200
Add upstream URL to debian/copyright
diff --git a/debian/changelog b/debian/changelog
index 050e9f2..9c245ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-video-mga (1:1.4.7.dfsg.1-1) UNRELEASED;
urgency=low
* New upstream release.
+ Increase the minimal frequency on G550 so that 320x240 works,
closes: #430112.
+ * Add upstream URL to debian/copyright.
- -- Brice Goglin <[EMAIL PROTECTED]> Thu, 13 Sep 2007 08:11:40 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Thu, 13 Sep 2007 08:19:27 +0200
xserver-xorg-video-mga (1:1.4.6.1.dfsg.1-3) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 55a9524..41b7da5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
commit 3a2234f7080c9e3e0eb9365498836b41bd302017
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Thu Sep 13 08:17:09 2007 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 5948747..dd4c6d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,210 @@
+commit d7f0f657504b2646a94f652baf0f71ff4117fac4
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed Sep 5 18:06:57 2007 +0200
+
+ Bumped version to 1.4.7.
+
+commit 6fde3fd6d34e7252ee16422b19896d71b1622039
+Merge: 4bfc1e1... 923176f...
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Mon Sep 3 06:07:32 2007 -0400
+
+ Merge branch 'master' of
ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga
+
+commit 4bfc1e1ea11604e3af150a4228663cb1cb1bf9f3
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Mon Sep 3 05:52:35 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 923176f5aad777b4023003a457bb77da21373389
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Fri Aug 31 11:05:57 2007 -0700
+
+ Use XSERVER_LIBPCIACCESS to detect pci-rework.
+
+commit 90beb8c27b4206b593898d346bf37ab49e75b975
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Wed Aug 22 11:19:46 2007 -0700
+
+ Set pScrn to NULL before calling xf86ConfigPciEntity.
+
+ Why is the interface to xf86ConfigPciEntity so filled with hate?
+
+commit 55d219394ad6af8e25ff604bcbb49d5a551bd348
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Wed Aug 22 10:43:39 2007 -0700
+
+ Merge PCI-rework support and "classic" PCI interface support into one tree
+
+ First pass at merging both trees. So far, this has only been tested
+ on the PCI-rework build on a PCI G450.
+
+commit f4ef39d53d5a67942707507814fef4ad466dc909
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Aug 20 15:36:57 2007 -0700
+
+ Fix compile error introduced by merge.
+
+commit 707d3adbc7d9ee918d6c70083f51ad851ce68852
+Merge: 741c50c... 489e007...
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Aug 20 15:20:39 2007 -0700
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
+commit 489e007a29de63716ab550eacb3e98a91975d1d5
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Wed Aug 8 21:32:57 2007 +0200
+
+ Fixed major blending and compositing breakage.
+
+ Do not adjust the destination blend factor if we need source alpha
+ but our source doesn't have an alpha channel. This makes no sense at all,
+ because the intermediate picture will always have alpha bits (either from
+ the original source, or forced to 0xff).
+
+commit 3820f55e3068163f8c3047a25126673e6de2d16e
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Wed Aug 1 09:02:21 2007 -0700
+
+ Add info for offset 116 in PInS version 5.
+
+commit 7d7626f8429e108dd326899d927de4b4c79f71f5
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Mon Jul 30 12:36:19 2007 +0200
+
+ Bug #4249: Further increase the minimum dot clock.
+
+commit 1a1fe837bc114b5f741e87f14bef74803e299c8d
+Author: Brice Goglin <[EMAIL PROTECTED]>
+Date: Fri Jul 27 18:19:21 2007 +0200
+
+ Change minimal frequency guess from 12 to 16MHz
+
+ G550 seems to lock up with frequencies below 16MHz.
+
+ Reported by Benjamin Wong <[EMAIL PROTECTED]> in
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430112
+ and https://bugs.freedesktop.org/show_bug.cgi?id=11339
+
+commit 041caa230b91a017881394c59d76d663d647529c
+Author: Gabriele Gorla <[EMAIL PROTECTED]>
+Date: Thu Jul 19 22:14:51 2007 -0400
+
+ Add Xv support for Millennium II chips
+
+ Bug 11537
+
+commit 7b080d993ceda7b181e0611ed0c997c8aecc9ad7
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sun Apr 15 12:47:27 2007 +0200
+
+ Added memcpy-based DownloadFromScreen implementation.
+
+commit 43b79af51b600e98ecac9d57aeb0d686dbc6a50e
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sun Apr 15 12:41:01 2007 +0200
+
+ On G550, do A8 adds in hardware.
+
+commit 69c4ed205afbeb9ad937f079caace6cee19bd7b1
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sun Apr 15 12:28:28 2007 +0200
+
+ Make DRI initialization work when using EXA.
+
+ Still need to implement InitBuffers and MoveBuffers for EXA.
+
+commit 920b84364a374ac8cde9314efc6742c11a72ce4f
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Fri Mar 30 20:47:14 2007 +0200
+
+ Removed the debug messages for solid and copy ops.
+
+commit d1696d91d9da79c40b0576b3ce754dc8a6666117
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Fri Mar 30 20:45:45 2007 +0200
+
+ Sync after UploadToScreen.
+
+commit 1246f724bfdd44b49091516bf909ecf97c9b82db
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Mar 28 11:14:24 2007 -0400
+
+ Default mode on G200SE of 1024x768 @ 16bpp.
+
+ The poor thing has so little VRAM that you can't do any bigger than 640x480
+ at 32bpp, so in the interest of having a reasonable screen size...
+
+commit 834bdfc2503f64d8f3bff088dc5eaf8f52f828f5
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Mar 28 11:09:56 2007 -0400
+
+ Disable MTRR support for PCIE G200SE cards, as it tickles hardware bugs.
+
+commit 630390dc5b892941ed6609ca5c35b90be53333f7
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Wed Mar 28 11:07:49 2007 -0400
+
+ Fix various timing bugs on the G200SE.
+
+commit 99430f1cf36c07350cdc557dbbb5c0a34c9b9dd0
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sun Mar 18 12:41:06 2007 +0100
+
+ Shut up the compiler.
+
+commit 741c50c162986a14647301c2c5f8e080a7664efd
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Fri Feb 2 15:50:14 2007 -0800
+
+ Code refactoring in MGAScreenInit.
+
+ Rearrange code so that functions that are selected based on MergedFB
+ and SecondCrtc are selected in one place instead of 3. Rearrange some
+ code that selects on FBDev and Primary to flow a little better.
+
+commit 4432091b2597cf4bba09009622d247c0d8ff151f
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Thu Feb 1 13:45:18 2007 -0800
+
+ Ensure the result of MGAMapMem is checked.
+
+ Add GCC warn_unused_result attribute to MGAMapMem. Add a check of the
+ return value to one place that was missing it (in MGACountRam), and
+ check the return of that function.
+
+commit 3a47132af4dfab420e3c35d7d100dd93fb7bf9c6
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Thu Feb 1 13:30:34 2007 -0800
+
+ Refactor memory map / unmap functions.
+
+ MGAMapMem and MGAMapMemFBDev were refactored into a single function.
+ This happens to fix a bug triggered in software XAA paths because
+ MGAMapMem did not set FbStart. MGAUnmapMem and MGAUnmapMemFBDev were
+ also refactored into a single function.
+
+commit 916d41bcf99bbf666bf634edb1c72b90d9b16ea0
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Jan 15 11:42:52 2007 -0800
+
+ Convert to new pci_device_cfg_write_u* interface.
+
+commit b26bfefb7ea107be3949daea0f6beca6d80c09d4
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Jan 15 11:42:07 2007 -0800
+
+ Pass the correct pointer to pci_device_cfg_write_bits.
+
+commit d5b4dbe749e860e4349607c57467f8085dc28c33
+Merge: cb103a1... 876657e...
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Tue Jan 9 16:04:06 2007 -0800
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
commit 876657e613de6d9dd906c95e05fc590a84d1c322
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date: Tue Dec 26 22:14:57 2006 +0100
@@ -57,6 +264,24 @@ Date: Sat Dec 16 01:44:49 2006 +0200
bump to 1.4.6
+commit cb103a18067adb3256c0b791255ce8435ff57e06
+Merge: d0e0362... 4bcfca9...
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Dec 11 15:06:19 2006 -0800
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
+commit d0e03622811fd94c830c0b5233ff505392c0d331
+Merge: 8fee907... 1dd6e69...
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Mon Dec 11 15:06:03 2006 -0800
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
+ Conflicts:
+
+ src/mga_macros.h
+
commit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date: Sun Dec 10 14:33:10 2006 +0100
@@ -199,6 +424,13 @@ Date: Fri Oct 13 18:33:39 2006 -0400
Bump to 1.4.3
+commit 8fee907cac7e5924630e3648bfb72ad9bd021ea8
+Merge: 7cecee1... 2fc0ebf...
+Author: Ian Romanick <[EMAIL PROTECTED]>
+Date: Tue Oct 10 11:43:52 2006 -0700
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
commit 2fc0ebfbe850c138e840b6653ed1476623aa04a4
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date: Thu Sep 28 18:39:20 2006 +0200
@@ -584,6 +816,13 @@ Date: Thu Aug 10 19:49:22 2006 +0200
Based on ajax' mga-exa-2.patch with some straight forward fixes
by myself.
+commit 7cecee186c889902bed9b7fa042f0bd3cc0297ef
+Merge: 160b1f7... bde5920...
+Author: Ian Romanick <[EMAIL PROTECTED](none)>
+Date: Thu Aug 10 10:19:55 2006 -0700
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
commit bde592047cd62194d7ef67520a9fdbaf269a8b90
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date: Wed Aug 9 21:59:42 2006 +0200
@@ -601,6 +840,27 @@ Date: Wed Aug 9 21:59:42 2006 +0200
I didn't notice any DRI performance drop, but I didn't do serious
benchmarking either.
+commit 160b1f79fab7266a24b7d1a680cdf29bad9707c1
+Author: Ian Romanick <[EMAIL PROTECTED](none)>
+Date: Tue Aug 8 16:59:15 2006 -0700
+
+ Store the pci_device pointer passed into MGAPciProbe instead of
+ searching for it in MGAPreInit.
+
+commit 068e3427cfdf3e3b5dc5c97872d5f52f47ff0d68
+Merge: 95e0722... 7170de8...
+Author: Ian Romanick <[EMAIL PROTECTED](none)>
+Date: Wed Jul 26 11:47:32 2006 -0700
+
+ Merge branch 'master' of
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
+
+commit 95e0722ff2e8878cdd6bb0e349eecab042b879db
+Author: Ian Romanick <[EMAIL PROTECTED](none)>
+Date: Wed Jul 26 11:46:52 2006 -0700
+
+ Current state of MGA driver modified to work with the xserver
+ pci-rework branch.
+
commit 7170de83762660efebff79be84f763008466ffa7
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date: Wed Jul 26 17:06:18 2006 +0200
diff --git a/Makefile.in b/Makefile.in
index f2bc31b..01b011f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,6 +160,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
@@ -172,6 +174,8 @@ USE_XAA_TRUE = @USE_XAA_TRUE@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
+XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
diff --git a/config.sub b/config.sub
index fab0aa3..387c18d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,7 +276,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle |
sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -368,7 +367,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1371,9 +1366,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index 79edbf9..f8fd27b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-mga 1.4.6.1.
+# Generated by GNU Autoconf 2.61 for xf86-video-mga 1.4.7.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-mga'
PACKAGE_TARNAME='xf86-video-mga'
-PACKAGE_VERSION='1.4.6.1'
-PACKAGE_STRING='xf86-video-mga 1.4.6.1'
+PACKAGE_VERSION='1.4.7'
+PACKAGE_STRING='xf86-video-mga 1.4.7'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -879,6 +879,10 @@ DRI_TRUE
DRI_FALSE
DRI_CFLAGS
DRI_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS
+XSERVER_LIBPCIACCESS_TRUE
+XSERVER_LIBPCIACCESS_FALSE
USE_XAA_TRUE
USE_XAA_FALSE
USE_EXA_TRUE
@@ -919,7 +923,9 @@ PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
DRI_CFLAGS
-DRI_LIBS'
+DRI_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS'
# Initialize some variables set by options.
@@ -1422,7 +1428,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-mga 1.4.6.1 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-mga 1.4.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1492,7 +1498,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-mga 1.4.6.1:";;
+ short | recursive ) echo "Configuration of xf86-video-mga 1.4.7:";;
esac
cat <<\_ACEOF
@@ -1543,6 +1549,10 @@ Some influential environment variables:
XORG_LIBS linker flags for XORG, overriding pkg-config
DRI_CFLAGS C compiler flags for DRI, overriding pkg-config
DRI_LIBS linker flags for DRI, overriding pkg-config
+ PCIACCESS_CFLAGS
+ C compiler flags for PCIACCESS, overriding pkg-config
+ PCIACCESS_LIBS
+ linker flags for PCIACCESS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1608,7 +1618,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-mga configure 1.4.6.1
+xf86-video-mga configure 1.4.7
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1622,7 +1632,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-mga $as_me 1.4.6.1, which was
+It was created by xf86-video-mga $as_me 1.4.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2337,7 +2347,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-mga'
- VERSION='1.4.6.1'
+ VERSION='1.4.7'
cat >>confdefs.h <<_ACEOF
@@ -4400,7 +4410,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4403 "configure"' > conftest.$ac_ext
+ echo '#line 4413 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7132,11 +7142,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7135: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7145: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7139: \$? = $ac_status" >&5
+ echo "$as_me:7149: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7400,11 +7410,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7403: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7413: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7407: \$? = $ac_status" >&5
+ echo "$as_me:7417: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7504,11 +7514,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7507: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7517: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7511: \$? = $ac_status" >&5
+ echo "$as_me:7521: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9801,7 +9811,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9804 "configure"
+#line 9814 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9901,7 +9911,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9904 "configure"
+#line 9914 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12237,11 +12247,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12240: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12250: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12244: \$? = $ac_status" >&5
+ echo "$as_me:12254: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12341,11 +12351,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12344: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12354: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12348: \$? = $ac_status" >&5
+ echo "$as_me:12358: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13902,11 +13912,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13905: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13915: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13909: \$? = $ac_status" >&5
+ echo "$as_me:13919: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14006,11 +14016,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14009: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14019: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14013: \$? = $ac_status" >&5
+ echo "$as_me:14023: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16193,11 +16203,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16196: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16206: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16200: \$? = $ac_status" >&5
+ echo "$as_me:16210: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16461,11 +16471,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16464: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16474: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16468: \$? = $ac_status" >&5
+ echo "$as_me:16478: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16565,11 +16575,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16568: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16578: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16572: \$? = $ac_status" >&5
+ echo "$as_me:16582: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20901,6 +20911,193 @@ _ACEOF
fi
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+{ echo "$as_me:$LINENO: checking whether XSERVER_LIBPCIACCESS is declared" >&5
+echo $ECHO_N "checking whether XSERVER_LIBPCIACCESS is declared... $ECHO_C"
>&6; }
+if test "${ac_cv_have_decl_XSERVER_LIBPCIACCESS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include "xorg-server.h"
+
+int
+main ()
+{
+#ifndef XSERVER_LIBPCIACCESS
+ (void) XSERVER_LIBPCIACCESS;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_XSERVER_LIBPCIACCESS=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_XSERVER_LIBPCIACCESS=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&5
+echo "${ECHO_T}$ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&6; }
+if test $ac_cv_have_decl_XSERVER_LIBPCIACCESS = yes; then
+ XSERVER_LIBPCIACCESS=yes
+else
+ XSERVER_LIBPCIACCESS=no
+fi
+
+CFLAGS="$save_CFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for PCIACCESS" >&5
+echo $ECHO_N "checking for PCIACCESS... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PCIACCESS_CFLAGS"; then
+ pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.8.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.8.0"
2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PCIACCESS_LIBS"; then
+ pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess
>= 0.8.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.8.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "pciaccess >= 0.8.0"`
+ else
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "pciaccess >= 0.8.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PCIACCESS_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >=
0.8.0) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (pciaccess >= 0.8.0) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be
found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
+ PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+fi
+
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ XSERVER_LIBPCIACCESS_TRUE=
+ XSERVER_LIBPCIACCESS_FALSE='#'
+else
+ XSERVER_LIBPCIACCESS_TRUE='#'
+ XSERVER_LIBPCIACCESS_FALSE=
+fi
+
+
if true; then
@@ -21401,6 +21598,13 @@ echo "$as_me: error: conditional \"DRI\" was never
defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z
"${XSERVER_LIBPCIACCESS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XSERVER_LIBPCIACCESS\" was
never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${USE_XAA_TRUE}" && test -z "${USE_XAA_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USE_XAA\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -21715,7 +21919,7 @@ exec 6>&1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
