summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/xf86-video-i128-remove-mibstore.patch23
-rw-r--r--gnu/packages/xorg.scm5
3 files changed, 2 insertions, 27 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 508407399a..ce43db3c1d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1333,7 +1333,6 @@ dist_patch_DATA = \
%D%/packages/patches/x265-arm-flags.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
- %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
diff --git a/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch b/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch
deleted file mode 100644
index b269d63473..0000000000
--- a/gnu/packages/patches/xf86-video-i128-remove-mibstore.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 7f356c6210..12a6d3b660 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2908,7 +2908,7 @@ X server.")
(define-public xf86-video-i128
(package
(name "xf86-video-i128")
- (version "1.3.6")
+ (version "1.4.0")
(source
(origin
(method url-fetch)
@@ -2918,8 +2918,7 @@ X server.")
".tar.bz2"))
(sha256
(base32
- "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"))
- (patches (search-patches "xf86-video-i128-remove-mibstore.patch"))))
+ "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"))))
(build-system gnu-build-system)
(inputs `(("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))