xserver-xorg-video-siliconmotion: Changes to 'ubuntu'
debian/changelog | 7 +++
debian/control | 6 +-
debian/patches/fix-ftbfs-1.17.diff | 75 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 2
4 files changed, 87 insertions(+), 3 deletions(-)
New commits:
commit e76dfa6f7ef803f2d058534ec58c90fd0dc1984d
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 12 11:59:53 2015 +0100
Rebuild against 1.17.
fix-ftbfs-1.17.diff
diff --git a/debian/changelog b/debian/changelog
index 5b5afca..a6a585a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-siliconmotion (1:1.7.7-2ubuntu1) vivid; urgency=medium
+
+ * Rebuild against 1.17.
+ - fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 12 Mar 2015 11:53:23 +0100
+
xserver-xorg-video-siliconmotion (1:1.7.7-2) unstable; urgency=low
* Release to unstable.
diff --git a/debian/control b/debian/control
index fff5fe8..ad75033 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
Source: xserver-xorg-video-siliconmotion
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,
+ quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-core-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..5d1c210
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,75 @@
+diff --git a/src/smi.h b/src/smi.h
+index 956c14f..dce82e6 100644
+--- a/src/smi.h
++++ b/src/smi.h
+@@ -37,7 +37,6 @@ authorization from the XFree86 Project and Silicon Motion.
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "xf86Cursor.h"
+ #include "vgaHW.h"
+@@ -68,6 +67,15 @@ authorization from the XFree86 Project and Silicon Motion.
+ /* D E F I N I T I O N S */
+ /******************************************************************************/
+
++#define PCI_VENDOR_SMI 0x126F
++#define PCI_CHIP_SMI910 0x0910
++#define PCI_CHIP_SMI810 0x0810
++#define PCI_CHIP_SMI820 0x0820
++#define PCI_CHIP_SMI710 0x0710
++#define PCI_CHIP_SMI712 0x0712
++#define PCI_CHIP_SMI720 0x0720
++#define PCI_CHIP_SMI731 0x0730
++
+ #ifndef SMI_DEBUG
+ #define SMI_DEBUG 0
+ #endif
+@@ -221,7 +229,7 @@ typedef struct
+ CARD8 * DataPortBase; /* Base of data port */
+ int DataPortSize; /* Size of data port */
+ CARD8 * IOBase; /* Base of MMIO VGA ports */
+- IOADDRESS PIOBase; /* Base of I/O ports */
++ unsigned int PIOBase; /* Base of I/O ports */
+ unsigned char * FBBase; /* Base of FB */
+ CARD32 fbMapOffset; /* offset for fb mapping */
+ CARD32 FBOffset; /* Current visual FB starting
+diff --git a/src/smi_i2c.c b/src/smi_i2c.c
+index f38b514..ecf350e 100644
+--- a/src/smi_i2c.c
++++ b/src/smi_i2c.c
+@@ -35,7 +35,6 @@ authorization from the XFree86 Project and Silicon Motion.
+ #include "xf86_OSproc.h"
+ #include "compiler.h"
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ #include "vgaHW.h"
+
+ #include "smi.h"
+diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
+index 9a10a31..b2ee8a5 100644
+--- a/src/smilynx_hw.c
++++ b/src/smilynx_hw.c
+@@ -572,6 +572,12 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
+ LEAVE(ret);
+ }
+
++static void
++SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++ vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ xf86MonPtr
+ SMILynx_ddc1(ScrnInfoPtr pScrn)
+ {
+@@ -585,7 +591,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn)
+ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
+
+ pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
+- vgaHWddc1SetSpeedWeak(),
++ SMILynx_ddc1SetSpeed,
+ SMILynx_ddc1Read));
+ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
+
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..b2731a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+fix-ftbfs-1.17.diff
Reply to: