Bug#595713: virtualbox-ose: ftbfs: wrong libdrm include directory

[Michael Gilbert]

package: virtualbox-ose
severity: serious
version: 3.2.6-dfsg-2
tags: patch

hi,

when i try to build virtualbox, i get the following error:

  kBuild: Compiling VBoxOGL - 
/home/user/newhd/source/tmp5/virtualbox-ose-3.2.8-dfsg/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
  In file included from 
/home/user/newhd/source/tmp5/virtualbox-ose-3.2.8-dfsg/src/VBox/Additions/common/crOpenGL/fakedri_drv.h:29,
                 from 
/home/user/newhd/source/tmp5/virtualbox-ose-3.2.8-dfsg/src/VBox/Additions/common/crOpenGL/glx_c_exports.c:21:
  
/home/user/newhd/source/tmp5/virtualbox-ose-3.2.8-dfsg/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/drivers/dri/common/dri_util.h:53:17:
 error: drm.h: No such file or directory

the problem is using /usr/include/drm when libdrm-dev actually has its includes 
in
/usr/include/libdrm.  i've attached a patch that fixes this.

best wishes,
mike

diff -u virtualbox-ose-3.2.8-dfsg/debian/changelog virtualbox-ose-3.2.8-dfsg/debian/changelog
--- virtualbox-ose-3.2.8-dfsg/debian/changelog
+++ virtualbox-ose-3.2.8-dfsg/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox-ose (3.2.8-dfsg-2) unstable; urgency=low
+
+  * Fix drm include directory.
+
+ -- Michael Gilbert <michael.s.gilb...@gmail.com>  Sun, 05 Sep 2010 20:28:57 -0400
+
 virtualbox-ose (3.2.8-dfsg-1) unstable; urgency=low
 
   * New upstream release. (LP: #614697)
diff -u virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch
--- virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch
+++ virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch
@@ -21,7 +21,7 @@
 +	/usr/include/pixman-1 \
  	$(VBOX_MESA_INCS) \
 -	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm
++	/usr/include/libdrm
   VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
  endif
  
@@ -227,7 +227,7 @@
 +	/usr/include/x11 \
 +	/usr/include/pixman-1 \
 +	/usr/include/X11/dri \
-+	/usr/include/drm
++	/usr/include/libdrm
 +DLLS += vboxvideo_drv_$(XSERVER_VERSION)
 +
 +# required for lenny backports