summaryrefslogtreecommitdiff
path: root/testing/xf86-video-mach64/mach64-fix-pixmap.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/xf86-video-mach64/mach64-fix-pixmap.patch')
-rw-r--r--testing/xf86-video-mach64/mach64-fix-pixmap.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/testing/xf86-video-mach64/mach64-fix-pixmap.patch b/testing/xf86-video-mach64/mach64-fix-pixmap.patch
deleted file mode 100644
index 6f1a64748..000000000
--- a/testing/xf86-video-mach64/mach64-fix-pixmap.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/aticonsole.c b/src/aticonsole.c
-index 1be147e..6e742d9 100644
---- a/src/aticonsole.c
-+++ b/src/aticonsole.c
-@@ -28,6 +28,7 @@
- #include "config.h"
- #endif
-
-+#include "xorgVersion.h"
- #include "ati.h"
- #include "aticonsole.h"
- #include "atii2c.h"
-@@ -689,7 +690,9 @@ ATIEnterVT
- ScreenPtr pScreen = pScreenInfo->pScreen;
- ATIPtr pATI = ATIPTR(pScreenInfo);
- PixmapPtr pScreenPixmap;
-+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
- DevUnion PixmapPrivate;
-+#endif
- Bool Entered;
-
- if (!ATIEnterGraphics(NULL, pScreenInfo, pATI))
-@@ -714,19 +717,24 @@ ATIEnterVT
- }
-
- pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen);
-+
-+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
- PixmapPrivate = pScreenPixmap->devPrivate;
- if (!PixmapPrivate.ptr)
- pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate;
-+#endif
-
- /* Tell framebuffer about remapped aperture */
- Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap,
- -1, -1, -1, -1, -1, pATI->pMemory);
-
-+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
- if (!PixmapPrivate.ptr)
- {
- pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate;
- pScreenPixmap->devPrivate.ptr = NULL;
- }
-+#endif
-
- #ifdef XF86DRI_DEVEL
-