105/116: gnu: xf86-video-sis: Update to 0.10.7.

[Mark H. Weaver]

mhw pushed a commit to branch xorg-updates
in repository guix.

commit 7007aeb2876645e2c866a70bfdec60d28910e9ab
Author: Mark H Weaver <address@hidden>
Date:   Fri Dec 19 21:12:04 2014 -0500

    gnu: xf86-video-sis: Update to 0.10.7.
    
    * gnu/packages/patches/xf86-video-sis-update-api.patch: New file.
    * gnu-system.am (dist_patch_DATA): Add it.
    * gnu/packages/xorg.scm (xf86-video-sis): Update to 0.10.7.  Add patch.
---
 gnu-system.am                                      |    1 +
 .../patches/xf86-video-sis-update-api.patch        |  128 ++++++++++++++++++++
 gnu/packages/xorg.scm                              |    7 +-
 3 files changed, 133 insertions(+), 3 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index ce134af..8ad0335 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -471,6 +471,7 @@ 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-update-api.patch         \
   gnu/packages/patches/xfce4-panel-plugins.patch               \
   gnu/packages/patches/xmodmap-asprintf.patch
 
diff --git a/gnu/packages/patches/xf86-video-sis-update-api.patch 
b/gnu/packages/patches/xf86-video-sis-update-api.patch
new file mode 100644
index 0000000..d8c5c07
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-sis-update-api.patch
@@ -0,0 +1,128 @@
+Update xf86-video-sis to the current xorg-server API.
+
+Copied from: 
http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-sis.git/tree/sis-0.10.7-git.patch?id=2705859f0ddc7ee7a3b07f21b442ebeab5df1276
+Commit log: 
http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-sis.git/log/sis-0.10.7-git.patch
+
+Patch by Adam Jackson <address@hidden>
+
+diff --git a/src/sis.h b/src/sis.h
+index 46fca2a..20e6134 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -75,7 +75,6 @@
+ 
+ #include "compiler.h"
+ #include "xf86Pci.h"
+-#include "xf86Priv.h"
+ #include "xf86_OSproc.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 61e8075..0fd83d7 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -57,7 +57,6 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -94,6 +93,10 @@
+ #include "dri.h"
+ #endif
+ 
++#ifndef DEFAULT_DPI
++#define DEFAULT_DPI 96
++#endif
++
+ /*
+  * LookupWindow was removed with video abi 11.
+  */
+@@ -7344,7 +7347,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+         if(pSiSEnt->MapCountIOBase) {
+           pSiSEnt->MapCountIOBase--;
+           if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+               xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, 
(pSiS->mmioSize * 1024));
++#else
++              pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, 
(pSiS->mmioSize * 1024));
++#endif
+               pSiSEnt->IOBase = NULL;
+               pSiSEnt->MapCountIOBase = 0;
+               pSiSEnt->forceUnmapIOBase = FALSE;
+@@ -7355,7 +7362,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+       if(pSiSEnt->MapCountIOBaseDense) {
+           pSiSEnt->MapCountIOBaseDense--;
+           if((pSiSEnt->MapCountIOBaseDense == 0) || 
(pSiSEnt->forceUnmapIOBaseDense)) {
++#ifndef XSERVER_LIBPCIACCESS
+               xf86UnMapVidMem(pScrn->scrnIndex, 
(pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
++              pci_device_unmap_range(pSiS->PciInfo, 
(pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+               pSiSEnt->IOBaseDense = NULL;
+               pSiSEnt->MapCountIOBaseDense = 0;
+               pSiSEnt->forceUnmapIOBaseDense = FALSE;
+@@ -7366,7 +7377,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+       if(pSiSEnt->MapCountFbBase) {
+           pSiSEnt->MapCountFbBase--;
+           if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+               xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, 
pSiS->FbMapSize);
++#else
++              pci_device_unmap_range(pSiS->PciInfo, 
(pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#endif
+               pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
+               pSiSEnt->MapCountFbBase = 0;
+               pSiSEnt->forceUnmapFbBase = FALSE;
+@@ -7376,13 +7391,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+       }
+     } else {
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+       xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, 
(pSiS->mmioSize * 1024));
++#else
++      pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, 
(pSiS->mmioSize * 1024));
++#endif
+       pSiS->IOBase = NULL;
+ #ifdef __alpha__
++#ifndef XSERVER_LIBPCIACCESS
+       xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, 
(pSiS->mmioSize * 1024));
++#else
++      pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, 
(pSiS->mmioSize * 1024));
++#endif
+       pSiS->IOBaseDense = NULL;
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+       xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, 
pSiS->FbMapSize);
++#else
++      pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, 
pSiS->FbMapSize);
++#endif
+       pSiS->FbBase = pSiS->RealFbBase = NULL;
+ #ifdef SISDUALHEAD
+     }
+@@ -8859,7 +8886,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
+     }
+     pSiS->SiSFastVidCopyDone = TRUE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+@@ -9352,7 +9378,14 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
+      }
+      if(doit) {
+       sigstate = xf86BlockSIGIO();
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
++        {
++            double dx = x, dy = y;
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, 
NULL);
++            x = (int)dx;
++            y = (int)dy;
++        }
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5470000..ad2c3e3 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2874,17 +2874,18 @@ kernel mode setting (KMS).")
 (define-public xf86-video-sis
   (package
     (name "xf86-video-sis")
-    (version "0.10.4")
+    (version "0.10.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-"
+               "mirror://xorg/individual/driver/xf86-video-sis-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"))))
+           "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy"))
+        (patches (list (search-patch "xf86-video-sis-update-api.patch")))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xf86dgaproto" ,xf86dgaproto)