guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

95/116: gnu: xf86-video-i128: Update to 1.3.6.


From: Mark H. Weaver
Subject: 95/116: gnu: xf86-video-i128: Update to 1.3.6.
Date: Sat, 20 Dec 2014 04:38:55 +0000

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

commit 7504007211b0b7864b2b8f4b3b1dcfbaaef2da30
Author: Mark H Weaver <address@hidden>
Date:   Fri Dec 19 20:38:55 2014 -0500

    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.
---
 gnu-system.am                                      |    1 +
 .../patches/xf86-video-i128-remove-mibstore.patch  |   23 ++++++++++++++++++++
 gnu/packages/xorg.scm                              |    8 ++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index da561a5..cdd446b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -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
diff --git a/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch 
b/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch
new file mode 100644
index 0000000..b269d63
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch
@@ -0,0 +1,23 @@
+Removes references to mibstore.h and miInitializeBackingStore, which
+have been removed from xorg-server.  Zack Rusin <address@hidden>
+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);
+ 
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 01e3655..9a57429 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]