xserver-xorg-video-tdfx: Changes to 'ubuntu'
debian/changelog | 6 ++
debian/control | 5 +-
debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff | 21 ++++++----
3 files changed, 22 insertions(+), 10 deletions(-)
New commits:
commit 7637bd1290a57765a84fba480b63ea1d8b5cca09
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 12 12:17:41 2015 +0100
refresh patch
diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 588f513..75eddfb 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -1,6 +1,6 @@
---- xserver-xorg-video-tdfx.orig/src/tdfx_driver.c
-+++ xserver-xorg-video-tdfx/src/tdfx_driver.c
-@@ -2689,8 +2689,16 @@
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -2591,26 +2591,39 @@
TDFXPtr pTDFX;
TDFXTRACE("TDFXValidMode start\n");
@@ -16,16 +16,21 @@
+ return MODE_BAD;
+ }
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
- pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
-@@ -2704,13 +2712,19 @@
+ if (mode->Flags&V_INTERLACE) {
+ switch (pTDFX->ChipType) {
+- case PCI_CHIP_BANSHEE:
+- return MODE_BAD;
+ case PCI_CHIP_VELOCITY:
+ case PCI_CHIP_VOODOO3:
+ case PCI_CHIP_VOODOO4:
+ case PCI_CHIP_VOODOO5:
return MODE_OK;
- break;
++ case PCI_CHIP_BANSHEE:
default:
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+ " interlace flag\n");
++ " interlace flag\n");
return MODE_BAD;
- break;
}
}
/* In clock doubled mode widths must be divisible by 16 instead of 8 */
commit c788f85d8a54a9595e59b4a64b8d3169447bf897
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 12 12:12:54 2015 +0100
Merge from unreleased debian-experimental to fix a ftbfs with 1.17.
diff --git a/debian/changelog b/debian/changelog
index 116b375..a1a1cf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.4.6-0ubuntu1) vivid; urgency=medium
+
+ * Merge from unreleased debian-experimental to fix a ftbfs with 1.17.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 12 Mar 2015 12:10:16 +0100
+
xserver-xorg-video-tdfx (1:1.4.6-1) UNRELEASED; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 0d58405..4728596 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
Source: xserver-xorg-video-tdfx
Section: x11
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
+XSBC-Orig-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
xutils-dev,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-gl-dev,
x11proto-video-dev,
x11proto-xf86dga-dev,
Reply to: