1 files changed, 37 insertions, 27 deletions
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 0546d12a4e..426183e741 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=virtualbox
 SRCNAM=VirtualBox
-VERSION=4.2.16
+VERSION=4.3.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,6 +62,28 @@ else
   harden="--disable-hardening"
 fi
 
+# Support for the qt4-frontend
+if [ "${HEADLESS:-no}" = "no" ]; then
+  guiapp="VirtualBox VBoxSDL"
+else
+  gui+=" --build-headless"
+  guiapp=""
+fi
+
+# Enable building of java bindings
+if [ "${JAVA:-no}" = "no" ]; then
+  java="--disable-java"
+else
+  java=""
+fi
+
+# Enable vpx support for video capturing
+if [ "${VPX:-no}" = "no" ]; then
+  libvpx="--disable-libvpx"
+else
+  libvpx=""
+fi
+
 if [ "${WEBSERVICE:-no}" = "no" ]; then
     web_service=""
     vboxwebsrv=""
@@ -102,7 +124,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 GROUP="vboxusers"
 MODE="755"
@@ -111,21 +133,6 @@ MODE="755"
 # Use virtualbox-kernel.SlackBuild for this.
 patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
 
-# Support for the qt4-frontend
-if [ "${HEADLESS:-no}" = "no" ]; then
-  mkdir -p $PKG/usr/share/applications
-  guiapp="VirtualBox VBoxSDL VBoxBFE"
-else
-  gui+=" --build-headless"
-  guiapp=""
-fi
-
-if [ "${JAVA:-no}" = "no" ]; then
-  java="--disable-java"
-else
-  java=""
-fi
-
 # 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
@@ -140,7 +147,8 @@ CXXFLAGS="$SLKCFLAGS" \
   $web_service \
   $harden \
   $gui \
-  $java
+  $java \
+  $libvpx
 
 . ./env.sh
 
@@ -159,13 +167,14 @@ mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \
   $PKG/usr/share/{pixmaps,mime/packages} \
   $PKG/etc/{default,rc.d,vbox}
 
-for i in vboxdrv vboxballoonctrl-service vboxautostart-service; do
-  cp -f src/VBox/Installer/linux/$i.sh.in $PKG/etc/rc.d/rc.$i.new
-  sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$i.new
-  sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.$i.new
-  sed -i "s/%DEBIAN%/no/" $PKG/etc/rc.d/rc.$i.new
-  sed -i "s/%GROUP%/vboxusers/" $PKG/etc/rc.d/rc.$i.new
-  sed -i "s/\[ -z \"\$DEBIAN\"/#\[ -z \"\$DEBIAN\"/" $PKG/etc/rc.d/rc.$i.new
+for i in vboxdrv.sh.in vboxballoonctrl-service.sh vboxautostart-service.sh; do
+  SCRIPT=$(echo $i | cut -d "." -f 1)
+  cp -f src/VBox/Installer/linux/$i $PKG/etc/rc.d/rc.$SCRIPT.new
+  sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$SCRIPT.new
+  sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.$SCRIPT.new
+  sed -i "s/%DEBIAN%/no/" $PKG/etc/rc.d/rc.$SCRIPT.new
+  sed -i "s/%GROUP%/vboxusers/" $PKG/etc/rc.d/rc.$SCRIPT.new
+  sed -i "s/\[ -z \"\$DEBIAN\"/#\[ -z \"\$DEBIAN\"/" $PKG/etc/rc.d/rc.$SCRIPT.new
 done
 
 cp -f $CWD/vbox.cfg $PKG/etc/vbox/vbox.cfg.new
@@ -177,6 +186,7 @@ cd out/linux.$BUILDDIR/release/bin/
   mv src $PKG/usr/src/virtualbox-kernel-$VERSION
 
   if [ "${HEADLESS:-no}" = "no" ]; then
+    mkdir -p $PKG/usr/share/applications
     mv virtualbox.desktop $PKG/usr/share/applications/
     sed -i "s|/opt/VirtualBox|/usr/share/virtualbox|" \
       $PKG/usr/share/applications/virtualbox.desktop
@@ -219,7 +229,7 @@ for i in VBoxManage vboxmanage VBoxHeadless \
 done
 
 if [ "${HEADLESS:-no}" = "no" ]; then
-  for i in virtualbox vboxsdl vboxbfe; do
+  for i in virtualbox vboxsdl; do
     ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i
   done
 fi
@@ -227,7 +237,7 @@ fi
 if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
   mkdir -p $PKG/var/{lib,log}/vboxweb
   chown vboxweb:vboxusers $PKG/var/{lib,log}/vboxweb
-  cp -f src/VBox/Installer/linux/vboxweb-service.sh.in $PKG/etc/rc.d/rc.vboxweb-service.new
+  cp -f src/VBox/Installer/linux/vboxweb-service.sh $PKG/etc/rc.d/rc.vboxweb-service.new
   sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.vboxweb-service.new
   sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.vboxweb-service.new
   sed -i "s/%DEBIAN%/no/" $PKG/etc/rc.d/rc.vboxweb-service.new