~ruther/guix-local

7504007211b0b7864b2b8f4b3b1dcfbaaef2da30 — Mark H Weaver 11 years ago becb7c9
gnu: xf86-video-i128: Update to 1.3.6.

* gnu/packages/patches/xf86-video-i128-remove-mibstore.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-i128): Update to 1.3.6.  Add patch.
M gnu-system.am => gnu-system.am +1 -0
@@ 462,6 462,7 @@ dist_patch_DATA =						\
  gnu/packages/patches/xf86-video-ast-remove-mibstore.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	\
  gnu/packages/patches/xf86-video-openchrome-includes.patch	\
  gnu/packages/patches/xfce4-panel-plugins.patch		\
  gnu/packages/patches/xmodmap-asprintf.patch

A gnu/packages/patches/xf86-video-i128-remove-mibstore.patch => gnu/packages/patches/xf86-video-i128-remove-mibstore.patch +23 -0
@@ 0,0 1,23 @@
Removes references to mibstore.h and miInitializeBackingStore, which
have been removed from xorg-server.  Zack Rusin <zackr@vmware.com>
wrote: "It was a noop for at least 5 years and it has been removed."
See: http://patches.openembedded.org/patch/46133/

--- xf86-video-i128-1.3.6/src/i128_driver.c.~1~	2012-07-17 01:21:15.000000000 -0400
+++ xf86-video-i128-1.3.6/src/i128_driver.c	2014-12-19 00:47:16.140087736 -0500
@@ -51,7 +51,6 @@
 #include "mipointer.h"
 
 /* All drivers implementing backing store need this */
-#include "mibstore.h"
 #include "micmap.h"
 
 #include "xf86DDC.h"
@@ -1557,7 +1556,6 @@
         return FALSE;
     }
     
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +5 -3
@@ 2560,17 2560,19 @@ devices, thus making direct access unnecessary.")
(define-public xf86-video-i128
  (package
    (name "xf86-video-i128")
    (version "1.3.5")
    (version "1.3.6")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-"
               "mirror://xorg/individual/driver/xf86-video-i128-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"))))
           "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"))
        (patches (list
                  (search-patch "xf86-video-i128-remove-mibstore.patch")))))
    (build-system gnu-build-system)
    (inputs `(("xorg-server" ,xorg-server)))
    (native-inputs `(("pkg-config" ,pkg-config)))