CVS commit: xsrc/external/mit

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Tue Aug  2 09:37:08 UTC 2011

Modified Files:
        xsrc/external/mit/xf86-video-apm/dist/src: apm_video.c
        xsrc/external/mit/xf86-video-openchrome/dist/src: via_video.c

Log Message:
disable ReputImage API call -- these drivers use an older version
of this call that no longer matches the caller.

XXX:  most drivers simply removed the call like this change does,
      but not all.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
    xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c
diff -u xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c:1.1.1.2 xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c:1.2
--- xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c:1.1.1.2	Wed Jun 10 00:46:17 2009
+++ xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c	Tue Aug  2 09:37:08 2011
@@ -336,7 +336,7 @@
     adapt->GetPortAttribute = ApmGetPortAttribute;
     adapt->QueryBestSize = ApmQueryBestSize;
     adapt->PutImage = A(PutImage);
-    adapt->ReputImage = A(ReputImage);
+    adapt->ReputImage = NULL;
     adapt->QueryImageAttributes = ApmQueryImageAttributes;
 
     pPriv->brightness = 0;

Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.2 xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.3
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c:1.2	Sun May 15 23:16:15 2011
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_video.c	Tue Aug  2 09:37:08 2011
@@ -765,6 +765,7 @@
 }
 
 
+#if 0
 /*
  * This one gets called, for example, on panning.
  */
@@ -824,6 +825,7 @@
     viaXvError(pScrn, pPriv, xve_none);
     return Success;
 }
+#endif
 
 static unsigned
 viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
@@ -885,7 +887,7 @@
         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
         viaAdaptPtr[i]->PutImage = viaPutImage;
-        viaAdaptPtr[i]->ReputImage = viaReputImage;
+        viaAdaptPtr[i]->ReputImage = NULL;
         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
         for (j = 0; j < numPorts; ++j) {
             viaPortPriv[j].dmaBounceBuffer = NULL;