Commit d0a43d4a authored by Natanael Copa's avatar Natanael Copa
Browse files

main/xf86-video-siliconmotion: rebuild against xorg-server 1.17

parent d2693933
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xf86-video-siliconmotion
pkgver=1.7.7
pkgrel=5
pkgrel=6
pkgdesc="Silicon Motion video driver"
url="http://xorg.freedesktop.org/"
arch="all"
......@@ -12,7 +12,7 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
videoproto renderproto"
source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
Remove-miInitializeBackingStore.patch
git-fixes.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
......@@ -44,8 +44,8 @@ package() {
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
md5sums="dc139f8ea17c40fb7bcc89181e9dbfb3 xf86-video-siliconmotion-1.7.7.tar.bz2
ba50597872cd5dfd2c54028b58919c47 Remove-miInitializeBackingStore.patch"
bc6b728144ff8f57d953e1ac997d0420 git-fixes.patch"
sha256sums="87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa xf86-video-siliconmotion-1.7.7.tar.bz2
3faa2975dccea76f36309ed239ec5bd0bb9a418aaae56ab5bcec5df900919391 Remove-miInitializeBackingStore.patch"
da4c149720e628eb808b2de86ff1ce7010622455d92dcd31026a9653a2213f08 git-fixes.patch"
sha512sums="368ffa09e59368c18d8eda3ed44cff6de9b44df61624dd7449b3a9d55cca4f7271f0e3ff0ad45d2f312aadc084dae1d2cdecfe0ea42346ca9be2e0d0cf966e33 xf86-video-siliconmotion-1.7.7.tar.bz2
91b35abc5afc74fd4be4b58b6da6fd1882db4def089d2a6926e45fd5e7107c72d0aec16cec49bad769139e4715751678684eb86e0af5cd872c98d0572d089e52 Remove-miInitializeBackingStore.patch"
2a8a9113cbedbd7e8523a380286355102aa162ee73e107865fe75db2ce3922d5aa72cde480441f2cf02c1ba23a8f1c71c69c8da6075bf108526b1edc736de18b git-fixes.patch"
From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 10 Jan 2013 03:59:39 +0000
Subject: Remove miInitializeBackingStore()
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 4794571..134db79 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
"Done writing mode. Register dump:\n");
SMI_PrintRegs(pScrn);
- miInitializeBackingStore(pScreen);
-
#ifdef HAVE_XMODES
xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
#endif
--
cgit v0.9.0.2-2-gbebe
From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 9 Jan 2013 22:59:39 -0500
Subject: Remove miInitializeBackingStore()
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 4794571..134db79 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
"Done writing mode. Register dump:\n");
SMI_PrintRegs(pScrn);
- miInitializeBackingStore(pScreen);
-
#ifdef HAVE_XMODES
xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
#endif
--
cgit v0.10.2
From 9b563415326e02f0b89f716c29b2fc22f393fb96 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 21 May 2014 14:01:02 -0400
Subject: Use own thunk function instead of vgaHW*Weak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
index 9a10a31..7f6a8f2 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, xf86ddcSpeec 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);
--
cgit v0.10.2
From b0b287209cfba5c64c7584b1a82ed2a2f1eab7e6 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 30 Sep 2014 10:28:48 -0400
Subject: Fix build against xserver 1.17
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi.h b/src/smi.h
index 956c14f..8ca760e 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -221,7 +221,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
--
cgit v0.10.2
From 08d459d2b548ce89264f45c7018f1cda9f08d795 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 30 Sep 2014 10:31:52 -0400
Subject: Fix a typo
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
index 7f6a8f2..b2ee8a5 100644
--- a/src/smilynx_hw.c
+++ b/src/smilynx_hw.c
@@ -573,7 +573,7 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
}
static void
-SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeec speed)
+SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
{
vgaHWddc1SetSpeed(pScrn, speed);
}
--
cgit v0.10.2
From c31d7f853d7469085f96f1e37923c260884c611c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 30 Sep 2014 10:34:07 -0400
Subject: Remove dependency on xf86PciInfo.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/smi.h b/src/smi.h
index 8ca760e..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
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"
--
cgit v0.10.2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment