03/04: gnu: xf86-video-cirrus: Prepare for xorg-server 1.17 update.

[Mark H. Weaver]

mhw pushed a commit to branch wip-xorg-server-1.17
in repository guix.

commit 16106caac70a84f1121d9b1f7b58b857c0cfc381
Author: Mark H Weaver <address@hidden>
Date:   Wed Feb 18 03:24:25 2015 -0500

    gnu: xf86-video-cirrus: Prepare for xorg-server 1.17 update.
    
    * gnu/packages/patches/xf86-video-cirrus-libpciaccess.patch: New file.
    * gnu-system.am (dist_patch_DATA): Add it.
    * gnu/packages/xorg.scm (xf86-video-cirrus): Add patch.
---
 gnu-system.am                                      |    1 +
 .../patches/xf86-video-cirrus-libpciaccess.patch   |   56 ++++++++++++++++++++
 gnu/packages/xorg.scm                              |    3 +-
 3 files changed, 59 insertions(+), 1 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index d99dcfd..dbfdf1f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -507,6 +507,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/wmctrl-64-fix.patch                     \
   gnu/packages/patches/xf86-video-ark-remove-mibstore.patch    \
   gnu/packages/patches/xf86-video-ast-remove-mibstore.patch    \
+  gnu/packages/patches/xf86-video-cirrus-libpciaccess.patch    \
   gnu/packages/patches/xf86-video-geode-glibc-2.20.patch       \
   gnu/packages/patches/xf86-video-glint-remove-mibstore.patch  \
   gnu/packages/patches/xf86-video-i128-remove-mibstore.patch   \
diff --git a/gnu/packages/patches/xf86-video-cirrus-libpciaccess.patch 
b/gnu/packages/patches/xf86-video-cirrus-libpciaccess.patch
new file mode 100644
index 0000000..76a5555
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-cirrus-libpciaccess.patch
@@ -0,0 +1,56 @@
+From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <address@hidden>
+Date: Sat, 20 Sep 2014 18:51:17 +1000
+Subject: cirrus: don't use pciTag
+
+Signed-off-by: Dave Airlie <address@hidden>
+
+diff --git a/src/alp_driver.c b/src/alp_driver.c
+index 36f2039..bd5e52f 100644
+--- a/src/alp_driver.c
++++ b/src/alp_driver.c
+@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+       pCir->Chipset = pCir->pEnt->chipset;
+       /* Find the PCI info for this screen */
+       pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+       pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+                             PCI_DEV_DEV(pCir->PciInfo),
+                             PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     if (!xf86IsPc98())
+diff --git a/src/cir.h b/src/cir.h
+index 0a5d403..84f64b5 100644
+--- a/src/cir.h
++++ b/src/cir.h
+@@ -23,7 +23,9 @@ typedef struct {
+       ScrnInfoPtr             pScrn;
+       CARD32                  properties;
+       pciVideoPtr             PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+       PCITAG                  PciTag;
++#endif
+       unsigned long           PIOReg;
+     union {
+       struct lgRec            *lg;
+diff --git a/src/lg_driver.c b/src/lg_driver.c
+index c20bbd0..589d14e 100644
+--- a/src/lg_driver.c
++++ b/src/lg_driver.c
+@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+       /* Find the PCI info for this screen */
+       pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+       pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+                             PCI_DEV_DEV(pCir->PciInfo),
+                             PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+ 
+       if (xf86LoadSubModule(pScrn, "int10")) {
+           xf86Int10InfoPtr int10InfoPtr;
+-- 
+cgit v0.10.2
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 07de603..456803a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2447,7 +2447,8 @@ devices, thus making direct access unnecessary.")
                ".tar.bz2"))
         (sha256
           (base32
-            "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k"))))
+            "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k"))
+        (patches (list (search-patch 
"xf86-video-cirrus-libpciaccess.patch")))))
     (build-system gnu-build-system)
     (inputs `(("xorg-server" ,xorg-server)))
     (native-inputs `(("pkg-config" ,pkg-config)))