[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
111/116: gnu: xf86-video-trident: Update to 1.3.6.
From: |
Mark H. Weaver |
Subject: |
111/116: gnu: xf86-video-trident: Update to 1.3.6. |
Date: |
Sat, 20 Dec 2014 04:39:02 +0000 |
mhw pushed a commit to branch xorg-updates
in repository guix.
commit d0088ad82a9683c4c8fc02fb6f056c9d32e4e8f2
Author: Mark H Weaver <address@hidden>
Date: Fri Dec 19 21:23:13 2014 -0500
gnu: xf86-video-trident: Update to 1.3.6.
* gnu/packages/patches/xf86-video-trident-remove-mibstore.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-trident): Update to 1.3.6. Add patch.
---
gnu-system.am | 1 +
.../xf86-video-trident-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 448d938..3050e61 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -474,6 +474,7 @@ dist_patch_DATA =
\
gnu/packages/patches/xf86-video-sis-update-api.patch \
gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch \
gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \
gnu/packages/patches/xfce4-panel-plugins.patch \
gnu/packages/patches/xmodmap-asprintf.patch
diff --git a/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch
b/gnu/packages/patches/xf86-video-trident-remove-mibstore.patch
new file mode 100644
index 0000000..74c8987
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-trident-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-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 */
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 3f6c7b9..b3de71f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2997,17 +2997,19 @@ kernel mode setting (KMS).")
(define-public xf86-video-trident
(package
(name "xf86-video-trident")
- (version "1.3.5")
+ (version "1.3.6")
(source
(origin
(method url-fetch)
(uri (string-append
- "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-"
+ "mirror://xorg/individual/driver/xf86-video-trident-"
version
".tar.bz2"))
(sha256
(base32
- "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"))))
+ "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a"))
+ (patches (list
+ (search-patch "xf86-video-trident-remove-mibstore.patch")))))
(build-system gnu-build-system)
(inputs `(("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)))
- 98/116: gnu: xf86-video-mga: Update to 1.6.3., (continued)
- 98/116: gnu: xf86-video-mga: Update to 1.6.3., Mark H. Weaver, 2014/12/19
- 94/116: gnu: xf86-video-glint: Update to 1.2.8., Mark H. Weaver, 2014/12/19
- 106/116: gnu: xf86-video-modesetting: Now uses the same libdrm as mesa., Mark H. Weaver, 2014/12/19
- 100/116: gnu: xf86-video-nv: Update to 2.1.20., Mark H. Weaver, 2014/12/19
- 101/116: gnu: xf86-video-openchrome: Update to 0.3.3., Mark H. Weaver, 2014/12/19
- 107/116: gnu: xf86-video-suncg6: Update to 1.1.2., Mark H. Weaver, 2014/12/19
- 104/116: gnu: xf86-video-siliconmotion: Update to 1.7.7., Mark H. Weaver, 2014/12/19
- 108/116: gnu: xf86-video-sunffb: Update to 1.2.2., Mark H. Weaver, 2014/12/19
- 109/116: gnu: xf86-video-tdfx: Update to 1.4.5., Mark H. Weaver, 2014/12/19
- 110/116: gnu: xf86-video-tga: Update to 1.2.2., Mark H. Weaver, 2014/12/19
- 111/116: gnu: xf86-video-trident: Update to 1.3.6.,
Mark H. Weaver <=
- 112/116: gnu: xf86-video-vesa: Update to 2.3.3., Mark H. Weaver, 2014/12/19
- 115/116: gnu: xorg-server: Update to 1.16.2.901, with many security fixes., Mark H. Weaver, 2014/12/19
- 114/116: gnu: xf86-video-voodoo: Update to 1.2.5., Mark H. Weaver, 2014/12/19
- 105/116: gnu: xf86-video-sis: Update to 0.10.7., Mark H. Weaver, 2014/12/19
- 113/116: gnu: xf86-video-vmware: Update to 13.0.2., Mark H. Weaver, 2014/12/19
- 102/116: gnu: xf86-video-r128: Update to 6.9.2., Mark H. Weaver, 2014/12/19
- 116/116: gnu: Consistently use modular xorg source URIs in xorg.scm., Mark H. Weaver, 2014/12/19