system/virtualbox: Updated for version 5.0.14.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
This commit is contained in:
Heinz Wiesinger 2016-01-23 18:29:00 +01:00 committed by Willy Sudiarto Raharjo
parent 918d87cb7b
commit a680b718e1
6 changed files with 50 additions and 35 deletions

View file

@ -0,0 +1,12 @@
# 2015 © Sébastien Luttringer
--- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
@@ -41,7 +41,7 @@
EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
+ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
RDESKTOP=1
ifdef WITH_BIRD_VD_HACKS
rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS

View file

@ -17,8 +17,13 @@ require gsoap as optional dependency.
If you want to build the java bindings, pass JAVA=yes to the script. If you want to build the java bindings, pass JAVA=yes to the script.
This will require jdk as optional dependency. This will require jdk as optional dependency.
On x86_64, this by default builds without software virtualization. This
means you need hardware virtualization in order to run 32bit guests on
64bit hosts. To enable software virtualization, pass
SOFTWARE_VIRTUALIZATION=yes to the script. Note that this will require
a compiler that can generate 32bit code, and thus will not build on a
stock x86_64 system. This switch has no effect on x86 systems.
If you want to attach VirtualBox to a VDE network you will need vde2. If you want to attach VirtualBox to a VDE network you will need vde2.
See README.SLACKWARE for some setup notes. See README.SLACKWARE for some setup notes.
NOTE: This will not build on a stock x86_64 system.

View file

@ -1,10 +0,0 @@
--- VirtualBox-4.0.0_OSE/configure
+++ VirtualBox-4.0.0_OSE/configure
@@ -2527,7 +2527,6 @@
check_compiler_h
[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
# tools/common/makeself*
- [ $OSE -ge 1 ] && check_makeself
fi
[ -n "$SETUP_WINE" ] && setup_wine

View file

@ -1,6 +1,6 @@
diff -u -r VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-4.3.20/src/VBox/Main/webservice/Makefile.kmk diff -u -r VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk
--- VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk 2014-11-21 16:22:38.000000000 +0100 --- VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk 2015-11-10 18:06:29.000000000 +0100
+++ VirtualBox-4.3.20/src/VBox/Main/webservice/Makefile.kmk 2014-12-10 20:46:37.462326942 +0100 +++ VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk 2015-11-22 09:58:21.669118291 +0100
@@ -159,7 +159,6 @@ @@ -159,7 +159,6 @@
RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT) RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
@ -9,7 +9,7 @@ diff -u -r VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk VirtualB
PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest
@@ -512,8 +511,6 @@ @@ -515,8 +514,6 @@
$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \ $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \ $(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
$(PATH_TARGET_SOAPDEMOXML)/dummy_file \ $(PATH_TARGET_SOAPDEMOXML)/dummy_file \
@ -18,8 +18,8 @@ diff -u -r VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk VirtualB
$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \ $(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file $(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
@@ -691,17 +688,14 @@ @@ -695,17 +692,14 @@
# however we cannot as it is subject to caching. Let the shell do the globbing. # any more. Ignoring the exit code is the simple solution, accepting the error.
$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@) $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
$(RM) -f $@ $(RM) -f $@
- $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS) - $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
@ -27,7 +27,7 @@ diff -u -r VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk VirtualB
ifdef VBOX_GSOAP_VERBOSE ifdef VBOX_GSOAP_VERBOSE
$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/ $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
endif endif
- $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/ - -$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/ $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
$(APPEND) $@ done $(APPEND) $@ done

View file

@ -2,7 +2,7 @@
# Slackware build script for virtualbox-ose # 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> # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
# All rights reserved. # All rights reserved.
# #
@ -25,7 +25,7 @@
PRGNAM=virtualbox PRGNAM=virtualbox
SRCNAM=VirtualBox SRCNAM=VirtualBox
VERSION=${VERSION:-4.3.24} VERSION=${VERSION:-5.0.14}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
@ -90,6 +90,12 @@ else
fi fi
fi fi
if [ "${SOFTWARE_VIRTUALIZATION:-no}" = "no" -a "$ARCH" = "x86_64" ]; then
sw_virt="--disable-vmmraw"
else
sw_virt=""
fi
if [ "$ARCH" = "i486" ]; then if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX="" LIBDIRSUFFIX=""
@ -126,21 +132,23 @@ MODE="755"
# Use virtualbox-kernel.SlackBuild for this. # Use virtualbox-kernel.SlackBuild for this.
patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff 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 # Fix building against newer versions of gsoap
# Patch taken from gentoo
patch -p1 -i $CWD/virtualbox-4-makeself-check.patch
patch -p1 -i $CWD/virtualbox-gsoap.patch 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" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./configure \ ./configure \
--disable-kmods \ --disable-kmods \
--enable-vde \ --enable-vde \
--enable-vnc \ --enable-vnc \
--with-makeself=/usr/bin/echo \
$web_service \ $web_service \
$harden \ $harden \
$gui \ $gui \
$sw_virt \
$java $java
. ./env.sh . ./env.sh

View file

@ -1,15 +1,15 @@
PRGNAM="virtualbox" PRGNAM="virtualbox"
VERSION="4.3.24" VERSION="5.0.14"
HOMEPAGE="http://www.virtualbox.org" HOMEPAGE="http://www.virtualbox.org"
DOWNLOAD="http://download.virtualbox.org/virtualbox/4.3.24/VirtualBox-4.3.24.tar.bz2 \ DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.14/VirtualBox-5.0.14.tar.bz2 \
http://download.virtualbox.org/virtualbox/4.3.24/VBoxGuestAdditions_4.3.24.iso \ http://download.virtualbox.org/virtualbox/5.0.14/VBoxGuestAdditions_5.0.14.iso \
http://download.virtualbox.org/virtualbox/4.3.24/UserManual.pdf \ http://download.virtualbox.org/virtualbox/5.0.14/UserManual.pdf \
http://download.virtualbox.org/virtualbox/4.3.24/SDKRef.pdf" http://download.virtualbox.org/virtualbox/5.0.14/SDKRef.pdf"
MD5SUM="c9711ee4a040de131c638168d321f3ff \ MD5SUM="e0a02426ad09b475e630881efe911423 \
a1a4ccd53257c881214aa889f28de9b6 \ 875b430362791acdc5c9340220d39b75 \
c087b4a00b8d475fdfdc50fab47c1231 \ 2d6b50476398749021798e68a27934be \
6ca97ffd038cb760bff403b615329009" e5a715e27d984ba58ce87246b92a9dd5"
DOWNLOAD_x86_64="UNTESTED" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="acpica virtualbox-kernel" REQUIRES="acpica virtualbox-kernel"
MAINTAINER="Heinz Wiesinger" MAINTAINER="Heinz Wiesinger"