Changeset 55196 in vbox for trunk/src/VBox

Timestamp:

Apr 10, 2015 9:03:16 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: drop EDID faking for the benefit of gnome-settings-daemon on newer X servers as we now only offer our preferred mode anyway.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• edid.c (deleted)
• vboxvideo.c (modified) (1 diff)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -168 +168 @@
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0
 vboxvideo_drv_13_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) edid.c
+vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
 
 

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -501 +501 @@
     pMode = vbox_output_add_mode(pVBox, &pModes, NULL, pVBox->pScreens[iScreen].aPreferredSize.cx,
                                  pVBox->pScreens[iScreen].aPreferredSize.cy, TRUE, FALSE);
-    VBOXEDIDSet(output, pMode);
     TRACE_EXIT();
     return pModes;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -272 +272 @@
 extern void VBOXDRICloseScreen(ScreenPtr pScreen, VBOXPtr pVBox);
 
-/* EDID generation */
-#ifdef VBOXVIDEO_13
-extern Bool VBOXEDIDSet(struct _xf86Output *output, DisplayModePtr pmode);
-#endif
-
 /* Utilities */