From a680b718e1666f37863e4f329436e545213e9aeb Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger
Date: Sat, 23 Jan 2016 18:29:00 +0100
Subject: system/virtualbox: Updated for version 5.0.14.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 system/virtualbox/virtualbox.SlackBuild | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'system/virtualbox/virtualbox.SlackBuild')

diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 67e22f4fb3..c97406c064 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-ose
 
-# Copyright 2008-2015 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
 # All rights reserved.
 #
@@ -25,7 +25,7 @@
 
 PRGNAM=virtualbox
 SRCNAM=VirtualBox
-VERSION=${VERSION:-4.3.24}
+VERSION=${VERSION:-5.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -90,6 +90,12 @@ else
     fi
 fi
 
+if [ "${SOFTWARE_VIRTUALIZATION:-no}" = "no" -a "$ARCH" = "x86_64" ]; then
+    sw_virt="--disable-vmmraw"
+else
+    sw_virt=""
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -126,21 +132,23 @@ MODE="755"
 # Use virtualbox-kernel.SlackBuild for this.
 patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
 
-# Do not require makeself. We don't plan on building an automatic installer
-# Patch taken from gentoo
-patch -p1 -i $CWD/virtualbox-4-makeself-check.patch
-
+# Fix building against newer versions of gsoap
 patch -p1 -i $CWD/virtualbox-gsoap.patch
 
+# Fix wrong path to rdesktop-vrdp-keymaps
+patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --disable-kmods \
   --enable-vde \
   --enable-vnc \
+  --with-makeself=/usr/bin/echo \
   $web_service \
   $harden \
   $gui \
+  $sw_virt \
   $java
 
 . ./env.sh
-- 
cgit v1.2.3