[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.18-dfsg-2+deb7u1

[Felix Geyer]

The following commit has been merged in the master branch:
commit 7c0bb825aa2d52fcd457793b0c000b4a989bb281
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Mar 31 20:44:52 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 66f5d6a..dd55333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.1.18-dfsg-2+deb7u1) UNRELEASED; urgency=low
+
+  * 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>  Sun, 31 Mar 2013 20:34:20 +0200
+
 virtualbox (4.1.18-dfsg-2) unstable; urgency=high
 
   [ John Paul Adrian Glaubitz ]
diff --git a/debian/patches/37-wheezy-kernel-drm.patch b/debian/patches/37-wheezy-kernel-drm.patch
new file mode 100644
index 0000000..343d1a0
--- /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
+@@ -73,6 +73,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
+ };
+@@ -85,7 +91,7 @@ int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
+     return 0;
+ #endif
+ }
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || defined(DRM_DEBIAN70)
+ /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
+ static struct file_operations driver_fops =
+ {
+@@ -109,7 +115,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)
++# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) && !defined(DRM_DEBIAN70)
+     .fops =
+     {
+         .owner = THIS_MODULE,
+@@ -126,7 +132,7 @@ static struct drm_driver driver =
+         .poll = drm_poll,
+         .fasync = drm_fasync,
+     },
+-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) || 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 640b328..f80610f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 36-fix-ftbfs-xserver-112.patch
 cve-2012-3221.patch
 CVE-2013-0420.patch
+37-wheezy-kernel-drm.patch

-- 
virtualbox Debian packaging