diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2012-05-01 20:22:22 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2012-05-01 20:22:22 +0200 |
| commit | d96e63fb78db30367c880db91d59adff82e3278c (patch) | |
| tree | 0307da9a601b2f8584a3a8f9e999070f262e9aeb | |
| parent | 8f225d13bcba9d41965e22e68cabf62927c45848 (diff) | |
| download | virtualbox-d96e63fb78db30367c880db91d59adff82e3278c.tar.gz | |
Fix FTBFS with X Server 1.12.
Closes: #671061
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/36-fix-ftbfs-xserver-112.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8c9d7a62e..c687486f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ virtualbox (4.1.14-dfsg-1) UNRELEASED; urgency=low * New upstream release. - Drop 36-tarball-respin.patch + * Fix FTBFS with X Server 1.12. (Closes: #671061) + - Add 36-fix-ftbfs-xserver-112.patch -- Felix Geyer <debfx-pkg@fobos.de> Mon, 30 Apr 2012 23:54:31 +0200 diff --git a/debian/patches/36-fix-ftbfs-xserver-112.patch b/debian/patches/36-fix-ftbfs-xserver-112.patch new file mode 100644 index 000000000..9c1267c5f --- /dev/null +++ b/debian/patches/36-fix-ftbfs-xserver-112.patch @@ -0,0 +1,14 @@ +Description: Fix FTBFS with X Server 1.12. +Author: Felix Geyer <debfx-pkg@fobos.de> +Bug-Debian: http://bugs.debian.org/671061 + +--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +@@ -29,6 +29,7 @@ + #include <dlfcn.h> + #include <elf.h> + #include <unistd.h> ++#include "xorg-server.h" + #include "xf86.h" + + #define VBOX_NO_MESA_PATCH_REPORTS diff --git a/debian/patches/series b/debian/patches/series index 32a41e5fe..45f702502 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 30-usb-warning-filters.patch 32-disable-guest-version-check.patch 35-libvdeplug-soname.patch +36-fix-ftbfs-xserver-112.patch |