From 6f4a7be809ea2230ca706e7deacf13a7be563e75 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 19 Aug 2012 09:04:37 +0200
Subject: [PATCH 1/4] Revert "samba: start samba earlyer, we will see if it
 works (again)"

This reverts commit 146838a57f9e66910c0cb2d50830805af91b904d.
---
 packages/network/samba/scripts/52_samba | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba
index 0c9dbb246e..16fa8a72f6 100644
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -29,7 +29,7 @@
     if [ "$SAMBA_START" = "true" ]; then
 
     # sleep 2 sec to be ensure network is started
-      usleep 2000000
+      usleep 10000000
 
       progress  "Starting Samba server"
 

From d86700a0c3e9e47486dcc13a3ef390bc331b7f37 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 20 Aug 2012 11:03:19 +0300
Subject: [PATCH 2/4] xf86-video-virtualbox: update to
 xf86-video-virtualbox-4.1.18

---
 packages/x11/driver/xf86-video-virtualbox/install | 2 +-
 packages/x11/driver/xf86-video-virtualbox/meta    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/x11/driver/xf86-video-virtualbox/install b/packages/x11/driver/xf86-video-virtualbox/install
index 95b981778b..5673a29d49 100755
--- a/packages/x11/driver/xf86-video-virtualbox/install
+++ b/packages/x11/driver/xf86-video-virtualbox/install
@@ -23,7 +23,7 @@
 . config/options
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
-  cp -P $PKG_BUILD/lib/VBoxGuestAdditions/vboxvideo_drv_111.so $INSTALL/$XORG_PATH_MODULES/drivers/vboxvideo_drv.so
+  cp -P $PKG_BUILD/lib/VBoxGuestAdditions/vboxvideo_drv_112.so $INSTALL/$XORG_PATH_MODULES/drivers/vboxvideo_drv.so
 mkdir -p $INSTALL/usr/lib/dri
   cp -P $PKG_BUILD/lib/VBoxOGL.so $INSTALL/usr/lib/dri/vboxvideo_dri.so
 mkdir -p $INSTALL/usr/lib
diff --git a/packages/x11/driver/xf86-video-virtualbox/meta b/packages/x11/driver/xf86-video-virtualbox/meta
index cf7c6daea8..7e91e77618 100644
--- a/packages/x11/driver/xf86-video-virtualbox/meta
+++ b/packages/x11/driver/xf86-video-virtualbox/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-virtualbox"
-PKG_VERSION="4.1.8"
+PKG_VERSION="4.1.18"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"

From 58295531f299d9f101266c88e0a26e316e5dec1b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 20 Aug 2012 11:09:36 +0300
Subject: [PATCH 3/4] vboxguest: update to vboxguest-4.1.18

---
 packages/linux-drivers/vboxguest/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux-drivers/vboxguest/meta b/packages/linux-drivers/vboxguest/meta
index 1693c0fc1d..272d9dd044 100644
--- a/packages/linux-drivers/vboxguest/meta
+++ b/packages/linux-drivers/vboxguest/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vboxguest"
-PKG_VERSION="4.1.8"
+PKG_VERSION="4.1.18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

From 93563e254fe2a93908c4615e13e2152f77ff4b8a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 20 Aug 2012 14:52:33 +0200
Subject: [PATCH 4/4] fontconfig: fix install of configfiles, thanks to 'Gujs'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/other/fontconfig/install | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/x11/other/fontconfig/install b/packages/x11/other/fontconfig/install
index 805932157d..9e5ab74174 100755
--- a/packages/x11/other/fontconfig/install
+++ b/packages/x11/other/fontconfig/install
@@ -28,5 +28,11 @@ mkdir -p $INSTALL/usr/lib
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/fc-cache/.libs/fc-cache $INSTALL/usr/bin
 
+mkdir -p $INSTALL/usr/share/fontconfig/conf.avail
+  cp $PKG_BUILD/conf.d/*.conf $INSTALL/usr/share/fontconfig/conf.avail
+
+mkdir -p $INSTALL/usr/share/xml/fontconfig
+  cp $PKG_BUILD/fonts.dtd $INSTALL/usr/share/xml/fontconfig
+
 mkdir -p $INSTALL/etc/fonts
   cp -R $SYSROOT_PREFIX/etc/fonts/* $INSTALL/etc/fonts