update to xf86-video-trident 1.3.1

7 files changed, 22 insertions, 7 deletions

diff --git a/driver/xf86-video-trident/configure.ac b/driver/xf86-video-trident/configure.ac
index e0b3b1864..60aa9532e 100644
--- a/driver/xf86-video-trident/configure.ac
+++ b/driver/xf86-video-trident/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-trident],
-        1.3.0,
+        1.3.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-trident)
 
@@ -58,6 +58,14 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+	      [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+	      [],
+	      [#include "xf86.h"])
+CFLAGS="$save_CFLAGS"
+
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
diff --git a/driver/xf86-video-trident/src/Makefile.am b/driver/xf86-video-trident/src/Makefile.am
index 216bad49d..16c1ca908 100644
--- a/driver/xf86-video-trident/src/Makefile.am
+++ b/driver/xf86-video-trident/src/Makefile.am
@@ -26,6 +26,7 @@
 AM_CFLAGS = @XORG_CFLAGS@
 trident_drv_la_LTLIBRARIES = trident_drv.la
 trident_drv_la_LDFLAGS = -module -avoid-version
+trident_drv_la_LIBADD = -lm
 trident_drv_ladir = @moduledir@/drivers
 
 trident_drv_la_SOURCES = \
diff --git a/driver/xf86-video-trident/src/trident.h b/driver/xf86-video-trident/src/trident.h
index 6b966491c..1142b50a8 100644
--- a/driver/xf86-video-trident/src/trident.h
+++ b/driver/xf86-video-trident/src/trident.h
@@ -322,8 +322,12 @@ typedef enum {
 
 #define IsPciCard	(pTrident->pEnt->location.type == BUS_PCI)
 
-#define IsPrimaryCard	((xf86IsPrimaryPci(pTrident->PciInfo)) || \
+#ifdef HAVE_ISA
+# define IsPrimaryCard	((xf86IsPrimaryPci(pTrident->PciInfo)) || \
 			 (xf86IsPrimaryIsa()))
+#else
+# define IsPrimaryCard	(xf86IsPrimaryPci(pTrident->PciInfo))
+#endif
 
 #define HAS_DST_TRANS	((pTrident->Chipset == PROVIDIA9682) || \
 			 (pTrident->Chipset == PROVIDIA9685) || \
diff --git a/driver/xf86-video-trident/src/trident_dac.c b/driver/xf86-video-trident/src/trident_dac.c
index 6240b7f04..cd7da8072 100644
--- a/driver/xf86-video-trident/src/trident_dac.c
+++ b/driver/xf86-video-trident/src/trident_dac.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Version.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
diff --git a/driver/xf86-video-trident/src/trident_driver.c b/driver/xf86-video-trident/src/trident_driver.c
index b5ab9681f..5d0e818d4 100644
--- a/driver/xf86-video-trident/src/trident_driver.c
+++ b/driver/xf86-video-trident/src/trident_driver.c
@@ -40,7 +40,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86Version.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86cmap.h"
@@ -174,6 +173,7 @@ static SymTabRec TRIDENTChipsets[] = {
     { -1,				NULL }
 };
 
+#ifdef HAVE_ISA
 static IsaChipsets TRIDENTISAchipsets[] = {
     { TVGA9000,			RES_EXCLUSIVE_VGA },
     { TVGA9000i,		RES_EXCLUSIVE_VGA },
@@ -185,6 +185,7 @@ static IsaChipsets TRIDENTISAchipsets[] = {
     { TGUI9440AGi,		RES_EXCLUSIVE_VGA },
     { -1,			RES_UNDEFINED }
 };
+#endif
 
 static PciChipsets TRIDENTPciChipsets[] = {
     { CYBER9320,	PCI_CHIP_9320,	RES_SHARED_VGA },
@@ -809,6 +810,7 @@ TRIDENTClockSelect(ScrnInfoPtr pScrn, int no)
     return(TRUE);
 }
 
+#ifdef HAVE_ISA
 static int
 TridentFindIsaDevice(GDevPtr dev)
 {
@@ -899,6 +901,7 @@ TridentFindIsaDevice(GDevPtr dev)
     }
     return found;
 }
+#endif
 
 
 /* Mandatory */
@@ -975,6 +978,7 @@ TRIDENTProbe(DriverPtr drv, int flags)
 	}
     }
 
+#ifdef HAVE_ISA
     /* Isa Bus */
     numUsed = xf86MatchIsaInstances(TRIDENT_NAME,TRIDENTChipsets,
 				     TRIDENTISAchipsets,
@@ -1005,7 +1009,8 @@ TRIDENTProbe(DriverPtr drv, int flags)
 	}
 	xfree(usedChips);
     }
-    
+#endif    
+
     xfree(devSections);
     return foundScreen;
 }
diff --git a/driver/xf86-video-trident/src/tridenthelper.c b/driver/xf86-video-trident/src/tridenthelper.c
index 5b6eb4aaf..9e25d4491 100644
--- a/driver/xf86-video-trident/src/tridenthelper.c
+++ b/driver/xf86-video-trident/src/tridenthelper.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Version.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
diff --git a/driver/xf86-video-trident/src/tvga_dac.c b/driver/xf86-video-trident/src/tvga_dac.c
index d09da58ac..422005df8 100644
--- a/driver/xf86-video-trident/src/tvga_dac.c
+++ b/driver/xf86-video-trident/src/tvga_dac.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Version.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"