aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-01-18 18:19:49 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-01-18 18:19:49 +0100
commita0029fda3bd6f8e5cd3b66aba583e4d863f1cac1 (patch)
tree7bdf4f135b87bc1e4cdda27ba1765f2ff7b762b9
parentf733e603452c46640e57b1a0de34ecef324e5711 (diff)
downloadpatches-a0029fda3bd6f8e5cd3b66aba583e4d863f1cac1.tar
patches-a0029fda3bd6f8e5cd3b66aba583e4d863f1cac1.tar.gz
gnu: xf86-video-glint: Update to 1.2.9.
* gnu/packages/xorg.scm (xf86-video-glint): Update to 1.2.9. [source]: Remove upstreamed patch. * gnu/packages/patches/xf86-video-glint-remove-mibstore.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/xf86-video-glint-remove-mibstore.patch24
-rw-r--r--gnu/packages/xorg.scm5
3 files changed, 2 insertions, 28 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index acaf3936ab..24dcd03fd4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -943,7 +943,6 @@ dist_patch_DATA = \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-ast-remove-mibstore.patch \
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
- %D%/packages/patches/xf86-video-glint-remove-mibstore.patch \
%D%/packages/patches/xf86-video-i128-remove-mibstore.patch \
%D%/packages/patches/xf86-video-intel-compat-api.patch \
%D%/packages/patches/xf86-video-intel-glibc-2.20.patch \
diff --git a/gnu/packages/patches/xf86-video-glint-remove-mibstore.patch b/gnu/packages/patches/xf86-video-glint-remove-mibstore.patch
deleted file mode 100644
index 969ed7e41e..0000000000
--- a/gnu/packages/patches/xf86-video-glint-remove-mibstore.patch
+++ /dev/null
@@ -1,24 +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-glint-1.2.8/src/glint_driver.c.~1~ 2012-07-15 22:50:47.000000000 -0400
-+++ xf86-video-glint-1.2.8/src/glint_driver.c 2014-12-19 00:42:39.162714279 -0500
-@@ -52,8 +52,6 @@
- #include "compiler.h"
- #include "mipointer.h"
-
--#include "mibstore.h"
--
- #include "pm3_regs.h"
- #include "glint_regs.h"
- #include "IBM.h"
-@@ -2904,7 +2902,6 @@
- }
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 3c8adc9e37..1a551084bd 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2720,7 +2720,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.")
(define-public xf86-video-glint
(package
(name "xf86-video-glint")
- (version "1.2.8")
+ (version "1.2.9")
(source
(origin
(method url-fetch)
@@ -2730,8 +2730,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.")
".tar.bz2"))
(sha256
(base32
- "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5"))
- (patches (search-patches "xf86-video-glint-remove-mibstore.patch"))))
+ "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"))))
(build-system gnu-build-system)
(inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))