[xorg-x11-drv-tdfx] ABI rebuild tdfx-1.4.3-git.patch: Sync with git for new ABI tdfx-1.4.3-vga.patch: Fix VGA port acces

[Adam Jackson]

commit 382145c7a7a8f6133af94efd773c1e0bbe524adb
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Nov 16 19:48:01 2011 -0500

    ABI rebuild
    tdfx-1.4.3-git.patch: Sync with git for new ABI
    tdfx-1.4.3-vga.patch: Fix VGA port access

 tdfx-1.4.3-vga.patch   |   36 ++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-tdfx.spec |    3 +++
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/tdfx-1.4.3-vga.patch b/tdfx-1.4.3-vga.patch
new file mode 100644
index 0000000..9d5595e
--- /dev/null
+++ b/tdfx-1.4.3-vga.patch
@@ -0,0 +1,36 @@
+From 32cd2dfa1214ed3260bf2e40bad06927b18f7f7b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 16 Nov 2011 19:44:02 +0000
+Subject: Adapt to missing PIOOffset in vgahw
+
+This is actually pretty lame, and I should probably extend vgahw to make
+it easier to do this kind of trick.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index 673bbc7..65c6709 100644
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -6,9 +6,6 @@
+ #include <inttypes.h>
+ #endif
+ 
+-#define USE_INT10 1
+-#define USE_PCIVGAIO 1
+-
+ /**************************************************************************
+ 
+ Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+@@ -106,6 +103,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "dri.h"
+ #endif
+ 
++#define USE_INT10 1
++#define USE_PCIVGAIO (ABI_VIDEODRV_VERSION < 12)
++
+ /* Required Functions: */
+ 
+ static const OptionInfoRec *	TDFXAvailableOptions(int chipid, int busid);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/xorg-x11-drv-tdfx.spec b/xorg-x11-drv-tdfx.spec
index eb6a8fe..6282f86 100644
--- a/xorg-x11-drv-tdfx.spec
+++ b/xorg-x11-drv-tdfx.spec
@@ -14,6 +14,7 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tdfx.xinf
 
 Patch0: tdfx-1.4.3-git.patch
+Patch1: tdfx-1.4.3-vga.patch
 
 ExcludeArch: s390 s390x
 
@@ -33,6 +34,7 @@ X.Org X11 tdfx video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .git
+%patch1 -p1 -b .vga
 
 %build
 %configure --disable-static
@@ -63,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Nov 09 2011 Adam Jackson <ajax at redhat.com> 1.4.3-11
 - ABI rebuild
 - tdfx-1.4.3-git.patch: Sync with git for new ABI
+- tdfx-1.4.3-vga.patch: Fix VGA port access
 
 * Thu Aug 18 2011 Adam Jackson <ajax at redhat.com> - 1.4.3-9
 - Rebuild for xserver 1.11 ABI