fix vboxvideo kernel panic with 2.6.33, backporting trunk patch

Package-Manager: portage-2.2_rc64/cvs/Linux x86_64

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index d95ee645eb55da03e0582deffdc58ea0cb61c1e6..49540318ceb0f9c435b0201bc3d65966d9aeb26a 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.31 2010/02/13 23:52:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.32 2010/03/11 12:49:22 lxnay Exp $
+
+*xf86-video-virtualbox-3.1.4-r1 (11 Mar 2010)
+
+  11 Mar 2010; Fabio Erculiani <lxnay@gentoo.org>
+  -xf86-video-virtualbox-3.1.4.ebuild,
+  +xf86-video-virtualbox-3.1.4-r1.ebuild,
+  +files/xf86-video-virtualbox-3.1.4-2.6.33.patch:
+  fix vboxvideo kernel panic with 2.6.33, backporting trunk patch
 
 *xf86-video-virtualbox-3.1.4 (13 Feb 2010)
 

diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index b90ff48bf776a27f464c2bcb1a2f865fad75e333..f6a81a75c64ee52a3aee108c185063af6945ab12 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -3,6 +3,7 @@ AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53
 AUX xf86-video-virtualbox-3-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30ca9d3a33fb3 SHA1 52d13e385d75d55aac64697eb715421df856c728 SHA256 ff777086ae7d0337e59066b4f7d6538823ca1804b57906e07cd562c8a48e054f
 AUX xf86-video-virtualbox-3-vboxvideo_drm.makefile 6810 RMD160 55758e73adef9924a9bcea5da465fc93a1ea03df SHA1 fce332db7b3f9fd337b26e2165441aaeb2193b48 SHA256 ccf3eaaa8e1ed4a9c816a9a944c3ce6f289d002f03ce72d796500d209e26ae7e
 AUX xf86-video-virtualbox-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
+AUX xf86-video-virtualbox-3.1.4-2.6.33.patch 606 RMD160 9721f9b54193a19355175c74834542ebac28cdf5 SHA1 42a7c8ed80094819bd479ace545501ea38d0cd79 SHA256 dd8a959ec28d2ef8d7fcc853f5253f20d1e45dd8c9a3cd2c85586611610ff160
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
 DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
 DIST VirtualBox-3.1.2-OSE.tar.bz2 55553394 RMD160 be66ad7198f04c71471eeffd5b95ff9d5078eab7 SHA1 ac85e5d098684080ce0571406d741f3db03064b8 SHA256 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
@@ -10,6 +11,6 @@ DIST VirtualBox-3.1.4-OSE.tar.bz2 55850055 RMD160 b1f38821a6ea8d501402f853e5c998
 EBUILD xf86-video-virtualbox-3.0.12.ebuild 3685 RMD160 75c3c9c2a5672421061a8a60dc4a8185549de64e SHA1 b78cfcfdb27362ea13faf800d9127b687f258f88 SHA256 30c0d5e5c3319f838f314e4fae6da65e11d1363496685e7a52defaa84500c96a
 EBUILD xf86-video-virtualbox-3.1.0.ebuild 3687 RMD160 4de3ba7ace70e734405a7538f7c9114791a27c1c SHA1 172caffb0efc16f83de97e25390ad86ac64dc22d SHA256 c1bfd4b21e4e446f1d009ecddb033e87d5b4be5897ad3d491d6720442872dec8
 EBUILD xf86-video-virtualbox-3.1.2.ebuild 3911 RMD160 34f530bf76e730c028172797c83efb7fe492117c SHA1 db01944dda71c32c0f4493ca2fc08830491d4bbf SHA256 05941269fef3eac060ea1f692f4e7b518f1018dc09763be8f6310fd136fb1a94
-EBUILD xf86-video-virtualbox-3.1.4.ebuild 3911 RMD160 fedd64ce39408bcd07a4359c6b7b086cab81c5ba SHA1 48a97551b3b39047dde715343c24195af5c050ad SHA256 3e19be66b6e10eca6db12f098912857f014a2c902c4b82db1d56494bf0525a8e
-MISC ChangeLog 8825 RMD160 aee4bd8cd221b4f7d0e42b3b983388177273f053 SHA1 5c80c37e26345e8dc5cd2f75249f30d6c34e209f SHA256 8916015d25569369f5fc38eb5c9f4054bfdc53148669713107cc91b476e0228e
+EBUILD xf86-video-virtualbox-3.1.4-r1.ebuild 4105 RMD160 45e01f992d41ad7a3b6cba06ed9639ac7c8c4c1f SHA1 df8dbc69133fcf0e430165c24f93923056cea4f0 SHA256 56cdafb8cfd5cdc2bea3fd29fe5110a9e4f920f7d57db6888089a29c35e5ad91
+MISC ChangeLog 9119 RMD160 f534589634e09db19d3e14399d50a1340e604d4b SHA1 6e8ab068ae72504c8caeefc22efafe0807dfb586 SHA256 26044e630f034d3f4937b333a78b0d9c50d8f18eccc9ffaf2dd2406935eaef87
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9

diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch
new file mode 100644 (file)
index 0000000..c7c0092
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch
@@ -0,0 +1,16 @@
+--- VirtualBox-3.1.4_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c
++++ VirtualBox-3.1.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+@@ -87,7 +87,13 @@ static struct drm_driver driver = {
+                .owner = THIS_MODULE,
+                .open = drm_open,
+                .release = drm_release,
++               /* This was changed with Linux 2.6.33 but Fedora backported this
++                * change to their 2.6.32 kernel. */
++#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33)
++               .unlocked_ioctl = drm_ioctl,
++#else
+                .ioctl = drm_ioctl,
++#endif
+                .mmap = drm_mmap,
+                .poll = drm_poll,
+                .fasync = drm_fasync,

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild
similarity index 88%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild
index 8c9665275ce2cc5afc732e42a57cd10311718463..64428e10e5e73d558eeafac8dd918fe4b1b2a3f7 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4.ebuild,v 1.1 2010/02/13 23:52:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild,v 1.1 2010/03/11 12:49:22 lxnay Exp $
 
 EAPI=2
 
@@ -50,18 +50,19 @@ pkg_setup() {
                BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 }
 
-src_unpack() {
-               unpack ${A}
+src_prepare() {
+
+               # 2.6.33 support, backported patch
+               # See http://www.virtualbox.org/ticket/6198
+               epatch "${FILESDIR}"/${P}-2.6.33.patch
 
                # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-               cp -a "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/drm \
-               "${WORKDIR}/vboxvideo_drm"
+               cp -a "${WORKDIR}/${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/drm \
+               "${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory"
                cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-               "${WORKDIR}/vboxvideo_drm/Makefile"
-}
+               "${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile"
 
-src_prepare() {
-               if kernel_is -ge 2 6 33 ; then
+               if kernel_is -ge 2 6 33; then
                        # evil patch for new kernels - header moved
                        grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
                fi