- outdated

Changed files:
    XFree86-new-s3-headers.patch -> 1.2
    XFree86-new-s3-nodebug.patch -> 1.2
    XFree86-new-s3-pScreen.patch -> 1.2

diff --git a/XFree86-new-s3-headers.patch b/XFree86-new-s3-headers.patch
deleted file mode 100644 (file)
index 1a3ccf2..0000000
--- a/XFree86-new-s3-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- XFree86-4.3.99.902/LinuxDriver/2D/savage_video.c.orig      2003-12-24 15:32:46.000000000 +0100
-+++ XFree86-4.3.99.902/LinuxDriver/2D/savage_video.c   2003-12-24 20:04:15.781060984 +0100
-@@ -40,7 +40,10 @@
- typedef unsigned long long __u64;\r
- #endif\r
- \r
-+/* don't get system <linux/videodev2.h>, it's not sufficient */\r
-+#define __LINUX_VIDEODEV2_H\r
- #include <linux/videodev.h>\r
-+#undef  __LINUX_VIDEODEV2_H\r
- #include <linux/fcntl.h> /* for open flags*/\r
- \r
- /* v4l2 not in kernel's videodev.h*/\r

diff --git a/XFree86-new-s3-nodebug.patch b/XFree86-new-s3-nodebug.patch
deleted file mode 100644 (file)
index d9b2779..0000000
--- a/XFree86-new-s3-nodebug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN LinuxDriver.org/2D/savage_video.c LinuxDriver/2D/savage_video.c
---- LinuxDriver.org/2D/savage_video.c  2003-08-28 21:48:40.000000000 +0200
-+++ LinuxDriver/2D/savage_video.c      2003-08-28 21:49:19.000000000 +0200
-@@ -621,18 +621,15 @@
-     \r
-     switch (id) {\r
-         case FOURCC_Y211:             /* Y211 */\r
--            xf86Msg(X_INFO,"FOURCC_Y211");\r
-             srcPitch = width;\r
-             break;\r
-         case FOURCC_YV12:             /* YV12 */\r
--            xf86Msg(X_INFO,"FOURCC_YV12");\r
-             srcPitch = (width + 3) & ~3;\r
-             srcPitch2 = ((width >> 1) + 3) & ~3;            \r
-             offsetV = srcPitch * height;\r
-             offsetU = offsetV + (srcPitch2 * (height >> 1)) ;\r
-             break;\r
-         case FOURCC_I420:\r
--            xf86Msg(X_INFO,"FOURCC_I420");\r
-             srcPitch = (width + 3) & ~3;\r
-             srcPitch2 = ((width >> 1) + 3) & ~3;            \r
-             offsetU = srcPitch * height;\r

diff --git a/XFree86-new-s3-pScreen.patch b/XFree86-new-s3-pScreen.patch
deleted file mode 100644 (file)
index eb21255..0000000
--- a/XFree86-new-s3-pScreen.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- XFree86-4.3.99.16/LinuxDriver/2D/savage_video.c.orig       2003-11-24 01:54:37.000000000 +0100
-+++ XFree86-4.3.99.16/LinuxDriver/2D/savage_video.c    2003-11-25 00:45:41.793649736 +0100
-@@ -600,7 +600,7 @@
- \r
-     SavageClipVideo(\r
-         &dstBox, &x1, &x2, &y1, &y2,\r
--        REGION_EXTENTS(pScreen, clipBoxes), width, height);\r
-+        REGION_EXTENTS(pScrn->pScreen, clipBoxes), width, height);\r
- \r
-     if ((x1 >= x2) || (y1 >= y2))\r
-         return Success;\r
-@@ -701,7 +701,7 @@
- \r
-     /* update cliplist */\r
-     if (!RegionsEqual(&pPriv->clip, clipBoxes)) {\r
--        REGION_COPY(pScreen, &pPriv->clip, clipBoxes);\r
-+        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);\r
-         /* draw these */\r
-         xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);\r
-     }\r
-@@ -2146,7 +2146,7 @@
- \r
- #if 1\r
-         SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2,\r
--                        REGION_EXTENTS(pScreen, clipBoxes), width, height);\r
-+                        REGION_EXTENTS(pScrn->pScreen, clipBoxes), width, height);\r
- \r
- \r
-         drw_w = dstBox.x2 - dstBox.x1;\r
-@@ -2339,7 +2339,7 @@
- \r
-             /* update cliplist */\r
-             if(!RegionsEqual(&pPriv->clip, clipBoxes)) {\r
--                REGION_COPY(pScreen, &pPriv->clip, clipBoxes);\r
-+                REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);\r
-                 /* draw these */\r
-                 XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0,\r
-                                   REGION_NUM_RECTS(clipBoxes),\r
-@@ -2724,7 +2724,7 @@
-     dstBox.y2 = drw_y + drw_h;\r
- \r
-     SavageClipVideo(&dstBox, &x1, &x2, &y1, &y2,\r
--                      REGION_EXTENTS(pScreen, clipBoxes), \r
-+                      REGION_EXTENTS(pScrn->pScreen, clipBoxes), \r
-                     surface->width, surface->height);\r
- \r
-     if((x1 >= x2) || (y1 >= y2))\r