[arch-commits] Commit in virtualbox/trunk (11-kernel-4.5-drm-fixes.patch PKGBUILD)
Sébastien Luttringer
seblu at archlinux.org
Sun Apr 17 22:11:28 UTC 2016
Date: Monday, April 18, 2016 @ 00:11:27
Author: seblu
Revision: 171273
upgpkg: virtualbox 5.0.16-4
- remove linux-grsec suggestion for dkms packages
- use a virtual package to pull virtualbox modules
- fix FS#48598
Added:
virtualbox/trunk/11-kernel-4.5-drm-fixes.patch
Modified:
virtualbox/trunk/PKGBUILD
-------------------------------+
11-kernel-4.5-drm-fixes.patch | 55 ++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 24 ++++++++---------
2 files changed, 67 insertions(+), 12 deletions(-)
Added: 11-kernel-4.5-drm-fixes.patch
===================================================================
--- 11-kernel-4.5-drm-fixes.patch (rev 0)
+++ 11-kernel-4.5-drm-fixes.patch 2016-04-17 22:11:27 UTC (rev 171273)
@@ -0,0 +1,55 @@
+Index: src/VBox/Additions/linux/drm/vbox_drv.h
+===================================================================
+--- a/src/VBox/Additions/linux/drm/vbox_drv.h (revision 60057)
++++ b/src/VBox/Additions/linux/drm/vbox_drv.h (revision 60058)
+@@ -205,6 +205,9 @@
+
+ int vbox_framebuffer_init(struct drm_device *dev,
+ struct vbox_framebuffer *vbox_fb,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++ const
++#endif
+ struct DRM_MODE_FB_CMD *mode_cmd,
+ struct drm_gem_object *obj);
+
+Index: src/VBox/Additions/linux/drm/vbox_main.c
+===================================================================
+--- a/src/VBox/Additions/linux/drm/vbox_main.c (revision 60057)
++++ b/src/VBox/Additions/linux/drm/vbox_main.c (revision 60058)
+@@ -168,6 +168,9 @@
+
+ int vbox_framebuffer_init(struct drm_device *dev,
+ struct vbox_framebuffer *vbox_fb,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++ const
++#endif
+ struct DRM_MODE_FB_CMD *mode_cmd,
+ struct drm_gem_object *obj)
+ {
+@@ -190,6 +193,9 @@
+ static struct drm_framebuffer *
+ vbox_user_framebuffer_create(struct drm_device *dev,
+ struct drm_file *filp,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++ const
++#endif
+ struct drm_mode_fb_cmd2 *mode_cmd)
+ {
+ struct drm_gem_object *obj;
+Index: src/VBox/Additions/linux/drm/vbox_mode.c
+===================================================================
+--- a/src/VBox/Additions/linux/drm/vbox_mode.c (revision 60057)
++++ b/src/VBox/Additions/linux/drm/vbox_mode.c (revision 60058)
+@@ -409,7 +409,11 @@
+ return NULL;
+
+ drm_encoder_init(dev, &vbox_encoder->base, &vbox_enc_funcs,
+- DRM_MODE_ENCODER_DAC);
++ DRM_MODE_ENCODER_DAC
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++ , NULL
++#endif
++ );
+ drm_encoder_helper_add(&vbox_encoder->base, &vbox_enc_helper_funcs);
+
+ vbox_encoder->base.possible_crtcs = 1 << i;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-04-17 21:54:06 UTC (rev 171272)
+++ PKGBUILD 2016-04-17 22:11:27 UTC (rev 171273)
@@ -11,7 +11,7 @@
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
pkgver=5.0.16
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -65,6 +65,7 @@
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
'010-no-update.patch'
+ '11-kernel-4.5-drm-fixes.patch'
)
md5sums=('1752a485b1cb377cee5f196918cda741'
'984412a63aa9c07ddc3cfd970381d5df'
@@ -81,7 +82,8 @@
'ecfd13297d7753ebe7b8763ca5b792d9'
'd82a6f19be739341ed7f1cf4ee8070ca'
'188ea65918309f737ce28216c2b07c3b'
- 'dfa08dc682c7668c8a6f0ffc3f44fece')
+ 'dfa08dc682c7668c8a6f0ffc3f44fece'
+ '67fdd1ff4b027ea52d895183c946b962')
prepare() {
cd "VirtualBox-$pkgver"
@@ -133,7 +135,7 @@
depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python2' 'sdl'
'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
- 'virtualbox-host-dkms')
+ 'VIRTUALBOX-HOST-MODULES')
optdepends=('qt4: GUI support'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-guest-iso: Guest Additions CD image'
@@ -251,13 +253,12 @@
depends=('dkms' 'gcc' 'make')
replaces=('virtualbox-source'
'virtualbox-host-source'
- 'virtualbox-host-modules'
'virtualbox-host-modules-lts')
conflicts=('virtualbox-source' 'virtualbox-host-source')
+ provides=('VIRTUALBOX-HOST-MODULES')
optdepends=('linux-headers: build modules against Arch kernel'
'linux-lts-headers: build modules against LTS kernel'
- 'linux-zen-headers: build modules against ZEN kernel'
- 'linux-grsec-headers: build modules against GRSEC kernel')
+ 'linux-zen-headers: build modules against ZEN kernel')
install=virtualbox-host-dkms.install
install -dm755 "$pkgdir/usr/src"
@@ -279,13 +280,12 @@
depends=('dkms' 'gcc' 'make')
replaces=('virtualbox-archlinux-source'
'virtualbox-guest-source'
- 'virtualbox-guest-modules'
'virtualbox-guest-modules-lts')
+ provides=('VIRTUALBOX-GUEST-MODULES')
conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
optdepends=('linux-headers: build modules against Arch kernel'
'linux-lts-headers: build modules against LTS kernel'
- 'linux-zen-headers: build modules against ZEN kernel'
- 'linux-grsec-headers: build modules against GRSEC kernel')
+ 'linux-zen-headers: build modules against ZEN kernel')
install=virtualbox-guest-dkms.install
install -dm755 "$pkgdir/usr/src"
@@ -304,9 +304,9 @@
package_virtualbox-guest-utils() {
pkgdesc='VirtualBox Guest userspace utilities'
- depends=('virtualbox-guest-dkms' 'glibc' 'pam' 'libx11' 'libxcomposite'
+ depends=('glibc' 'pam' 'libx11' 'libxcomposite'
'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr'
- 'X-ABI-VIDEODRV_VERSION=20')
+ 'VIRTUALBOX-GUEST-MODULES' 'X-ABI-VIDEODRV_VERSION=20')
replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox')
install=virtualbox-guest-utils.install
@@ -336,7 +336,7 @@
package_virtualbox-guest-utils-nox() {
pkgdesc='VirtualBox Guest userspace utilities without X support'
- depends=('virtualbox-guest-dkms' 'glibc' 'pam')
+ depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES')
conflicts=('virtualbox-guest-utils')
install=virtualbox-guest-utils.install
More information about the arch-commits
mailing list