1 files changed, 46 insertions, 23 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index c7ca35aca..710177923 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -8,18 +8,19 @@
 
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre'
+         'virtualbox-libre-host-dkms'
+         'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
-         'virtualbox-libre-host-source'
          'virtualbox-libre-guest-utils'
-         'virtualbox-libre-guest-source')
-pkgver=4.2.4
-pkgrel=2
+         'virtualbox-libre-ext-vnc')
+pkgver=4.2.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('alsa-lib'
              'bin86'
-             'cdrkit-libre'
+             'cdrkit'
              'curl'
              'dev86'
              'gsoap'
@@ -41,7 +42,7 @@ makedepends=('alsa-lib'
              'glu'
              'python2'
              'qt'
-             'sdl-libre'
+             'sdl'
              'sdl_ttf'
              'vde2'
              'xalan-c')
@@ -78,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
+md5sums=('d680aeb3b4379b8281527aeb012b2df5'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -88,7 +89,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          '7e9483b1069a54f181546083ac7e5469'
          'c159d683ba1947290fc2ad2c64194150'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         '4f1692638d6740df4c4ad9766ba4e179'
+         'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
@@ -154,31 +155,39 @@ build() {
         --disable-kmods
     source ./env.sh
     kmk all
+
+    # fix python2
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
+
     # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    cd src/VBox/RDP/client
+    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
+    kmk packing
+    popd
 }
 
 package_virtualbox-libre() {
     pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
     depends=('curl'
              'libpng'
-             'libvncserver'
              'libxcursor'
              'libxinerama'
              'libxml2'
              'libxmu'
-             'sdl-libre'
+             'sdl'
              'shared-mime-info'
              'virtualbox-libre-host-modules')
     optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
-                'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels'
+                'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
                 'net-tools: Host-only or bridged networking support')
     backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
     replaces=('virtualbox' 'virtualbox-ose')
@@ -277,12 +286,12 @@ package_virtualbox-libre-sdk() {
     mv sdk "$pkgdir/usr/lib/virtualbox"
 }
 
-package_virtualbox-libre-host-source() {
-    pkgdesc='VirtualBox Host kernel libre modules source (DKMS)'
+package_virtualbox-libre-host-dkms() {
+    pkgdesc='VirtualBox Host kernel modules sources'
     depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules')
-    replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
-    conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+    provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules')
+    replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
+    conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
     install=virtualbox-libre-host-source.install
@@ -293,12 +302,12 @@ package_virtualbox-libre-host-source() {
     cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
 }
 
-package_virtualbox-libre-guest-source() {
-    pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)'
+package_virtualbox-libre-guest-dkms() {
+    pkgdesc='VirtualBox Guest kernel modules sources'
     depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules')
-    replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
-    conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+    provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules')
+    replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
+    conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source'  'virtualbox-guest-source' 'virtualbox-libre-guest-source')
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
     install=virtualbox-libre-guest-source.install
@@ -312,7 +321,7 @@ package_virtualbox-libre-guest-source() {
 package_virtualbox-libre-guest-utils(){
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels')
+    optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
     provides=("virtualbox-guest-utils=$pkgver")
     replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
     conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
@@ -347,4 +356,18 @@ package_virtualbox-libre-guest-utils(){
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
 }
 
+package_virtualbox-libre-ext-vnc() {
+    pkgdesc='VirtualBox VNC extension pack'
+    depends=('virtualbox-libre' 'libvncserver')
+    optdepends=('tigervnc: vnc client')
+    replaces=('virtualbox-ext-vnc')
+    conflicts=('virtualbox-ext-vnc')
+    provides=("virtualbox-ext-vnc=$pkgver")
+    install=virtualbox-libre-ext-vnc.install
+
+    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"
+}
+
 # vim:set ts=4 sw=4 et: