system/virtualbox-ose-addons: Updated for version 3.1.4.

2 files changed, 28 insertions, 16 deletions

diff --git a/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild b/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild
index 940f13e940ad..f42b161eb261 100644
--- a/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild
+++ b/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-ose-addons
 
-# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=virtualbox-ose-addons
 SRCNAM=VirtualBox
-VERSION=3.1.2
+VERSION=3.1.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -43,6 +43,9 @@ fi
 # kmk doesn't support MAKEFLAGS, so we use JOBS here
 JOBS=${JOBS:-3}
 
+# set xorg-server version
+XSERVER=$(X -version 2>&1 | grep Server | cut -d " " -f 4 | sed "s/\.//" | cut -d "." -f 1)
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -94,13 +97,19 @@ mkdir -p $PKG/lib/udev/rules.d $PKG/sbin \
   $PKG/usr/share/hal/fdi/policy/20thirdparty
 
 patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff
-cp -f src/VBox/Additions/linux/installer/vboxadd.sh $PKG/etc/rc.d/rc.vboxadd.new
-cp -f src/VBox/Additions/linux/installer/vboxadd-service.sh $PKG/etc/rc.d/rc.vboxadd-service.new
-
-cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop $PKG/etc/xdg/autostart/
-cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop $PKG/usr/share/autostart/
-install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh $PKG/usr/bin/VBoxRandR
-install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient $PKG/usr/bin/VBoxClient-all
+cp -f src/VBox/Additions/linux/installer/vboxadd.sh \
+  $PKG/etc/rc.d/rc.vboxadd.new
+cp -f src/VBox/Additions/linux/installer/vboxadd-service.sh \
+  $PKG/etc/rc.d/rc.vboxadd-service.new
+
+cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop \
+  $PKG/etc/xdg/autostart/
+cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop \
+  $PKG/usr/share/autostart/
+install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \
+  $PKG/usr/bin/VBoxRandR
+install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+  $PKG/usr/bin/VBoxClient-all
 install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi \
   $PKG/usr/share/hal/fdi/policy/20thirdparty
 
@@ -117,8 +126,10 @@ cd out/linux.$TARGET/release/bin/additions
   install -m 755 VBoxClient $PKG/usr/bin/
   install -m 755 VBoxService $PKG/usr/sbin/
   install -m 4755 mount.vboxsf $PKG/sbin/mount.vboxsf
-  install -m 644 vboxvideo_drv_16.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
-  install -m 644 vboxmouse_drv_16.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/input/vboxmouse_drv.so
+  install -m 644 vboxvideo_drv_$XSERVER.so \
+    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
+  install -m 644 vboxmouse_drv_$XSERVER.so \
+    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/input/vboxmouse_drv.so
 
   install -m 644 VBoxOGLcrutil.so $PKG/usr/lib$LIBDIRSUFFIX
   install -m 644 VBoxOGLerrorspu.so $PKG/usr/lib$LIBDIRSUFFIX
@@ -129,7 +140,8 @@ cd out/linux.$TARGET/release/bin/additions
   install -m 644 VBoxOGL.so $PKG/usr/lib$LIBDIRSUFFIX
 
   mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri
-  ln -s /usr/lib$LIBDIRSUFFIX/VBoxOGL.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri/vboxvideo_dri.so
+  ln -s /usr/lib$LIBDIRSUFFIX/VBoxOGL.so \
+    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri/vboxvideo_dri.so
 cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/virtualbox-ose-addons/virtualbox-ose-addons.info b/system/virtualbox-ose-addons/virtualbox-ose-addons.info
index 6a3cb04bf8e6..97b8c332531a 100644
--- a/system/virtualbox-ose-addons/virtualbox-ose-addons.info
+++ b/system/virtualbox-ose-addons/virtualbox-ose-addons.info
@@ -1,10 +1,10 @@
 PRGNAM="virtualbox-ose-addons"
-VERSION="3.1.2"
+VERSION="3.1.4"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/3.1.2/VirtualBox-3.1.2-OSE.tar.bz2"
-MD5SUM="e7808f16114f5b1a65aa2df1aa33e1a7"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/3.1.4/VirtualBox-3.1.4-OSE.tar.bz2"
+MD5SUM="d32066cb9ebfa4930a2c5ad6227de26f"
 DOWNLOAD_x86_64="UNTESTED"
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"