mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 06:18:07 -05:00
fc7a0cf678
* gnu/packages/patches/xf86-video-nv-remove-mibstore.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/xorg.scm (xf86-video-nv): Update to 2.1.20. Add patch.
72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
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/
|
|
|
|
diff -ru xf86-video-nv-2.1.20.orig/src/g80_driver.c xf86-video-nv-2.1.20/src/g80_driver.c
|
|
--- xf86-video-nv-2.1.20.orig/src/g80_driver.c 2012-07-17 02:47:02.000000000 -0400
|
|
+++ xf86-video-nv-2.1.20/src/g80_driver.c 2014-12-17 10:11:42.197579082 -0500
|
|
@@ -34,7 +34,6 @@
|
|
#include <xf86Resources.h>
|
|
#endif
|
|
#include <mipointer.h>
|
|
-#include <mibstore.h>
|
|
#include <micmap.h>
|
|
#include <xf86cmap.h>
|
|
#include <fb.h>
|
|
@@ -833,7 +832,6 @@
|
|
}
|
|
}
|
|
|
|
- miInitializeBackingStore(pScreen);
|
|
xf86SetBackingStore(pScreen);
|
|
xf86SetSilkenMouse(pScreen);
|
|
|
|
diff -ru xf86-video-nv-2.1.20.orig/src/nv_driver.c xf86-video-nv-2.1.20/src/nv_driver.c
|
|
--- xf86-video-nv-2.1.20.orig/src/nv_driver.c 2012-07-17 02:47:02.000000000 -0400
|
|
+++ xf86-video-nv-2.1.20/src/nv_driver.c 2014-12-17 10:11:39.037563413 -0500
|
|
@@ -2550,7 +2550,6 @@
|
|
if (!pNv->NoAccel)
|
|
NVAccelInit(pScreen);
|
|
|
|
- miInitializeBackingStore(pScreen);
|
|
xf86SetBackingStore(pScreen);
|
|
xf86SetSilkenMouse(pScreen);
|
|
|
|
diff -ru xf86-video-nv-2.1.20.orig/src/nv_include.h xf86-video-nv-2.1.20/src/nv_include.h
|
|
--- xf86-video-nv-2.1.20.orig/src/nv_include.h 2012-07-17 02:48:19.000000000 -0400
|
|
+++ xf86-video-nv-2.1.20/src/nv_include.h 2014-12-17 10:11:22.089479372 -0500
|
|
@@ -24,9 +24,6 @@
|
|
/* All drivers initialising the SW cursor need this */
|
|
#include "mipointer.h"
|
|
|
|
-/* All drivers implementing backing store need this */
|
|
-#include "mibstore.h"
|
|
-
|
|
#include "micmap.h"
|
|
|
|
#include "xf86DDC.h"
|
|
diff -ru xf86-video-nv-2.1.20.orig/src/riva_driver.c xf86-video-nv-2.1.20/src/riva_driver.c
|
|
--- xf86-video-nv-2.1.20.orig/src/riva_driver.c 2012-07-17 02:47:02.000000000 -0400
|
|
+++ xf86-video-nv-2.1.20/src/riva_driver.c 2014-12-17 10:11:31.101524060 -0500
|
|
@@ -1168,7 +1168,6 @@
|
|
if (!pRiva->NoAccel)
|
|
RivaAccelInit(pScreen);
|
|
|
|
- miInitializeBackingStore(pScreen);
|
|
xf86SetBackingStore(pScreen);
|
|
xf86SetSilkenMouse(pScreen);
|
|
|
|
diff -ru xf86-video-nv-2.1.20.orig/src/riva_include.h xf86-video-nv-2.1.20/src/riva_include.h
|
|
--- xf86-video-nv-2.1.20.orig/src/riva_include.h 2012-07-17 02:48:45.000000000 -0400
|
|
+++ xf86-video-nv-2.1.20/src/riva_include.h 2014-12-17 10:11:12.229430478 -0500
|
|
@@ -22,9 +22,6 @@
|
|
/* All drivers initialising the SW cursor need this */
|
|
#include "mipointer.h"
|
|
|
|
-/* All drivers implementing backing store need this */
|
|
-#include "mibstore.h"
|
|
-
|
|
#include "micmap.h"
|
|
|
|
#include "xf86DDC.h"
|