[Pkg-virtualbox-commits] [virtualbox] 05/07: Fixed build failure, from Felix Geyer

[Ritesh Raj Sarraf]

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

rrs pushed a commit to branch master
in repository virtualbox.

commit bc2dc2a33fb12d292949cdc9d26557fb86721400
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Mar 10 13:14:26 2014 +0100

    Fixed build failure, from Felix Geyer
---
 debian/changelog                                   |  5 +++++
 .../39-fix-wrong-vboxvideo_drv-source.patch        | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e720581..ac5a911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 virtualbox (4.3.8-dfsg-1) unstable; urgency=medium
 
   * Team upload.
+
+  [ Gianfranco Costamagna ]
   * New upstream release, patch refresh.
 
+  [ Felix Geyer ]
+  * 39-fix-wrong-vboxvideo_drv-source.patch: fixed build failure.
+
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 10 Mar 2014 10:35:35 +0100
 
 virtualbox (4.3.6-dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/39-fix-wrong-vboxvideo_drv-source.patch b/debian/patches/39-fix-wrong-vboxvideo_drv-source.patch
new file mode 100644
index 0000000..86d9235
--- /dev/null
+++ b/debian/patches/39-fix-wrong-vboxvideo_drv-source.patch
@@ -0,0 +1,23 @@
+Description: Fixed wrong vboxvideo_drv_system_SOURCES reference.
+ Even the comment says we need at least 17
+ "Build using local X.Org headers.  We assume X.Org Server 1.7 or later."
+
+Author: Felix Geyer <fgeyer at debian.org>
+
+---
+
+Origin: debian
+Forwarded: https://www.virtualbox.org/ticket/12803
+Last-Update: <2014-03-10>
+
+--- virtualbox-4.3.8-dfsg.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ virtualbox-4.3.8-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -376,7 +376,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+         /usr/include/libdrm \
+         /usr/include/xorg \
+         /usr/include/pixman-1
+- vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_15_SOURCES)
++ vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES)
+ endif
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5b32c83..54c952d 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
+39-fix-wrong-vboxvideo_drv-source.patch

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