[Pkg-virtualbox-commits] [virtualbox] 01/01: Fix build failure

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit 717b23a33218aa70279491d32a522407529c379a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Feb 13 16:14:14 2015 +0100

    Fix build failure
---
 debian/changelog                  |  2 ++
 debian/patches/37-fix-build.patch | 13 +++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3296169..206692f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ virtualbox (4.3.22-dfsg-1) UNRELEASED; urgency=medium
 
   * Imported Upstream release.
   * Update copyright year.
+  * d/p/37-fix-build.patch fix build, following upstream change in
+    xorg driver build.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 13 Feb 2015 10:53:56 +0100
 
diff --git a/debian/patches/37-fix-build.patch b/debian/patches/37-fix-build.patch
new file mode 100644
index 0000000..85500d3
--- /dev/null
+++ b/debian/patches/37-fix-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+index 592d65e..d13d24d 100644
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -388,7 +388,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_CFLAGS := \
+         $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
+- vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
++ vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101700000
+  vboxvideo_drv_system_INCS += \
+         $(PATH_ROOT)/src/VBox/Runtime/include \
+         /usr/include/x11 \
diff --git a/debian/patches/series b/debian/patches/series
index 5b32c83..ae622e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
+37-fix-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git