[arch-commits] Commit in virtualbox/trunk (12 files)

Sébastien Luttringer seblu at nymeria.archlinux.org
Sat Jan 4 04:42:16 UTC 2014 

    Date: Saturday, January 4, 2014 @ 05:42:16
  Author: seblu
Revision: 103361

upgpkg: virtualbox 4.3.6-2

- move 10-vboxdrv.rules to 60-vboxdrv.rules (fix FS#38314)
- virtualbox-guest-utils conflict with X.org ABI (FS#38320)
- fix build of gsoac
- move sed fixes to patches

Added:
  virtualbox/trunk/002-dri-driver-path.patch
    (from rev 103348, virtualbox/trunk/002-fix-dri-driver-path.patch)
  virtualbox/trunk/003-ogl-include-path.patch
    (from rev 103348, virtualbox/trunk/003-fix-ogl-include-path.patch)
  virtualbox/trunk/005-gsoap-build.patch
  virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch
  virtualbox/trunk/007-python2-path.patch
  virtualbox/trunk/60-vboxdrv.rules
    (from rev 103348, virtualbox/trunk/10-vboxdrv.rules)
Modified:
  virtualbox/trunk/001-vboxdrv-reference.patch
  virtualbox/trunk/LocalConfig.kmk
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/002-fix-dri-driver-path.patch
  virtualbox/trunk/003-fix-ogl-include-path.patch
  virtualbox/trunk/10-vboxdrv.rules

-------------------------------------+
 001-vboxdrv-reference.patch         |    2 
 002-dri-driver-path.patch           |   28 +++++++
 002-fix-dri-driver-path.patch       |   28 -------
 003-fix-ogl-include-path.patch      |   26 ------
 003-ogl-include-path.patch          |   26 ++++++
 005-gsoap-build.patch               |   11 ++
 006-rdesktop-vrdp-keymap-path.patch |   12 +++
 007-python2-path.patch              |    9 ++
 10-vboxdrv.rules                    |    5 -
 60-vboxdrv.rules                    |    8 ++
 LocalConfig.kmk                     |    7 -
 PKGBUILD                            |  128 +++++++++++++++++++---------------
 12 files changed, 170 insertions(+), 120 deletions(-)

Modified: 001-vboxdrv-reference.patch
===================================================================
--- 001-vboxdrv-reference.patch	2014-01-04 04:27:50 UTC (rev 103360)
+++ 001-vboxdrv-reference.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -10,7 +10,7 @@
 -  "DKMS package first. This package keeps track of Linux kernel changes and "
 -  "recompiles the vboxdrv kernel module if necessary."
 +  "  <font color=blue>'pacman -S virtualbox-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-host-source and "
++  "as root. If you don't use our stock kernel, install virtualbox-host-dkms and "
 +  "execute dkms autoinstall ."
    );
  

Copied: virtualbox/trunk/002-dri-driver-path.patch (from rev 103348, virtualbox/trunk/002-fix-dri-driver-path.patch)
===================================================================
--- 002-dri-driver-path.patch	                        (rev 0)
+++ 002-dri-driver-path.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -0,0 +1,28 @@
+# 2013 © Sébastien Luttringer
+--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2013-09-04 21:03:47.040743507 +0200
++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2013-10-20 23:23:49.705371815 +0200
+@@ -58,23 +58,8 @@
+ //#define DEBUG_DRI_CALLS
+ 
+ //@todo this could be different...
+-#ifdef RT_ARCH_AMD64
+-# ifdef RT_OS_FREEBSD
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+-#  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+-# else
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
++#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
+ #  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-# endif
+-#else
+-# ifdef RT_OS_FREEBSD
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+-#  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+-# else
+-#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
+-#  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+-# endif
+-#endif
+ 
+ #ifdef DEBUG_DRI_CALLS
+  #define SWDRI_SHOWNAME(pext, func) \

Deleted: 002-fix-dri-driver-path.patch
===================================================================
--- 002-fix-dri-driver-path.patch	2014-01-04 04:27:50 UTC (rev 103360)
+++ 002-fix-dri-driver-path.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -1,28 +0,0 @@
-# 2013 © Sébastien Luttringer
---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2013-09-04 21:03:47.040743507 +0200
-+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2013-10-20 23:23:49.705371815 +0200
-@@ -58,23 +58,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# ifdef RT_OS_FREEBSD
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--#  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-+#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- #  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#else
--# ifdef RT_OS_FREEBSD
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--#  define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--#  define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--#  define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \

Deleted: 003-fix-ogl-include-path.patch
===================================================================
--- 003-fix-ogl-include-path.patch	2014-01-04 04:27:50 UTC (rev 103360)
+++ 003-fix-ogl-include-path.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -1,26 +0,0 @@
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1 \
- 	$(VBOX_MESA_INCS) \
--	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 

Copied: virtualbox/trunk/003-ogl-include-path.patch (from rev 103348, virtualbox/trunk/003-fix-ogl-include-path.patch)
===================================================================
--- 003-ogl-include-path.patch	                        (rev 0)
+++ 003-ogl-include-path.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -0,0 +1,26 @@
+--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
++++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
+@@ -63,18 +63,12 @@
+ VBoxOGL_INCS           = .
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+  VBoxOGL_INCS     += \
+-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
+-	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
+-	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
+-	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
+-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
++	/usr/include/x11 \
++	/usr/include/xorg \
++	/usr/include/pixman-1 \
+ 	$(VBOX_MESA_INCS) \
+-	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
++	/usr/include/drm \
++	/usr/include/libdrm
+  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
+ endif
+ 

Added: 005-gsoap-build.patch
===================================================================
--- 005-gsoap-build.patch	                        (rev 0)
+++ 005-gsoap-build.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -0,0 +1,11 @@
+--- a/src/VBox/Main/webservice/Makefile.kmk	2013-11-21 19:00:46.812761628 +0100
++++ b/src/VBox/Main/webservice/Makefile.kmk	2014-01-04 04:37:05.803599026 +0100
+@@ -683,7 +683,7 @@
+ : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+ 	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
+ 	$(RM) -f $@
+-	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
++	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
+ 	$(APPEND) $@ done
+ 
+ # copy the generated headers and stuff. This has to be a separate rule if we

Added: 006-rdesktop-vrdp-keymap-path.patch
===================================================================
--- 006-rdesktop-vrdp-keymap-path.patch	                        (rev 0)
+++ 006-rdesktop-vrdp-keymap-path.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -0,0 +1,12 @@
+# 2013 © Sébastien Luttringer
+--- a/src/VBox/RDP/client/Makefile.kmk	2013-02-19 23:12:20.207464901 +0100
++++ b/src/VBox/RDP/client/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,$(DEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
++	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
+ 	RDESKTOP=1
+ ifdef WITH_BIRD_VD_HACKS
+  rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS

Added: 007-python2-path.patch
===================================================================
--- 007-python2-path.patch	                        (rev 0)
+++ 007-python2-path.patch	2014-01-04 04:42:16 UTC (rev 103361)
@@ -0,0 +1,9 @@
+# 2013 © Sébastien Luttringer
+--- a/src/VBox/Frontends/VBoxShell/vboxshell.py	2014-01-03 01:38:41.831615590 +0100
++++ b/src/VBox/Frontends/VBoxShell/vboxshell.py	2014-01-04 04:23:33.884544420 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ # $Id: vboxshell.py 49841 2013-12-09 13:32:33Z vboxsync $
+ """

Deleted: 10-vboxdrv.rules
===================================================================
--- 10-vboxdrv.rules	2014-01-04 04:27:50 UTC (rev 103360)
+++ 10-vboxdrv.rules	2014-01-04 04:42:16 UTC (rev 103361)
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"

Copied: virtualbox/trunk/60-vboxdrv.rules (from rev 103348, virtualbox/trunk/10-vboxdrv.rules)
===================================================================
--- 60-vboxdrv.rules	                        (rev 0)
+++ 60-vboxdrv.rules	2014-01-04 04:42:16 UTC (rev 103361)
@@ -0,0 +1,8 @@
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
+KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
+
+SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"

Modified: LocalConfig.kmk
===================================================================
--- LocalConfig.kmk	2014-01-04 04:27:50 UTC (rev 103360)
+++ LocalConfig.kmk	2014-01-04 04:42:16 UTC (rev 103361)
@@ -9,14 +9,13 @@
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
 VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
 VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
 VBOX_BLD_PYTHON = python2
 VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
-#VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
-#INST_EXTPACK = /var/lib/virtualbox/extensionpacks/
+# fix gsoap missing zlib include and produce errors with --as-needed
+VBOX_GSOAP_CXX_LIBS := gsoapssl++ z

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-04 04:27:50 UTC (rev 103360)
+++ PKGBUILD	2014-01-04 04:42:16 UTC (rev 103361)
@@ -1,6 +1,6 @@
 # $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Sébastien Luttringer
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgbase=virtualbox
 pkgname=('virtualbox'
@@ -10,7 +10,7 @@
          'virtualbox-guest-utils'
          'virtualbox-ext-vnc')
 pkgver=4.3.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -49,7 +49,7 @@
              'xorg-server-devel')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
-        '10-vboxdrv.rules'
+        '60-vboxdrv.rules'
         '60-vboxguest.rules'
         'LocalConfig.kmk'
         'vboxservice.service'
@@ -56,61 +56,65 @@
         'vboxweb.service'
         'vboxreload'
         '001-vboxdrv-reference.patch'
-        '002-fix-dri-driver-path.patch'
-        '003-fix-ogl-include-path.patch'
-        '004-xorg.patch')
+        '002-dri-driver-path.patch'
+        '003-ogl-include-path.patch'
+        '004-xorg.patch'
+        '005-gsoap-build.patch'
+        '006-rdesktop-vrdp-keymap-path.patch'
+        '007-python2-path.patch')
 md5sums=('4bc874039f169215152fb40ca5062784'
-         '5f85710e0b8606de967716ded7b2d351'
+         '4674f9cce5c7fa86d01d946bf3f27e10'
          'ed1341881437455d9735875ddf455fbe'
-         '43862d1e25a5c63b5c195b806759c7cf'
+         '864f268375a10f54c4daf46787e0fcf2'
          '07c5f6d86c4b7839d719c8ee0c53653b'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          '177c0e849790a825480cb9fba785f11b'
-         '6dbd16b9d1530fc42ff6904cd80be91d'
+         '5ebaaf351419a58db6fdddbc19c58c5e'
          '9be7e2703afeee1fca9368bd8750e710'
          '1ca474b3c236bd1ffd53ec125cdf3680'
-         '9965c65a844a2ec1db98ae519d144f78')
+         '9965c65a844a2ec1db98ae519d144f78'
+         'ecfd13297d7753ebe7b8763ca5b792d9'
+         '7ea75b242e19440d622eb42a4d6c62c4'
+         '188ea65918309f737ce28216c2b07c3b')
 
 prepare() {
     cd "VirtualBox-$pkgver"
-    # Apply patches
+
     for _p in "$srcdir"/*.patch; do
         [[ -e $_p ]] || continue
         msg2 "Appy patch ${_p##*/}"
         patch -Np1 -i "$_p"
     done
+
+    msg2 'Applying local config'
+    cp "$srcdir/LocalConfig.kmk" .
 }
 
 build() {
     cd "VirtualBox-$pkgver"
-    cp "$srcdir/LocalConfig.kmk" .
-    # fake makeself binary to compile without nofatal
-    ln -s /bin/echo makeself
-    export PATH="$CWD:$PATH"
 
-    ./configure --disable-docs \
+    msg2 'Build virtualbox'
+    ./configure \
+        --disable-docs \
         --enable-webservice \
         --enable-vde \
         --enable-vnc \
-        --disable-kmods
+        --disable-kmods \
+        --with-makeself=/usr/bin/echo
+    # fake makeself binary to compile without nofatal
+    # makeself is used by linux installer. we don't need it.
     source ./env.sh
-    kmk all
+    kmk
 
-    # fix python2
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
+    msg2 'Build rdesktop-vrdp'
+    pushd src/VBox/RDP/client >/dev/null
+    kmk
+    popd >/dev/null
 
-    # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    pushd src/VBox/RDP/client
-    cp "$srcdir/LocalConfig.kmk" .
-    # fix keymap path FS#32548
-    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
-    kmk all
-    popd
-
-    # build VNC pack
-    pushd src/VBox/ExtPacks/VNC
+    msg2 'Build VNC extension pack'
+    pushd src/VBox/ExtPacks/VNC >/dev/null
     kmk packing
-    popd
+    popd >/dev/null
 }
 
 package_virtualbox() {
@@ -137,11 +141,10 @@
 
     source "VirtualBox-$pkgver/env.sh"
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
 
-    #Binaries and Wrapper with Launchers
+    # binaries
+    install -dm755 "$pkgdir/usr/bin"
     install -m755 VBox.sh "$pkgdir/usr/bin/VBox"
-
     for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
         ln -sf VBox "$pkgdir/usr/bin/$i"
         ln -sf VBox "$pkgdir/usr/bin/${i,,}"
@@ -149,28 +152,40 @@
     install -m755 VBoxTunctl "$pkgdir/usr/bin"
     install -m755 rdesktop-vrdp "$pkgdir/usr/bin"
 
-    #components
-    install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
+    # libraries
+    install -dm755 "$pkgdir/usr/lib/virtualbox"
     install -m755 *.so "$pkgdir/usr/lib/virtualbox"
     install -m644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
+    ## setuid root binaries
     install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
+    ## other binaries
     install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
 
-    #language
+    # components
+    install -dm755 "$pkgdir/usr/lib/virtualbox/components"
+    install -m755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
+
+    # extensions packs
+    ## as virtualbox install itself stuff in this directory, move it to /var and
+    ## trick it with a symlink
+    ## FIXME: trick is disabled for now
+    #install -dm755 "$pkgdir/var/lib/virtualbox/extensions"
+    #install -dm755 "$pkgdir/usr/share/virtualbox/extensions"
+    #ln -s ../../../var/lib/virtualbox/extensions "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+    install -dm755 "$pkgdir/usr/lib/virtualbox/ExtensionPacks"
+
+    # languages
+    install -dm755 "$pkgdir/usr/share/virtualbox/nls"
     install -m755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
 
-    #rdesktop keymaps
+    # rdesktop keymaps
+    install -dm755 "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
     install -m644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
 
-    #useless scripts
+    # useless scripts
     install -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
 
-    #icons
+    # icons
     install -Dm644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
 
     pushd icons
@@ -185,7 +200,7 @@
     install -Dm644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
 
     #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
+    install -dm755 "$pkgdir/etc/vbox"
     echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
 
     #licence
@@ -193,8 +208,8 @@
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     # udev usb rules
-    install -Dm644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
+    install -Dm644 "$srcdir/60-vboxdrv.rules" \
+        "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
 
     # install systemd service
     install -Dm644 "$srcdir/vboxweb.service" \
@@ -214,13 +229,13 @@
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
     install -Dm755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
+    # python sdk
     pushd sdk/installer
     VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
     popd
     rm -rf sdk/installer
     mv sdk "$pkgdir/usr/lib/virtualbox"
-    #licence
+    # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -239,7 +254,7 @@
     source "VirtualBox-$pkgver/env.sh"
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
     cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
-    #licence
+    # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -258,7 +273,7 @@
     source "VirtualBox-$pkgver/env.sh"
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
     cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
-    #licence
+    # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -265,7 +280,8 @@
 
 package_virtualbox-guest-utils() {
     pkgdesc='VirtualBox Guest userspace utilities'
-    depends=('virtualbox-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
+    depends=('virtualbox-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes'
+    'X-ABI-VIDEODRV_VERSION<15')
     optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
     replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
     conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
@@ -292,7 +308,7 @@
     # install systemd service file
     install -Dm644 vboxservice.service \
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-    #licence
+    # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -306,7 +322,7 @@
     source "VirtualBox-$pkgver/env.sh"
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
     install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
-    #licence
+    # licence
     install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

More information about the arch-commits mailing list