diff --git a/hardware/virtualization/virtualbox/actions.py b/hardware/virtualization/virtualbox/actions.py index 86822e20ed..ef266fcd15 100644 --- a/hardware/virtualization/virtualbox/actions.py +++ b/hardware/virtualization/virtualbox/actions.py @@ -24,7 +24,6 @@ def setup(): autotools.rawConfigure("\ --with-makeself=/usr/bin/echo \ --disable-docs \ - --disable-qt \ --enable-vde \ --enable-vnc \ --enable-webservice \ diff --git a/hardware/virtualization/virtualbox/files/wrapper.patch b/hardware/virtualization/virtualbox/files/wrapper.patch new file mode 100644 index 0000000000..d605328dde --- /dev/null +++ b/hardware/virtualization/virtualbox/files/wrapper.patch @@ -0,0 +1,26 @@ +--- VirtualBox-5.1.0_BETA2.orig/src/VBox/Installer/linux/VBox.sh 2016-06-06 21:48:53.000000000 +0300 ++++ VirtualBox-5.1.0_BETA2/src/VBox/Installer/linux/VBox.sh 2016-06-17 21:24:47.111130079 +0300 +@@ -56,16 +56,21 @@ + + if [ "$1" = "shutdown" ]; then + SHUTDOWN="true" +-elif ! lsmod|grep -q vboxdrv; then +- cat << EOF ++elif [ -x /usr/libexec/virt-wrapper ]; then ++ /usr/libexec/virt-wrapper virtualbox || exit 1 ++ ++ if ! lsmod|grep -q vboxdrv; then ++ cat << EOF + WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to + load. Please recompile the kernel module and install it by + + sudo /sbin/vboxconfig ++ load. + + You will not be able to start VMs until this problem is fixed. + EOF ++ fi + elif [ ! -c /dev/vboxdrv ]; then + cat << EOF + WARNING: The character device /dev/vboxdrv does not exist. Try diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml index ef12b567fc..e40f0d3e62 100644 --- a/hardware/virtualization/virtualbox/pspec.xml +++ b/hardware/virtualization/virtualbox/pspec.xml @@ -12,18 +12,16 @@ app:gui A powerful virtualization program VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things. - http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0.12.tar.bz2 - + http://download.virtualbox.org/virtualbox/5.1.0_BETA2/VirtualBox-5.1.0_BETA2.tar.bz2 dev86 cdrkit acpica mesa-devel - curl-devel + curl-devel python-devel pam-devel device-mapper-devel libcap-devel - gsoap-devel libXt-devel libXmu-devel @@ -45,30 +43,32 @@ pulseaudio-libs-devel jdk7-openjdk kernel-module-headers + qt5-x11extras-devel + libxcb-devel + qt5-base-devel LocalConfig.kmk - + wrapper.patch 002-dri-driver-path.patch 003-ogl-include-path.patch - + 004-xorg.patch 005-gsoap-build.patch 006-rdesktop-vrdp-keymap-path.patch - - + 008-root-window.patch desktop-file.patch fix-tr-keyboard.patch virtualbox-4-makeself-check.patch - virtualbox - device-mapper + qt5-base + libxcb mesa libXt gsoap @@ -80,7 +80,6 @@ libXinerama virt-wrapper libvncserver - module-virtualbox curl zlib libX11 @@ -88,7 +87,10 @@ libpng python libxml2 - openssl + openssl + device-mapper + qt5-x11extras + module-virtualbox /etc/vbox @@ -145,6 +147,13 @@ + + 2016-06-17 + 5.1.0b + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-12 5.0.12