debian/changelog | 7 ++++
debian/control | 2 -
debian/patches/fix-ftbfs-1.17.diff | 53 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
4 files changed, 62 insertions(+), 1 deletion(-)
New commits:
commit db307af1abfa18a019066dbf85f00d6b020f9e48
Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com>
Date: Thu Mar 12 11:48:56 2015 +0100
Rebuild against xserver 1.17.
fix-ftbfs-1.17.diff
diff --git a/debian/changelog b/debian/changelog
index 24158fb..d9dde83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.3.7-2ubuntu4) vivid; urgency=medium
+
+ * Rebuild against xserver 1.17.
+ - fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 12 Mar 2015
11:48:33 +0100
+
xserver-xorg-video-savage (1:2.3.7-2ubuntu3) utopic; urgency=low
* Rebuild for xorg 1.16 abi.
diff --git a/debian/control b/debian/control
index 9f98894..a7f4b53 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-gl-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 0000000..fed4834
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,53 @@
+diff --git a/src/savage_dri.c b/src/savage_dri.c
+index bdb78e4..0842821 100644
+--- a/src/savage_dri.c
++++ b/src/savage_dri.c
+@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
+ psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
+ pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
+
+- pDRIInfo->wrap.ValidateTree = NULL;
+- pDRIInfo->wrap.PostValidateTree = NULL;
+-
+ pDRIInfo->createDummyCtx = TRUE;
+ pDRIInfo->createDummyCtxPriv = FALSE;
+
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index bca2c60..e82794f 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
+ return ((unsigned int) (tmp & 0x08));
+ }
+
++static void
++SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++ vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ SavageDDC1(ScrnInfoPtr pScrn)
+ {
+@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
+ InI2CREG(byte,psav->I2CPort);
+ OutI2CREG(byte | 0x12,psav->I2CPort);
+
+- pMon =
xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
++ pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
++ SavageDDC1Read);
+ if (!pMon)
+ return FALSE;
+
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index ec4b1ea..de042af 100644
+--- a/src/savage_driver.h
++++ b/src/savage_driver.h
+@@ -54,6 +54,7 @@
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+ #endif
++#include "xf86Modes.h"
+ #include "xf86Pci.h"
+ #include "xf86_OSproc.h"
+ #include "xf86Cursor.h"
diff --git a/debian/patches/series b/debian/patches/series
index f420099..3ceb913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
03_request_16bit_depth.diff
100_bustype_pci_by_default.diff
101-pointer.diff
+fix-ftbfs-1.17.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1a8-0007py...@moszumanska.debian.org
