diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-05-27 12:41:36 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-05-27 12:41:36 +0000 |
| commit | 9e4e196b379be303c3abeb8d9d9d87ed94cf7d66 (patch) | |
| tree | 7fea6b440a3ff9918117bcc1d5be42634cb9d83d /x11-drivers/xf86-video-siliconmotion/files | |
| parent | Restrict -r0 to <sys-devel/bison-3 and fix building in -r1 wrt #511560 by "zi... (diff) | |
| download | historical-9e4e196b379be303c3abeb8d9d9d87ed94cf7d66.tar.gz historical-9e4e196b379be303c3abeb8d9d9d87ed94cf7d66.tar.bz2 historical-9e4e196b379be303c3abeb8d9d9d87ed94cf7d66.zip | |
Fix build with newer xorg-server. Remove old.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/xf86-video-siliconmotion/files')
4 files changed, 22 insertions, 68 deletions
diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch deleted file mode 100644 index 7c311669a00f..000000000000 --- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7d9c1a49b87df15cdb78c529db554ea82c77033f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Thu, 17 Nov 2011 20:53:51 +0000 -Subject: Check ABI major not encoded ABI - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/smi_driver.c b/src/smi_driver.c -index 86644c7..6508fae 100644 ---- a/src/smi_driver.c -+++ b/src/smi_driver.c -@@ -442,7 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) - LEAVE(FALSE); - - hwp = VGAHWPTR(pScrn); --#if ABI_VIDEODRV_VERSION < 12 -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pSmi->PIOBase = hwp->PIOOffset; - #else - pSmi->PIOBase = 0; --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch deleted file mode 100644 index f34b1fb70f2b..000000000000 --- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0e7e9cd639196cb42b0a79b2671f6bacc558035f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 22:26:34 +0000 -Subject: Fix for new vgaHW ABI - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/smi_driver.c b/src/smi_driver.c -index a344921..25eb742 100644 ---- a/src/smi_driver.c -+++ b/src/smi_driver.c -@@ -442,6 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) - LEAVE(FALSE); - - hwp = VGAHWPTR(pScrn); -+ vgaHWSetStdFuncs(hwp); - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pSmi->PIOBase = hwp->PIOOffset; - #else --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch deleted file mode 100644 index ef353f0df9be..000000000000 --- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 16 Nov 2011 20:03:25 +0000 -Subject: Adapt to missing PIOOffset in videoabi 12 - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/smi_driver.c b/src/smi_driver.c -index 9c10e46..86644c7 100644 ---- a/src/smi_driver.c -+++ b/src/smi_driver.c -@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) - LEAVE(FALSE); - - hwp = VGAHWPTR(pScrn); -+#if ABI_VIDEODRV_VERSION < 12 - pSmi->PIOBase = hwp->PIOOffset; -+#else -+ pSmi->PIOBase = 0; -+#endif - - xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, " - "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET, --- -cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch new file mode 100644 index 000000000000..5f1c49abc5e4 --- /dev/null +++ b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch @@ -0,0 +1,22 @@ +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 |