xfree86: xv: unexport XF86XvScreenKey

Not used by any drivers, and the include is private anyways.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xfree86/common/meson.build

@@ -61,7 +61,7 @@ endif
 
 if build_xv
     srcs_xorg_common += ['xf86xv.c', 'xf86xvmc.c']
-    xorg_sdk_headers += ['xf86xv.h', 'xf86xvmc.h', 'xf86xvpriv.h']
+    xorg_sdk_headers += ['xf86xv.h', 'xf86xvmc.h']
 endif
 
 if build_udev

hw/xfree86/common/xf86xv.c

@@ -1719,52 +1719,6 @@ xf86XVFillKeyHelper(ScreenPtr pScreen, CARD32 key, RegionPtr fillboxes)
     xf86XVFillKeyHelperDrawable(&pScreen->root->drawable, key, fillboxes);
 }
 
-void
-xf86XVFillKeyHelperPort(DrawablePtr pDraw, void *data, CARD32 key,
-                        RegionPtr clipboxes, Bool fillEverything)
-{
-    WindowPtr pWin = (WindowPtr) pDraw;
-    XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
-    XvPortRecPrivatePtr portPriv = NULL;
-    RegionRec reg;
-    RegionPtr fillboxes;
-
-    while (WinPriv) {
-        XvPortRecPrivatePtr pPriv = WinPriv->PortRec;
-
-        if (data == pPriv->DevPriv.ptr) {
-            portPriv = pPriv;
-            break;
-        }
-
-        WinPriv = WinPriv->next;
-    }
-
-    if (!portPriv)
-        return;
-
-    if (!portPriv->ckeyFilled)
-        portPriv->ckeyFilled = RegionCreate(NULL, 0);
-
-    if (!fillEverything) {
-        RegionNull(&reg);
-        fillboxes = ®
-        RegionSubtract(fillboxes, clipboxes, portPriv->ckeyFilled);
-
-        if (!RegionNotEmpty(fillboxes))
-            goto out;
-    }
-    else
-        fillboxes = clipboxes;
-
-    RegionCopy(portPriv->ckeyFilled, clipboxes);
-
-    xf86XVFillKeyHelperDrawable(pDraw, key, fillboxes);
- out:
-    if (!fillEverything)
-        RegionUninit(&reg);
-}
-
 /* xf86XVClipVideoHelper -
 
    Takes the dst box in standard X BoxRec form (top and left

hw/xfree86/common/xf86xv.h

@@ -199,11 +199,6 @@ extern _X_EXPORT void
 
 xf86XVFillKeyHelperDrawable(DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);
 
-extern _X_EXPORT void
-
-xf86XVFillKeyHelperPort(DrawablePtr pDraw, void *data, CARD32 key,
-                        RegionPtr clipboxes, Bool fillEverything);
-
 extern _X_EXPORT Bool
 
 xf86XVClipVideoHelper(BoxPtr dst,

hw/xfree86/common/xf86xvpriv.h

@@ -34,7 +34,7 @@
 
 /*** These are DDX layer privates ***/
 
-extern _X_EXPORT DevPrivateKey XF86XvScreenKey;
+extern DevPrivateKey XF86XvScreenKey;
 
 typedef struct {
     DestroyWindowProcPtr DestroyWindow;

hw/xfree86/sdksyms.sh

@@ -135,7 +135,6 @@ cat > sdksyms.c << EOF
 #ifdef XV
 # include "xf86xv.h"
 # include "xf86xvmc.h"
-# include "xf86xvpriv.h"
 #endif
 #include "xorgVersion.h"
 #if defined(__sparc__) || defined(__sparc)