configure.ac | 10 +++++++++-
src/Makefile.am | 1 +
src/trident.h | 6 +++++-
src/trident_dac.c | 1 -
src/trident_driver.c | 9 +++++++--
src/tridenthelper.c | 1 -
src/tvga_dac.c | 1 -
7 files changed, 22 insertions(+), 7 deletions(-)
New commits:
commit a4ae6379a5725e77837201bf1dc735124f7dc368
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Dec 22 13:59:29 2008 +1000
trident 1.3.1
diff --git a/configure.ac b/configure.ac
index a130ed3..60aa953 100644
--- a/configure.ac
+++ b/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)
commit 34915ef8969596f2aca4700c02a08959b916ed1f
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Fri Nov 28 01:01:32 2008 -0200
Correct macro IsPrimaryCard to check HAVE_ISA.
diff --git a/src/trident.h b/src/trident.h
index 6b96649..1142b50 100644
--- a/src/trident.h
+++ b/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) || \
commit 73cbaec34866524deab838d04876408bbc93a102
Author: Adam Jackson <a...@redhat.com>
Date: Sun Nov 23 17:30:45 2008 -0500
Make ISA optional
diff --git a/configure.ac b/configure.ac
index e0b3b18..a130ed3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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/src/trident_driver.c b/src/trident_driver.c
index 9d2fdb4..5d0e818 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -173,6 +173,7 @@ static SymTabRec TRIDENTChipsets[] = {
{ -1, NULL }
};
+#ifdef HAVE_ISA
static IsaChipsets TRIDENTISAchipsets[] = {
{ TVGA9000, RES_EXCLUSIVE_VGA },
{ TVGA9000i, RES_EXCLUSIVE_VGA },
@@ -184,6 +185,7 @@ static IsaChipsets TRIDENTISAchipsets[] = {
{ TGUI9440AGi, RES_EXCLUSIVE_VGA },
{ -1, RES_UNDEFINED }
};
+#endif
static PciChipsets TRIDENTPciChipsets[] = {
{ CYBER9320, PCI_CHIP_9320, RES_SHARED_VGA },
@@ -808,6 +810,7 @@ TRIDENTClockSelect(ScrnInfoPtr pScrn, int no)
return(TRUE);
}
+#ifdef HAVE_ISA
static int
TridentFindIsaDevice(GDevPtr dev)
{
@@ -898,6 +901,7 @@ TridentFindIsaDevice(GDevPtr dev)
}
return found;
}
+#endif
/* Mandatory */
@@ -974,6 +978,7 @@ TRIDENTProbe(DriverPtr drv, int flags)
}
}
+#ifdef HAVE_ISA
/* Isa Bus */
numUsed = xf86MatchIsaInstances(TRIDENT_NAME,TRIDENTChipsets,
TRIDENTISAchipsets,
@@ -1004,7 +1009,8 @@ TRIDENTProbe(DriverPtr drv, int flags)
}
xfree(usedChips);
}
-
+#endif
+
xfree(devSections);
return foundScreen;
}
commit 7119ae2424d7fea8eb67586be4ea9982000dcc3a
Author: Adam Jackson <a...@redhat.com>
Date: Fri Aug 15 14:08:10 2008 -0400
Uninclude xf86Version.h
diff --git a/src/trident_dac.c b/src/trident_dac.c
index 6240b7f..cd7da80 100644
--- a/src/trident_dac.c
+++ b/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/src/trident_driver.c b/src/trident_driver.c
index b5ab968..9d2fdb4 100644
--- a/src/trident_driver.c
+++ b/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"
diff --git a/src/tridenthelper.c b/src/tridenthelper.c
index 5b6eb4a..9e25d44 100644
--- a/src/tridenthelper.c
+++ b/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/src/tvga_dac.c b/src/tvga_dac.c
index d09da58..422005d 100644
--- a/src/tvga_dac.c
+++ b/src/tvga_dac.c
@@ -28,7 +28,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Version.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit a1cd2244b7457189630fab8be1532272e8eb7d64
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jun 6 14:47:14 2008 +0200
Link with -lm for sin()
diff --git a/src/Makefile.am b/src/Makefile.am
index 216bad4..16c1ca9 100644
--- a/src/Makefile.am
+++ b/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 = \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
