[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-39-gd51bd58

[Felix Geyer]

The following commit has been merged in the experimental branch:
commit 6c0282b29117f37d12d779102ef0fe1c4adb9e71
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Mar 31 18:22:06 2013 +0200

    Fix build failure with the Debian wheezy kernel
    
    which backports the drm subsystem from Linux 3.4.
    
    Closes: #703358

diff --git a/debian/changelog b/debian/changelog
index 79f5faf..3e44d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ virtualbox (4.2.10-dfsg-1) experimental; urgency=low
   * Update man pages. (Closes: #680053)
   * Add 36-python-multiarch.patch from Rico Tzschichholz to fix detection of
     python in multiarch paths using pkg-config.
+  * Fix build failure with the Debian wheezy kernel which backports the drm
+    subsystem from Linux 3.4. (Closes: #703358)
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 07 Mar 2013 00:09:33 +0100
 
diff --git a/debian/patches/37-wheezy-kernel-drm.patch b/debian/patches/37-wheezy-kernel-drm.patch
new file mode 100644
index 0000000..dc74d04
--- /dev/null
+++ b/debian/patches/37-wheezy-kernel-drm.patch
@@ -0,0 +1,47 @@
+Description: Fix build failure with the Debian wheezy kernel which backports the drm subsystem from Linux 3.4.
+Bug-Debian: http://bugs.debian.org/703358
+Author: Felix Geyer <fgeyer at debian.org>
+
+diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+--- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c
++++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+@@ -76,6 +76,12 @@
+ #include "drm/drmP.h"
+ #include "vboxvideo_drm.h"
+ 
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#  ifdef DRM_IOCTL_MODE_GETPLANE
++#   define DRM_DEBIAN70
++#  endif
++# endif
++
+ static struct pci_device_id pciidlist[] = {
+         vboxvideo_PCI_IDS
+ };
+@@ -88,7 +94,7 @@ int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
+     return 0;
+ #endif
+ }
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN70)
+ /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
+ static struct file_operations driver_fops =
+ {
+@@ -114,7 +120,7 @@ static struct drm_driver driver =
+     .get_map_ofs = drm_core_get_map_ofs,
+     .get_reg_ofs = drm_core_get_reg_ofs,
+ #endif
+-# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63)
++# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63) && !defined(DRM_DEBIAN70)
+     .fops =
+     {
+         .owner = THIS_MODULE,
+@@ -131,7 +137,7 @@ static struct drm_driver driver =
+         .poll = drm_poll,
+         .fasync = drm_fasync,
+     },
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) */
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN70) */
+     .fops = &driver_fops,
+ #endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
diff --git a/debian/patches/series b/debian/patches/series
index 4b67657..e29a2cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-python-multiarch.patch
+37-wheezy-kernel-drm.patch

-- 
virtualbox Debian packaging