Skip to content

Commit f1798d3

Browse files
committed
Drop DGA extension support
It appears to be broken forever. Since nobody complained, it looks like nobody actually need it. Drop it. See discussion at QubesOS#233
1 parent 9654fd0 commit f1798d3

File tree

5 files changed

+0
-203
lines changed

5 files changed

+0
-203
lines changed

xf86-video-dummy/configure.ac

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ LT_INIT
4444
AH_TOP([#include "xorg-server.h"])
4545

4646
# Define a configure option for an alternate module directory
47-
AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: yes)]), [DGA=$enableval], [DGA=yes])
4847
AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
4948
[ moduledir="$withval" ],
5049
[ moduledir="$libdir/xorg/modules" ])
@@ -56,13 +55,6 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
5655
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
5756
XORG_DRIVER_CHECK_EXT(XV, videoproto)
5857

59-
if test "x$DGA" = xyes; then
60-
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
61-
AC_DEFINE(USE_DGA, 1, [Support DGA extension])
62-
fi
63-
AC_SUBST([DGA])
64-
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
65-
6658
# Obtain compiler/linker options for the driver dependencies
6759
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
6860

xf86-video-dummy/src/Makefile.am

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,3 @@ dummyqbs_drv_la_SOURCES = \
3939
dummy_driver.c \
4040
dummy.h \
4141
../../gui-agent/list.c
42-
43-
if DGA
44-
dummyqbs_drv_la_SOURCES += \
45-
dummy_dga.c
46-
endif

xf86-video-dummy/src/dummy.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ extern Bool DUMMYCursorInit(ScreenPtr pScrn);
3434
extern void DUMMYShowCursor(ScrnInfoPtr pScrn);
3535
extern void DUMMYHideCursor(ScrnInfoPtr pScrn);
3636

37-
/* in dummy_dga.c */
38-
Bool DUMMYDGAInit(ScreenPtr pScreen);
39-
4037
/* in dummy_video.c */
4138
extern void DUMMYInitVideo(ScreenPtr pScreen);
4239

@@ -53,10 +50,6 @@ struct gbm_bo;
5350

5451
typedef struct dummyRec
5552
{
56-
DGAModePtr DGAModes;
57-
int numDGAModes;
58-
Bool DGAactive;
59-
int DGAViewportStatus;
6053
/* options */
6154
OptionInfoPtr Options;
6255
Bool swCursor;

xf86-video-dummy/src/dummy_dga.c

Lines changed: 0 additions & 175 deletions
This file was deleted.

xf86-video-dummy/src/dummy_driver.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
#include <X11/Xproto.h>
4949
#include "scrnintstr.h"
5050
#include "servermd.h"
51-
#ifdef USE_DGA
52-
#define _XF86DGA_SERVER_
53-
#include <X11/extensions/xf86dgaproto.h>
54-
#endif
5551

5652
/* glamor support */
5753
#define GLAMOR_FOR_XORG
@@ -1126,10 +1122,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
11261122
dPtr->CreateScreenResources = pScreen->CreateScreenResources;
11271123
pScreen->CreateScreenResources = qubes_create_screen_resources;
11281124

1129-
#ifdef USE_DGA
1130-
DUMMYDGAInit(pScreen);
1131-
#endif
1132-
11331125
/* initialize XRANDR */
11341126
xf86CrtcConfigInit(pScrn, &DUMMYCrtcConfigFuncs);
11351127
/* FIXME */

0 commit comments

Comments
 (0)