gnu: xf86-video-trident: Update to 1.3.7.

* gnu/packages/patches/xf86-video-trident-remove-mibstore.patch: Delete
  file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/xorg.scm (xf86-video-trident): Update to 1.3.7.
  [source]: Remove patch.
This commit is contained in:
Andy Wingo 2016-02-18 21:28:30 +01:00 committed by Mark H Weaver
parent 816decebf2
commit bcd4a74039
3 changed files with 2 additions and 28 deletions

View File

@ -774,7 +774,6 @@ dist_patch_DATA = \
gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \ gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \
gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \ gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \
gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \ gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \
gnu/packages/patches/xfce4-panel-plugins.patch \ gnu/packages/patches/xfce4-panel-plugins.patch \
gnu/packages/patches/xfce4-session-fix-xflock4.patch \ gnu/packages/patches/xfce4-session-fix-xflock4.patch \

View File

@ -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-trident-1.3.6/src/trident_driver.c.~1~ 2012-07-15 22:16:00.000000000 -0400
+++ xf86-video-trident-1.3.6/src/trident_driver.c 2014-12-19 01:45:29.529410518 -0500
@@ -56,7 +56,6 @@
#include "mipointer.h"
-#include "mibstore.h"
#include "shadow.h"
#include "trident.h"
#include "trident_regs.h"
@@ -3037,7 +3036,6 @@
TridentAccelInit(pScreen);
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* Initialise cursor functions */

View File

@ -3287,7 +3287,7 @@ X server.")
(define-public xf86-video-trident (define-public xf86-video-trident
(package (package
(name "xf86-video-trident") (name "xf86-video-trident")
(version "1.3.6") (version "1.3.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3297,9 +3297,7 @@ X server.")
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a")) "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc"))))
(patches (list
(search-patch "xf86-video-trident-remove-mibstore.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("xf86dgaproto" ,xf86dgaproto) (inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))