[arch-commits] Commit in virtualbox/trunk (11-kernel-4.5-drm-fixes.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Saturday, April 23, 2016 @ 18:02:08
  Author: seblu
Revision: 171631

upgpkg: virtualbox 5.0.18-1

Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/11-kernel-4.5-drm-fixes.patch

-------------------------------+
 11-kernel-4.5-drm-fixes.patch |   55 ----------------------------------------
 PKGBUILD                      |   10 ++-----
 2 files changed, 4 insertions(+), 61 deletions(-)

Deleted: 11-kernel-4.5-drm-fixes.patch
===================================================================
--- 11-kernel-4.5-drm-fixes.patch	2016-04-23 15:44:43 UTC (rev 171630)
+++ 11-kernel-4.5-drm-fixes.patch	2016-04-23 16:02:08 UTC (rev 171631)
@@ -1,55 +0,0 @@
-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-23 15:44:43 UTC (rev 171630)
+++ PKGBUILD	2016-04-23 16:02:08 UTC (rev 171631)
@@ -10,8 +10,8 @@
          'virtualbox-guest-utils'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
-pkgver=5.0.16
-pkgrel=4
+pkgver=5.0.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -65,9 +65,8 @@
         '006-rdesktop-vrdp-keymap-path.patch'
         '007-python2-path.patch'
         '010-no-update.patch'
-        '11-kernel-4.5-drm-fixes.patch'
         )
-md5sums=('1752a485b1cb377cee5f196918cda741'
+md5sums=('5d57e400f4ab75696510aef308f6c7a9'
          '984412a63aa9c07ddc3cfd970381d5df'
          '4833c8e0524fd2272b24ba0d94aef006'
          '6e2722bfd7013c1b0174382626ac1b8d'
@@ -82,8 +81,7 @@
          'ecfd13297d7753ebe7b8763ca5b792d9'
          'd82a6f19be739341ed7f1cf4ee8070ca'
          '188ea65918309f737ce28216c2b07c3b'
-         'dfa08dc682c7668c8a6f0ffc3f44fece'
-         '67fdd1ff4b027ea52d895183c946b962')
+         'dfa08dc682c7668c8a6f0ffc3f44fece')
 
 prepare() {
     cd "VirtualBox-$pkgver"