xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #56: 1002-delete-xv-stuff.patch

File 1002-delete-xv-stuff.patch, 1.9 KB (added by Antoine Martin, 6 years ago)

dummy randr 1.2: patch 2 Delete XV stuff

  • configure.ac 

    As far as I can tell, this was never implemented or used.

Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
---
 configure.ac       |  1 -
 src/dummy.h        | 11 -----------
 src/dummy_driver.c |  7 -------
 3 files changed, 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 005611d77ca0..e6e00433d69f 100644
    a b AC_SUBST(moduledir) 
    5656# Store the list of server defined optional extensions in REQUIRED_MODULES
    5757XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
    5858XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
    59 XORG_DRIVER_CHECK_EXT(XV, videoproto)
    6059
    6160if test "x$DGA" = xyes; then
    6261        XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)

  • src/dummy.h 

    diff --git a/src/dummy.h b/src/dummy.h
index c3fdd6efd000..c231be4c069e 100644
    a b extern void DUMMYHideCursor(ScrnInfoPtr pScrn); 
    3131/* in dummy_dga.c */
    3232Bool DUMMYDGAInit(ScreenPtr pScreen);
    3333
    34 /* in dummy_video.c */
    35 extern void DUMMYInitVideo(ScreenPtr pScreen);
    36 
    3734/* globals */
    3835typedef struct _color
    3936{
    … … typedef struct dummyRec 
    6057    int cursorFG, cursorBG;
    6158
    6259    Bool screenSaver;
    63     Bool video;
    64 #ifdef XvExtension
    65     XF86VideoAdaptorPtr overlayAdaptor;
    66 #endif
    67     int overlay;
    68     int overlay_offset;
    69     int videoKey;
    70     int interlace;
    7160    dummy_colors colors[256];
    7261    pointer* FBBase;
    7362    Bool        (*CreateWindow)() ;     /* wrapped CreateWindow */

  • src/dummy_driver.c 

    diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index e5ff4dae34f3..e3b762304d5a 100644
    a b  
    2929
    3030#include "picturestr.h"
    3131
    32 #ifdef XvExtension
    33 #include "xf86xv.h"
    34 #include <X11/extensions/Xv.h>
    35 #endif
    36 
    3732/*
    3833 * Driver data structures.
    3934 */
    … … DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) 
    624619                             | CMAP_RELOAD_ON_MODE_SWITCH))
    625620        return FALSE;
    626621
    627 /*     DUMMYInitVideo(pScreen); */
    628 
    629622    pScreen->SaveScreen = DUMMYSaveScreen;
    630623
    631624