aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-12-19 20:38:55 -0500
committerMark H Weaver <mhw@netris.org>2014-12-19 23:28:16 -0500
commit7504007211b0b7864b2b8f4b3b1dcfbaaef2da30 (patch)
tree8b673b49fd0db2009c9648a154b32519157b0585 /gnu
parentbecb7c9987518a738950b5c40cce6456d928616a (diff)
downloadguix-7504007211b0b7864b2b8f4b3b1dcfbaaef2da30.tar.gz
guix-7504007211b0b7864b2b8f4b3b1dcfbaaef2da30.zip
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/patches/xf86-video-i128-remove-mibstore.patch23
-rw-r--r--gnu/packages/xorg.scm8
2 files changed, 28 insertions, 3 deletions
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 0000000000..b269d63473
--- /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 <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);
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 01e365585e..9a57429bff 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)))