Changeset 55559 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Apr 30, 2015 2:55:23 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99927

Message:

Additions/x11/vboxvideo: print the subversion revision to the X.Org log file.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (2 diffs)
• vboxvideo.c (modified) (3 diffs)

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

@@ -47 +47 @@
         $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+
+vboxvideo.c_DEPS = $(VBOX_SVN_REV_KMK)
 
 #
@@ -382 +384 @@
 vboxvideo_drv_117_SOURCES := $(vboxvideo_drv_17_SOURCES)
 
-
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.

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

@@ -60 +60 @@
 #include "version-generated.h"
 #include "product-generated.h"
+#include "revision-generated.h"
 
 /* Basic definitions and functions needed by all drivers. */
@@ -340 +341 @@
      * See the work-around in PreInit. */
     xf86RandR12GetOriginalVirtualSize(pScrn, &originalX, &originalY);
-    VBVXASSERT(originalX == VBOX_VIDEO_MAX_VIRTUAL && originalY == VBOX_VIDEO_MAX_VIRTUAL, (""));
+    VBVXASSERT(originalX == VBOX_VIDEO_MAX_VIRTUAL && originalY == VBOX_VIDEO_MAX_VIRTUAL, ("OriginalSize=%dx%d",
+               originalX, originalY));
     for (i = cFirst; i < cLast; ++i)
         if (pVBox->pScreens[i].paCrtcs->mode.HDisplay != 0 && pVBox->pScreens[i].paCrtcs->mode.VDisplay != 0)
@@ -824 +826 @@
         return (FALSE);
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-               "VirtualBox guest additions video driver version "
-               VBOX_VERSION_STRING "\n");
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VirtualBox guest additions video driver version " VBOX_VERSION_STRING "r%d\n",
+               VBOX_SVN_REV);
 
     /* Get our private data from the ScrnInfoRec structure. */