[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: xf86-video-sis: Prepare for xorg-server-1.17 update.
|
From: |
Mark H. Weaver |
|
Subject: |
01/04: gnu: xf86-video-sis: Prepare for xorg-server-1.17 update. |
|
Date: |
Wed, 18 Feb 2015 08:42:13 +0000 |
mhw pushed a commit to branch wip-xorg-server-1.17
in repository guix.
commit 09a60f5d132bcbe7ad9993dc60c89e7340fbb508
Author: Mark H Weaver <address@hidden>
Date: Wed Feb 18 02:24:10 2015 -0500
gnu: xf86-video-sis: Prepare for xorg-server-1.17 update.
* gnu/packages/patches/xf86-video-sis-libpciaccess-1.patch,
gnu/packages/patches/xf86-video-sis-libpciaccess-2.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/xorg.scm (xf86-video-sis): Add patches.
---
gnu-system.am | 2 +
.../patches/xf86-video-sis-libpciaccess-1.patch | 38 ++++++++++
.../patches/xf86-video-sis-libpciaccess-2.patch | 73 ++++++++++++++++++++
gnu/packages/xorg.scm | 4 +-
4 files changed, 116 insertions(+), 1 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index eeadd8f..e229913 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -518,6 +518,8 @@ dist_patch_DATA =
\
gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
gnu/packages/patches/xf86-video-r128-glibc-2.20.patch \
gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-sis-libpciaccess-1.patch \
+ gnu/packages/patches/xf86-video-sis-libpciaccess-2.patch \
gnu/packages/patches/xf86-video-sis-update-api.patch \
gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch \
gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
diff --git a/gnu/packages/patches/xf86-video-sis-libpciaccess-1.patch
b/gnu/packages/patches/xf86-video-sis-libpciaccess-1.patch
new file mode 100644
index 0000000..ffc9364
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-sis-libpciaccess-1.patch
@@ -0,0 +1,38 @@
+From d0550de19cacab3e591641ba358a72fbc798b231 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <address@hidden>
+Date: Mon, 22 Sep 2014 12:45:02 +1000
+Subject: sis: fix build against latest xserver
+
+
+diff --git a/src/sis.h b/src/sis.h
+index 20e6134..385b784 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -1004,7 +1004,9 @@ typedef struct {
+ ScrnInfoPtr pScrn;
+ pciVideoPtr PciInfo;
+ int PciBus, PciDevice, PciFunc;
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
++#endif
+ EntityInfoPtr pEnt;
+ int Chipset;
+ unsigned char ChipType;
+diff --git a/src/vstruct.h b/src/vstruct.h
+index 88f7eb6..5d7a98d 100644
+--- a/src/vstruct.h
++++ b/src/vstruct.h
+@@ -237,8 +237,10 @@ struct SiS_Private
+ unsigned char ChipType;
+ unsigned char ChipRevision;
+ #ifdef SIS_XORG_XF86
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
+ #endif
++#endif
+ #ifdef SIS_LINUX_KERNEL
+ void *ivideo;
+ #endif
+--
+cgit v0.10.2
+
diff --git a/gnu/packages/patches/xf86-video-sis-libpciaccess-2.patch
b/gnu/packages/patches/xf86-video-sis-libpciaccess-2.patch
new file mode 100644
index 0000000..631e804
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-sis-libpciaccess-2.patch
@@ -0,0 +1,73 @@
+From d2597696ba81862d80ec17b978d8370c58572e27 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <address@hidden>
+Date: Wed, 12 Nov 2014 08:04:21 +1000
+Subject: sis: more build fixes against master X server.
+
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index bd9c4e1..125eee7 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -3279,9 +3279,11 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo);
/*SIS_PCI_DEVICE(pSiS->PciInfo);*/
+ pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo);
/*SIS_PCI_FUNC(pSiS->PciInfo);*/
+
++#ifndef XSERVER_LIBPCIACCESS
+ pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo),
+ PCI_DEV_DEV(pSiS->PciInfo),
+ PCI_DEV_FUNC(pSiS->PciInfo));
++#endif
+
+ #ifdef SIS_NEED_MAP_IOP
+ /********************************************/
+@@ -3905,7 +3907,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
+ if(pSiSEnt) pSiSEnt->SiS_Pr = pSiS->SiS_Pr;
+ #endif
+ memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private));
++#ifndef XSERVER_LIBPCIACCESS
+ pSiS->SiS_Pr->PciTag = pSiS->PciTag;
++#endif
+ pSiS->SiS_Pr->ChipType = pSiS->ChipType;
+ pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev;
+ pSiS->SiS_Pr->SiS_Backup70xx = 0xff;
+@@ -7134,7 +7138,9 @@ static Bool
+ SISMapMem(ScrnInfoPtr pScrn)
+ {
+ SISPtr pSiS = SISPTR(pScrn);
++#ifndef XSERVER_LIBPCIACCESS
+ int mmioFlags = VIDMEM_MMIO;
++#endif
+ #ifdef SISDUALHEAD
+ SISEntPtr pSiSEnt = pSiS->entityPrivate;
+ #endif
+@@ -7144,9 +7150,11 @@ SISMapMem(ScrnInfoPtr pScrn)
+ * (For Alpha, we need to map SPARSE memory, since we need
+ * byte/short access.)
+ */
++#ifndef XSERVER_LIBPCIACCESS
+ #if defined(__alpha__)
+ mmioFlags |= VIDMEM_SPARSE;
+ #endif
++#endif
+
+ #ifdef SISDUALHEAD
+ if(pSiS->DualHeadMode) {
+@@ -14017,6 +14025,7 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort
offset, UChar value)
+ break;
+ }
+
++#ifndef XSERVER_LIBPCIACCESS
+ #ifdef SIS_USE_BIOS_SCRATCH
+ if(SISPTR(pScrn)->Primary) {
+ base = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO, 0, 0x2000);
+@@ -14035,6 +14044,7 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort
offset, UChar value)
+ xf86UnMapVidMem(pScrn->scrnIndex, base, 0x2000);
+ }
+ #endif
++#endif
+ return ret;
+ }
+
+--
+cgit v0.10.2
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 10801fe..3a56ad7 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2932,7 +2932,9 @@ graphics cards.")
(sha256
(base32
"1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy"))
- (patches (list (search-patch "xf86-video-sis-update-api.patch")))))
+ (patches (list (search-patch "xf86-video-sis-libpciaccess-1.patch")
+ (search-patch "xf86-video-sis-libpciaccess-2.patch")
+ (search-patch "xf86-video-sis-update-api.patch")))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
("xf86dgaproto" ,xf86dgaproto)