[arch-commits] Commit in virtualbox/trunk (009-xorg-1.17-ugly.patch PKGBUILD)

[Laurent Carlier]

    Date: Tuesday, February 10, 2015 @ 17:01:58
  Author: lcarlier
Revision: 127487

upgpkg: virtualbox 4.3.20-6

xorg 1.17 rebuild

Added:
  virtualbox/trunk/009-xorg-1.17-ugly.patch
Modified:
  virtualbox/trunk/PKGBUILD

--------------------------+
 009-xorg-1.17-ugly.patch |   33 +++++++++++++++++++++++++++++++++
 PKGBUILD                 |   10 ++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)

Added: 009-xorg-1.17-ugly.patch
===================================================================
--- 009-xorg-1.17-ugly.patch	                        (rev 0)
+++ 009-xorg-1.17-ugly.patch	2015-02-10 16:01:58 UTC (rev 127487)
@@ -0,0 +1,33 @@
+diff -ru VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/edid.c VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/edid.c
+--- VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/edid.c	2014-11-21 16:16:53.000000000 +0100
++++ VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/edid.c	2015-02-10 16:37:25.656612649 +0100
+@@ -45,6 +45,7 @@
+  */
+ 
+ #include <misc.h>
++#include <xorg/xorg-server.h>
+ #include <xf86DDC.h>
+ #include <xf86Crtc.h>
+ #include "vboxvideo.h"
+diff -ru VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/pointer.c VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/pointer.c
+--- VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/pointer.c	2014-11-21 16:16:53.000000000 +0100
++++ VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/pointer.c	2015-02-10 16:31:25.677093405 +0100
+@@ -27,6 +27,7 @@
+ #include <iprt/string.h>
+ #include "compiler.h"
+ #include "cursorstr.h"
++#include <xorg/xorg-server.h>
+ #include "servermd.h"
+ 
+ #include "vboxvideo.h"
+diff -ru VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/vboxvideo.c VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+--- VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/vboxvideo.c	2014-11-21 16:16:53.000000000 +0100
++++ VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c	2015-02-10 16:31:48.163313719 +0100
+@@ -72,6 +72,7 @@
+ # include "xf86Pci.h"
+ #endif
+ 
++#include <xorg/xorg-server.h>
+ #include "fb.h"
+ 
+ #include "vboxvideo.h"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-10 15:49:23 UTC (rev 127486)
+++ PKGBUILD	2015-02-10 16:01:58 UTC (rev 127487)
@@ -11,7 +11,7 @@
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
 pkgver=4.3.20
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -65,7 +65,8 @@
         '005-gsoap-build.patch'
         '006-rdesktop-vrdp-keymap-path.patch'
         '007-python2-path.patch'
-        '008-linux-3.19.patch')
+        '008-linux-3.19.patch'
+        '009-xorg-1.17-ugly.patch')
 md5sums=('cf3f25644aa0fae1029e8b362bd4375e'
          '4833c8e0524fd2272b24ba0d94aef006'
          '6e2722bfd7013c1b0174382626ac1b8d'
@@ -82,7 +83,8 @@
          'ecfd13297d7753ebe7b8763ca5b792d9'
          '7ea75b242e19440d622eb42a4d6c62c4'
          '188ea65918309f737ce28216c2b07c3b'
-         'd8a6630dfc7fe9cd3282947ed0ccf55c')
+         'd8a6630dfc7fe9cd3282947ed0ccf55c'
+         '8ae131dea6e4e81e5de77156c9d04dce')
 
 prepare() {
     cd "VirtualBox-$pkgver"
@@ -298,7 +300,7 @@
 package_virtualbox-guest-utils() {
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('virtualbox-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes'
-    'X-ABI-VIDEODRV_VERSION=18')
+    'X-ABI-VIDEODRV_VERSION=19')
     optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
     replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
     conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox')