hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically be…

nx-X11/programs/Xserver/Xext/Imakefile

@@ -48,7 +48,10 @@ XF86BIGFOBJS = xf86bigfont.o
 #endif
 #endif
 
-#if BuildXvExt
+#if BuildXvExt && ( (defined(NXAgentServer) && NXAgentServer) && !defined(SunArchitecture) && !defined(cygwinArchitecture) )
+      XVSRCS = xvmain.c xvmc.c
+      XVOBJS = xvmain.o xvmc.o
+#elif BuildXvExt
       XVSRCS = xvmain.c xvdisp.c xvmc.c
       XVOBJS = xvmain.o xvdisp.o xvmc.o
 #endif

nx-X11/programs/Xserver/Xext/xvdisp.c

@@ -224,6 +224,8 @@ static int SWriteImageFormatInfo(ClientPtr, xvImageFormatInfo*);
 **
 */
 
+#if !defined(NXAGENT_SERVER) || defined(__sun) || defined(__CYGWIN__)
+
 int
 ProcXvDispatch(ClientPtr client)
 {
@@ -351,6 +353,8 @@ SProcXvDispatch(ClientPtr client)
 	}
     }
 }
+#endif /* !defined(NXAGENT_SERVER) || defined(__sun) || defined(__CYGWIN__) */
+
 
 static int
 ProcXvQueryExtension(ClientPtr client)