diff options
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-trident-remove-mibstore.patch | 23 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 8 |
3 files changed, 29 insertions, 3 deletions
diff --git a/gnu-system.am b/gnu-system.am index 448d938761..3050e61e67 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 0000000000..74c89878e7 --- /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 <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 */ diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3f6c7b9639..b3de71f54d 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))) |