diff --git a/config/functions b/config/functions
index 7b63aab0b6..f6964b08d8 100644
--- a/config/functions
+++ b/config/functions
@@ -56,7 +56,13 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  ls -d $ROOT/$BUILD/linux-*
+  if [ -f $ROOT/packages/linux/package.mk ] ; then
+    . $ROOT/packages/linux/package.mk
+  elif [ -f $ROOT/packages/linux/meta ] ; then
+    # TODO: remove
+    . $ROOT/packages/linux/meta
+  fi
+  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
 }
 
 tolower(){
diff --git a/config/options b/config/options
index eb2071241d..1c75988364 100644
--- a/config/options
+++ b/config/options
@@ -19,6 +19,8 @@ fi
 
 ROOT=`pwd`
 PROJECT_DIR="$ROOT/projects"
+# TODO: remove $ROOT/packages/linux/meta
+LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/meta $ROOT/packages/linux/package.mk"
 
 # include versioning
   . config/version
diff --git a/packages/linux-drivers/RTL8188EU/meta b/packages/linux-drivers/RTL8188EU/meta
index 52ae5e0011..4a6c2012c7 100644
--- a/packages/linux-drivers/RTL8188EU/meta
+++ b/packages/linux-drivers/RTL8188EU/meta
@@ -29,6 +29,7 @@ PKG_SITE="https://github.com/lwfinger/rtl8188eu"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="Realtek RTL81xxEU Linux 3.x driver"
diff --git a/packages/linux-drivers/RTL8188EU/need_unpack b/packages/linux-drivers/RTL8188EU/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/linux-drivers/RTL8188EU/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/linux-drivers/RTL8192CU/meta b/packages/linux-drivers/RTL8192CU/meta
index a67c58806c..b10508bb9c 100644
--- a/packages/linux-drivers/RTL8192CU/meta
+++ b/packages/linux-drivers/RTL8192CU/meta
@@ -27,6 +27,7 @@ PKG_SITE="http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PFid=4
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="Realtek RTL81xxCU Linux 3.x driver"
diff --git a/packages/linux-drivers/RTL8192CU/need_unpack b/packages/linux-drivers/RTL8192CU/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/linux-drivers/RTL8192CU/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/linux-drivers/bcm_sta/meta b/packages/linux-drivers/bcm_sta/meta
index 9108cc526a..9e699a1b65 100644
--- a/packages/linux-drivers/bcm_sta/meta
+++ b/packages/linux-drivers/bcm_sta/meta
@@ -27,6 +27,7 @@ PKG_SITE="http://www.broadcom.com/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="bcm_sta: Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver"
diff --git a/packages/linux-drivers/bcm_sta/need_unpack b/packages/linux-drivers/bcm_sta/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/linux-drivers/bcm_sta/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/linux-drivers/dvbhdhomerun/meta b/packages/linux-drivers/dvbhdhomerun/meta
index b9ec4c9814..95ee3365da 100644
--- a/packages/linux-drivers/dvbhdhomerun/meta
+++ b/packages/linux-drivers/dvbhdhomerun/meta
@@ -29,6 +29,7 @@ PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 #PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux libhdhomerun"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)."
diff --git a/packages/linux-drivers/dvbhdhomerun/need_unpack b/packages/linux-drivers/dvbhdhomerun/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/linux-drivers/dvbhdhomerun/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/linux-drivers/tbs-linux-drivers/meta b/packages/linux-drivers/tbs-linux-drivers/meta
index 536c32637d..2ad609322e 100644
--- a/packages/linux-drivers/tbs-linux-drivers/meta
+++ b/packages/linux-drivers/tbs-linux-drivers/meta
@@ -27,6 +27,7 @@ PKG_SITE="http://www.tbsdtv.com/english/Download.html"
 PKG_URL="http://www.tbsdtv.com/download/document/common/tbs-linux-drivers_v${PKG_VERSION}.zip"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="Linux TBS tuner drivers"
diff --git a/packages/linux-drivers/tbs-linux-drivers/need_unpack b/packages/linux-drivers/tbs-linux-drivers/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/linux-drivers/tbs-linux-drivers/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/linux-drivers/vboxguest/meta b/packages/linux-drivers/vboxguest/meta
index b835d025e6..c1108a20a6 100644
--- a/packages/linux-drivers/vboxguest/meta
+++ b/packages/linux-drivers/vboxguest/meta
@@ -27,6 +27,7 @@ PKG_SITE="http://www.virtualbox.org"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
 PKG_SHORTDESC="vboxguest"
diff --git a/packages/linux-drivers/vboxguest/need_unpack b/packages/linux-drivers/vboxguest/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/linux-drivers/vboxguest/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/linux/meta b/packages/linux/meta
index a65c85a430..25956b7794 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -31,6 +31,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER"
 PKG_BUILD_DEPENDS="toolchain cpio module-init-tools pciutils xz"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="linux"
 PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules"
diff --git a/packages/linux/need_unpack b/packages/linux/need_unpack
deleted file mode 100755
index 7a88bab0c6..0000000000
--- a/packages/linux/need_unpack
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/$1.$TARGET_ARCH.conf -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index f55c6d58d0..51c4097cf4 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13.alpha-7f6c5e4"
+PKG_VERSION="13.alpha-0d22ffb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index a921a73c0a..8f4659f42b 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="13.alpha-7f6c5e4"
+PKG_VERSION="13.alpha-0d22ffb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-108e917.patch
similarity index 96%
rename from packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch
rename to packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-108e917.patch
index e61a783ba7..c8721ccaf2 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-108e917.patch
@@ -1,7 +1,7 @@
-From 68a58d680018fd34f1604223625e7b7c025a1e39 Mon Sep 17 00:00:00 2001
+From d817392def174c1bf2bfa5151c26afbfbac3ef36 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:34:39 +0200
-Subject: [PATCH 01/89] videoplayer: adapt lateness detection and dropping to
+Subject: [PATCH 01/87] videoplayer: adapt lateness detection and dropping to
  buffering
 
 ---
@@ -582,10 +582,10 @@ index f8ad541..186e271 100644
 1.8.5.1
 
 
-From 157bf97937800048435081e0d3547ddebea67ff6 Mon Sep 17 00:00:00 2001
+From fc833442067806ba581dd6507cfd5b70bb31bf1e Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 2 Sep 2012 16:05:21 +0200
-Subject: [PATCH 02/89] video player: present correct pts to user for a/v sync
+Subject: [PATCH 02/87] video player: present correct pts to user for a/v sync
  (after buffering in renderer)
 
 ---
@@ -653,10 +653,10 @@ index 186e271..59c7f09 100644
 1.8.5.1
 
 
-From 99f04ef8397779991b446a8b15de65ec94f1c7d8 Mon Sep 17 00:00:00 2001
+From 22dda586a5310f1cce45af4676fbeb0cc23491b6 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 16 Feb 2013 18:25:53 +0100
-Subject: [PATCH 03/89] videoplayer: some rework and documentation
+Subject: [PATCH 03/87] videoplayer: some rework and documentation
 
 ---
  .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h      | 29 ++++++++++++++++++++--
@@ -767,10 +767,10 @@ index 587ea4b..27a61bd 100644
 1.8.5.1
 
 
-From 5e14dbe9c79d87f17bcd3614109ae8b56ef9d1cf Mon Sep 17 00:00:00 2001
+From 66bc6a2477c1b63df2f9f4b4b59df54adb498287 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sat, 1 Jun 2013 11:21:19 +0200
-Subject: [PATCH 04/89] renderer: bump buffers to 5
+Subject: [PATCH 04/87] renderer: bump buffers to 5
 
 ---
  xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +-
@@ -793,10 +793,10 @@ index 5a21fec..c131dd1 100644
 1.8.5.1
 
 
-From bf55c75f03c7d5141a551591abd0d3539bdff9d3 Mon Sep 17 00:00:00 2001
+From 96bb48ffe142e0f9a6dda112a1583937ca06f8fd Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:41:31 +0200
-Subject: [PATCH 05/89] videoplayer: update frametime, it might change due to
+Subject: [PATCH 05/87] videoplayer: update frametime, it might change due to
  fps detection
 
 ---
@@ -820,10 +820,10 @@ index 27a61bd..8e772e3 100644
 1.8.5.1
 
 
-From 816ad7ebdf60e7c5fd1bf5f6a760d125a3c8e8fb Mon Sep 17 00:00:00 2001
+From 3e0f9a748d31195705e66d4fea3f8f0db3accfdd Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:43:06 +0200
-Subject: [PATCH 06/89] videoplayer: give streams with invalid fps a chance for
+Subject: [PATCH 06/87] videoplayer: give streams with invalid fps a chance for
  fps detection
 
 ---
@@ -847,10 +847,10 @@ index 8e772e3..150a796 100644
 1.8.5.1
 
 
-From 16aa6e9f9c3bce8890f082ac1a6a69df8ec62d4a Mon Sep 17 00:00:00 2001
+From 25b266bf50bf6337e5f36042027d93ef8d5e11dd Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:49:05 +0200
-Subject: [PATCH 07/89] dvdplayer: allow rewinding at end of stream, do a seek
+Subject: [PATCH 07/87] dvdplayer: allow rewinding at end of stream, do a seek
  after rewind
 
 ---
@@ -887,10 +887,10 @@ index a698b8f..a845c7e 100644
 1.8.5.1
 
 
-From 124e6ae963d6ef951af6e6da3b6a56380e87c9d2 Mon Sep 17 00:00:00 2001
+From 9725e3aacdd839da92fa78f68f307e6cc5cf15a6 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 15:22:05 +0200
-Subject: [PATCH 08/89] X11: ditch SDL for video and window events
+Subject: [PATCH 08/87] X11: ditch SDL for video and window events
 
 ---
  xbmc/Application.cpp                |   2 +-
@@ -2427,10 +2427,10 @@ index b1464d0..34b912f 100644
 1.8.5.1
 
 
-From f143e69def4d1a698d883d3151eb1fa9cbb71144 Mon Sep 17 00:00:00 2001
+From ce8edec562875b0bd594d0fbd602d1d66b90f1e5 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 15:24:22 +0200
-Subject: [PATCH 09/89] X11: Add xbmc icon
+Subject: [PATCH 09/87] X11: Add xbmc icon
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++-
@@ -2620,10 +2620,10 @@ index 34b912f..352e90e 100644
 1.8.5.1
 
 
-From 1b5499e0a3cb60fe06ca9a1b5db4f243b5c1b5a4 Mon Sep 17 00:00:00 2001
+From 5270ddd2db979dc61d2f8fd6161294b1ecdd7f1d Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 20 May 2012 14:11:26 +0200
-Subject: [PATCH 10/89] X11: add SDL joystick until we have a better solution
+Subject: [PATCH 10/87] X11: add SDL joystick until we have a better solution
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++
@@ -2677,10 +2677,10 @@ index ad58aad..6f57a87 100644
 1.8.5.1
 
 
-From b931f6609e657a059f70253e2280c4b4cc5ef0d3 Mon Sep 17 00:00:00 2001
+From d9baa3bc7949ab4af9555c18be6e0813a3565d49 Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@xbmc.org>
 Date: Thu, 5 Jul 2012 12:35:55 +0200
-Subject: [PATCH 11/89] X11: factor out code handling device reset notification
+Subject: [PATCH 11/87] X11: factor out code handling device reset notification
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++--------
@@ -2743,10 +2743,10 @@ index 352e90e..3f91b9b 100644
 1.8.5.1
 
 
-From 420b3b67ee19bb851d6493e8893bcdd89c796fbe Mon Sep 17 00:00:00 2001
+From 08599bc029c0c86c778fe7e4022954f6540153dd Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 15:02:00 +0200
-Subject: [PATCH 12/89] X11: move xrandr events to WinEventsX11
+Subject: [PATCH 12/87] X11: move xrandr events to WinEventsX11
 
 ---
  xbmc/windowing/WinEventsX11.cpp     | 42 +++++++++++++++++++++++++++++++++++++
@@ -2890,10 +2890,10 @@ index 304dac8..16b13aa 100644
 1.8.5.1
 
 
-From 589b29f043dda738dfa310fb943695a43bc2dec0 Mon Sep 17 00:00:00 2001
+From bb9e3b8d3e62395d4619e05527f03fe0860e018e Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 12 Apr 2012 15:43:56 +0200
-Subject: [PATCH 13/89] xrandr: remove method RestoreState
+Subject: [PATCH 13/87] xrandr: remove method RestoreState
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++--
@@ -2972,10 +2972,10 @@ index 0aec487..00b49dc 100644
 1.8.5.1
 
 
-From 8ce00de3ce235c5800f0f4269202fe74bd6e6094 Mon Sep 17 00:00:00 2001
+From d4b05757fe73158e33a40aa37550354f9056519f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 20 May 2012 13:17:10 +0200
-Subject: [PATCH 14/89] xrandr: observe orientation
+Subject: [PATCH 14/87] xrandr: observe orientation
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++-------
@@ -3190,10 +3190,10 @@ index 00b49dc..508604d 100644
 1.8.5.1
 
 
-From 79a20841caf6de2a7e84b819d390d69c9ea42dc0 Mon Sep 17 00:00:00 2001
+From f6d1048ab5e677320696a05a1a2b801d7a8fc424 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:54:15 +0200
-Subject: [PATCH 15/89] xrandr: allow getting info for multiple screen's
+Subject: [PATCH 15/87] xrandr: allow getting info for multiple screen's
 
 Refactored by: Joakim Plate <elupus@xbmc.org>
 ---
@@ -3368,10 +3368,10 @@ index 508604d..d37838a 100644
 1.8.5.1
 
 
-From 08c5968950cde689f1280f693e804d1310c567cb Mon Sep 17 00:00:00 2001
+From 55babb239de0a2b254d6b17247769a48f110f6e7 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:44:00 +0200
-Subject: [PATCH 16/89] X11: fix multi-head setups
+Subject: [PATCH 16/87] X11: fix multi-head setups
 
 ---
  language/English/strings.po         |   4 +-
@@ -3386,7 +3386,7 @@ Subject: [PATCH 16/89] X11: fix multi-head setups
  9 files changed, 227 insertions(+), 113 deletions(-)
 
 diff --git a/language/English/strings.po b/language/English/strings.po
-index 640a7b5..891845a 100755
+index cd74c3f..a96c8d0 100755
 --- a/language/English/strings.po
 +++ b/language/English/strings.po
 @@ -1019,7 +1019,9 @@ msgctxt "#245"
@@ -4130,10 +4130,10 @@ index 4175aab..94584ab 100644
 1.8.5.1
 
 
-From 5518d1bb32e139d2abb9fb7e106851ee3b7f09b4 Mon Sep 17 00:00:00 2001
+From 46ffb8d7cb33b9fe224547b2eb7fcb9241815c9d Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:36:32 +0200
-Subject: [PATCH 17/89] X11: remove all DefaultScreen and RootWindow macros
+Subject: [PATCH 17/87] X11: remove all DefaultScreen and RootWindow macros
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp   | 6 +++---
@@ -4201,10 +4201,10 @@ index 6383754..21e7dc5 100644
 1.8.5.1
 
 
-From 7eec07fdc52e059cc21146f5a991d5fc8604c4cf Mon Sep 17 00:00:00 2001
+From d738bd344998db609e629c484af7230b0b4303cc Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:45:22 +0200
-Subject: [PATCH 18/89] X11: remove all DefaultScreen and RootWindow macros
+Subject: [PATCH 18/87] X11: remove all DefaultScreen and RootWindow macros
  (VideoRefClock)
 
 Note this is on a separate display connection.
@@ -4276,10 +4276,10 @@ index 0b3950a..ca43b5a 100644
 1.8.5.1
 
 
-From b122077f861bef67c21dfccb71c9cd6a78aebe92 Mon Sep 17 00:00:00 2001
+From 72a6a6b68a517a3053d5705a2f462cd621f47a96 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Wed, 20 Jun 2012 17:37:11 +0200
-Subject: [PATCH 19/89] X11: recreate gl context after output has changed
+Subject: [PATCH 19/87] X11: recreate gl context after output has changed
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp   | 24 ++++++++++++++----------
@@ -4430,10 +4430,10 @@ index 21e7dc5..8e68d5d 100644
 1.8.5.1
 
 
-From 7af7c4bf720d280df1369f72364400b0c06aa22b Mon Sep 17 00:00:00 2001
+From 309e3641c00be4cdb100507ee27da31edd4df3be Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 12:06:25 +0200
-Subject: [PATCH 20/89] X11: hook video reference clock in windowing
+Subject: [PATCH 20/87] X11: hook video reference clock in windowing
 
 ---
  xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++-----------
@@ -4638,10 +4638,10 @@ index dd65a1b..afd71fc 100644
 1.8.5.1
 
 
-From af5e5d2f81fc71d1ab967dd3ff9b298010e7db83 Mon Sep 17 00:00:00 2001
+From 5b2a05699448819dd3721a50db7d1f9521c278fe Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 21 Jun 2012 17:26:51 +0200
-Subject: [PATCH 21/89] X11: fix video calibrations
+Subject: [PATCH 21/87] X11: fix video calibrations
 
 ---
  xbmc/windowing/WinSystem.h          |  1 +
@@ -4733,10 +4733,10 @@ index 9666cc3..5b52d6c 100644
 1.8.5.1
 
 
-From 2b4b57f4dd451fc3cdadc00e4deb7193606d3bdc Mon Sep 17 00:00:00 2001
+From f9a1e4f58d1215f96e5b4f20a761749e93119103 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 12:00:26 +0200
-Subject: [PATCH 22/89] X11: deactivate screen saver on startup
+Subject: [PATCH 22/87] X11: deactivate screen saver on startup
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++
@@ -4806,10 +4806,10 @@ index 5b52d6c..b2bd5a0 100644
 1.8.5.1
 
 
-From b2cc7d031ad73f33ba9d185758281e4db122066e Mon Sep 17 00:00:00 2001
+From d43c1aa3509f23bc90c56faceae2693341edbe95 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 12:10:09 +0200
-Subject: [PATCH 23/89] X11: change method of going full-screen
+Subject: [PATCH 23/87] X11: change method of going full-screen
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++-
@@ -4853,10 +4853,10 @@ index b76b229..869baa8 100644
 1.8.5.1
 
 
-From 98205d3a261736910f5f6928029fc6d7418ba106 Mon Sep 17 00:00:00 2001
+From 86d533c2f48411c3155d449ff15295cfe0bb2a7e Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 28 Jun 2012 19:12:39 +0200
-Subject: [PATCH 24/89] X11: reset key repeat and key modifier on focus lost
+Subject: [PATCH 24/87] X11: reset key repeat and key modifier on focus lost
  and gain
 
 ---
@@ -4888,10 +4888,10 @@ index d98f12f..743aca9 100644
 1.8.5.1
 
 
-From 986fee98c9a8063b1f9ba6086db706289d8a2ef6 Mon Sep 17 00:00:00 2001
+From 256a09b5487f1f2a0530663837aa34e7bc0e7d9b Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@xbmc.org>
 Date: Thu, 5 Jul 2012 14:18:46 +0200
-Subject: [PATCH 25/89] X11: replace custom utf8 to unicode with charset
+Subject: [PATCH 25/87] X11: replace custom utf8 to unicode with charset
  convertor (squash to x11 events)
 
 ---
@@ -5108,10 +5108,10 @@ index a412f32..9a8a912 100644
 1.8.5.1
 
 
-From 522ce80cf3a454ad741c4a1d4799d2f9a6ba7490 Mon Sep 17 00:00:00 2001
+From f55ed7566369aff5aabd87215eace07cfe4b237c Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@xbmc.org>
 Date: Thu, 5 Jul 2012 14:23:54 +0200
-Subject: [PATCH 26/89] X11: fixed invalid usage of sizeof() (squash into x11
+Subject: [PATCH 26/87] X11: fixed invalid usage of sizeof() (squash into x11
  changes)
 
 ---
@@ -5175,10 +5175,10 @@ index 9a8a912..c69169c 100644
 1.8.5.1
 
 
-From 3c57caccb63faa27e78fccaacf4dd494b9a280f5 Mon Sep 17 00:00:00 2001
+From 8217ff8c3ea08d826a93b1a564de7247b1fe0b82 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 9 Jun 2012 18:23:53 +0200
-Subject: [PATCH 27/89] add missing keys to xbmc keytable
+Subject: [PATCH 27/87] add missing keys to xbmc keytable
 
 ---
  xbmc/input/XBMC_keytable.cpp | 2 ++
@@ -5201,10 +5201,10 @@ index d57f4d3..b807897 100644
 1.8.5.1
 
 
-From 51ef003f390e8cdc6bad59a89e9e7353c24f8fe3 Mon Sep 17 00:00:00 2001
+From 846d2b8c31d5620824b09ac3140597b8f5183077 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 16 Mar 2012 15:57:51 +0100
-Subject: [PATCH 28/89] videorefclock: temp deactivate of nv settings
+Subject: [PATCH 28/87] videorefclock: temp deactivate of nv settings
 
 ---
  xbmc/video/VideoReferenceClock.cpp | 2 +-
@@ -5227,10 +5227,10 @@ index 0ddf102..3ae7107 100644
 1.8.5.1
 
 
-From 4cd2d1c1a99fac4f5314c2d3f273a01abbf41864 Mon Sep 17 00:00:00 2001
+From fe65221eb76df3b6703b376ea238fe44989c049a Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 20 Aug 2012 09:09:09 +0200
-Subject: [PATCH 29/89] videorefclock: ask graphics context for refresh rate
+Subject: [PATCH 29/87] videorefclock: ask graphics context for refresh rate
 
 ---
  xbmc/video/VideoReferenceClock.cpp | 3 ++-
@@ -5261,10 +5261,10 @@ index 3ae7107..27bebde 100644
 1.8.5.1
 
 
-From 991025f6b94a9d385ac7fcd57ae626d53be92ff0 Mon Sep 17 00:00:00 2001
+From 33a2a1a335c44e5a0002ec3171c62eff1ec4ca6e Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 9 Jul 2012 14:00:18 +0200
-Subject: [PATCH 30/89] X11: fix icon texture after
+Subject: [PATCH 30/87] X11: fix icon texture after
  cc5ed3c2474084ebc0373a3046410e6f766e03f4
 
 ---
@@ -5372,10 +5372,10 @@ index 869baa8..bfe3797 100644
 1.8.5.1
 
 
-From 85403f47ec1837cdc35d3ee0e78545920ddaac1b Mon Sep 17 00:00:00 2001
+From 121922348aa95b38576e73b935de1d1070f5d036 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 10 Jul 2012 11:14:12 +0200
-Subject: [PATCH 31/89] X11: check for window manager
+Subject: [PATCH 31/87] X11: check for window manager
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++-
@@ -5496,10 +5496,10 @@ index b2bd5a0..3e62cd8 100644
 1.8.5.1
 
 
-From cada9778db199ae81c699846dcc33a9a21124e8e Mon Sep 17 00:00:00 2001
+From 09d0b22dd4a2c9db220fca17e8fef9ff39cd8b12 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 12 Jul 2012 11:11:47 +0200
-Subject: [PATCH 32/89] X11: dont set window on xrandr if no mode available
+Subject: [PATCH 32/87] X11: dont set window on xrandr if no mode available
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++-----
@@ -5536,10 +5536,10 @@ index af82061..4f33c68 100644
 1.8.5.1
 
 
-From 42303801b5d1ca410dcbd7e789e42b46d7a81a3b Mon Sep 17 00:00:00 2001
+From 8c15e3cda2360bf45b4c46ca94d1de6c9abb4824 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 26 Jul 2012 09:34:28 +0200
-Subject: [PATCH 33/89] X11: fix crash after a resolution change on startup
+Subject: [PATCH 33/87] X11: fix crash after a resolution change on startup
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 3 ++-
@@ -5563,10 +5563,10 @@ index 4f33c68..bc4e963 100644
 1.8.5.1
 
 
-From febf6a9132d6a42409eb893a5f44d0433f00cb60 Mon Sep 17 00:00:00 2001
+From 9f728249031d76d076723d36ee82547019b9b04c Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 15 Sep 2012 18:27:29 +0200
-Subject: [PATCH 34/89] X11: lock graphics context in NotifyXRREvent
+Subject: [PATCH 34/87] X11: lock graphics context in NotifyXRREvent
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 2 ++
@@ -5589,10 +5589,10 @@ index bc4e963..57a8d20 100644
 1.8.5.1
 
 
-From 8335c1f7253d7f8d33b6766b2f4d1c06f1ceb24e Mon Sep 17 00:00:00 2001
+From 0b83104d945d92b5cf2d74c90f599d507a631135 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 23 Aug 2012 19:39:49 +0200
-Subject: [PATCH 35/89] ffmpeg: add av_find_default_stream_index to interface
+Subject: [PATCH 35/87] ffmpeg: add av_find_default_stream_index to interface
 
 ---
  lib/DllAvFormat.h | 4 ++++
@@ -5638,10 +5638,10 @@ index 0016c0b..3514856 100644
 1.8.5.1
 
 
-From 44a73339f093af8aeec3ebae4d069785e8f19a28 Mon Sep 17 00:00:00 2001
+From 6ae6139cc225adbe35d5df04e4d1e057fc933330 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 20 Aug 2012 16:06:39 +0200
-Subject: [PATCH 36/89] dvdplayer: observe pts counter overflow
+Subject: [PATCH 36/87] dvdplayer: observe pts counter overflow
 
 ---
  .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++-
@@ -5928,10 +5928,10 @@ index aef5ab1..35abbdf 100644
 1.8.5.1
 
 
-From 63af30ee87733db1aeedf58153a03284da1e8472 Mon Sep 17 00:00:00 2001
+From 7766d8d27fd3c2b25f163570cc81075ca135dee5 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 2 Oct 2012 13:02:10 +0200
-Subject: [PATCH 37/89] dvdplayer: avoid short screen flicker caused by
+Subject: [PATCH 37/87] dvdplayer: avoid short screen flicker caused by
  unnecessary reconfigure of renderer
 
 ---
@@ -5964,10 +5964,10 @@ index 150a796..beffbe9 100644
 1.8.5.1
 
 
-From 0c0cf15e7e99114adbd55f3b17ba01bc5b11071f Mon Sep 17 00:00:00 2001
+From 8b9dc924d372ab2a844291507e53639f15aa86ab Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 11 Oct 2012 12:05:50 +0200
-Subject: [PATCH 38/89] vdpau: advanced settings for auto deinterlacing
+Subject: [PATCH 38/87] vdpau: advanced settings for auto deinterlacing
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++----
@@ -5995,7 +5995,7 @@ index 277802f..3292461 100644
      if (deint != -1)
      {
 diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
-index 79ce315..0274fd1 100644
+index 06f40b1..d11fa02 100644
 --- a/xbmc/settings/AdvancedSettings.cpp
 +++ b/xbmc/settings/AdvancedSettings.cpp
 @@ -165,6 +165,8 @@ void CAdvancedSettings::Initialize()
@@ -6033,10 +6033,10 @@ index 7d16957..bb70f3e 100644
 1.8.5.1
 
 
-From 14b0980a2cc12d34b96978958eb5f4c5ef5a4f32 Mon Sep 17 00:00:00 2001
+From 2edd7fd2ea3a4fdb66cb1cf3a3df5392f3d9e125 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 2 Nov 2012 13:20:03 +0100
-Subject: [PATCH 39/89] player: fix rewind
+Subject: [PATCH 39/87] player: fix rewind
 
 ---
  xbmc/cores/dvdplayer/DVDMessage.h       |  5 ++++-
@@ -6251,10 +6251,10 @@ index 59c7f09..65dea76 100644
 1.8.5.1
 
 
-From e2d811124ccaf92a8c4bdd8cbb5dd0077494a692 Mon Sep 17 00:00:00 2001
+From 786cb13f407f1b05541eccbec100772ddb18ad83 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 23 Nov 2012 17:41:12 +0100
-Subject: [PATCH 40/89] xrandr: fix query for multiple screens
+Subject: [PATCH 40/87] xrandr: fix query for multiple screens
 
 ---
  xbmc/windowing/X11/XRandR.cpp | 10 ++++++----
@@ -6295,10 +6295,10 @@ index 4685413..e610150 100644
 1.8.5.1
 
 
-From 14e028a3e62bb2b3dc32559af4d70a3af11e87e9 Mon Sep 17 00:00:00 2001
+From eea21036aba6264e3b9491685a0799437cf6ae0d Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 2 Dec 2012 15:46:55 +0100
-Subject: [PATCH 41/89] X11: add debug log to print out refresh after xrr event
+Subject: [PATCH 41/87] X11: add debug log to print out refresh after xrr event
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++
@@ -6325,10 +6325,10 @@ index 57a8d20..a237dc0 100644
 1.8.5.1
 
 
-From 84849987ae3cb3f0a67f7d5ef2193b6d2a909460 Mon Sep 17 00:00:00 2001
+From 394fa33220e514a000c2d546e7ce6430d4f31658 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 11 Dec 2012 11:08:13 +0100
-Subject: [PATCH 42/89] X11: dont call XCloseDisplay on shutdown, it crashes
+Subject: [PATCH 42/87] X11: dont call XCloseDisplay on shutdown, it crashes
  when powered doen by cec on ATI
 
 ---
@@ -6353,10 +6353,10 @@ index a237dc0..ab660b1 100644
 1.8.5.1
 
 
-From a3c96f49e233c93713fc3da66a5020daef272fa9 Mon Sep 17 00:00:00 2001
+From fa79426b597e6f857fb9809f6ee8e87f5483a1b2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= <gregory.coutant@gmail.com>
 Date: Wed, 12 Dec 2012 19:49:47 +0100
-Subject: [PATCH 43/89] x11: support for multiple x screens
+Subject: [PATCH 43/87] x11: support for multiple x screens
 
 ---
  xbmc/windowing/X11/XRandR.cpp | 2 +-
@@ -6379,10 +6379,10 @@ index e610150..5c53574 100644
 1.8.5.1
 
 
-From d63b99422269911b7ec4266ae77352341c8de1ab Mon Sep 17 00:00:00 2001
+From 8f0001dfb2d4e7d27be92f90e4b99a16b8b66a60 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 24 Dec 2012 16:02:42 +0100
-Subject: [PATCH 44/89] pvr: increase changes counter of stream on stream
+Subject: [PATCH 44/87] pvr: increase changes counter of stream on stream
  change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be
 
 ---
@@ -6416,10 +6416,10 @@ index b96d520..df89f6f 100644
 1.8.5.1
 
 
-From d680997148bd9f44f0b1b2b6e18b59fc0d368702 Mon Sep 17 00:00:00 2001
+From 67c314c99d9931745d129cd364ecc9a198dbdb71 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 17 Jan 2013 16:03:22 +0100
-Subject: [PATCH 45/89] X11: add keymapping for XF86XK_Sleep
+Subject: [PATCH 45/87] X11: add keymapping for XF86XK_Sleep
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 1 +
@@ -6441,10 +6441,10 @@ index a62521f..263cb5a 100644
 1.8.5.1
 
 
-From 8b7cec534ca0f284cdf98d1d7a48b47f7a5415b9 Mon Sep 17 00:00:00 2001
+From 408052281302bd107f6e24da5e72957cc3d05bc5 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 21 Jan 2013 09:00:19 +0100
-Subject: [PATCH 46/89] X11: remove toggle full screen after resume
+Subject: [PATCH 46/87] X11: remove toggle full screen after resume
 
 ---
  xbmc/powermanagement/PowerManager.cpp | 5 -----
@@ -6470,10 +6470,10 @@ index 590a887..35b5a21 100644
 1.8.5.1
 
 
-From dc9d8318045387084e0d366b103678b9f005dc3d Mon Sep 17 00:00:00 2001
+From 8bcebc0518c3c3bf7c8ac84333851ab0e48fb98f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Wed, 23 Jan 2013 17:03:02 +0100
-Subject: [PATCH 47/89] xrandr: set screen on mode change command
+Subject: [PATCH 47/87] xrandr: set screen on mode change command
 
 ---
  xbmc/windowing/X11/XRandR.cpp | 2 +-
@@ -6496,10 +6496,10 @@ index 5c53574..4355ef7 100644
 1.8.5.1
 
 
-From f8c7cb3744e2682e122ef2b50d8abf7568b1144b Mon Sep 17 00:00:00 2001
+From d6d899addb76b45c546634f0b6db69ea5fe01d8e Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Wed, 23 Jan 2013 17:03:39 +0100
-Subject: [PATCH 48/89] X11: recreate glx context when output changes
+Subject: [PATCH 48/87] X11: recreate glx context when output changes
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 6 +++---
@@ -6550,10 +6550,10 @@ index 3e62cd8..2a1fb41 100644
 1.8.5.1
 
 
-From d5babf0e520d9bca57b0fecbe30889c0fb6979ce Mon Sep 17 00:00:00 2001
+From 6edf8222a2572c876d4eb81b73507dab81cd1d10 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 14 Dec 2012 14:19:15 +0100
-Subject: [PATCH 49/89] pvr: do not show selection dialog for a single menu
+Subject: [PATCH 49/87] pvr: do not show selection dialog for a single menu
  hook
 
 ---
@@ -6561,7 +6561,7 @@ Subject: [PATCH 49/89] pvr: do not show selection dialog for a single menu
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp
-index 6560dfa..80106be 100644
+index 14c9cde..57b18a5 100644
 --- a/xbmc/pvr/addons/PVRClients.cpp
 +++ b/xbmc/pvr/addons/PVRClients.cpp
 @@ -733,6 +733,7 @@ void CPVRClients::ProcessMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat, const CF
@@ -6591,10 +6591,10 @@ index 6560dfa..80106be 100644
 1.8.5.1
 
 
-From ffd8adaff169c5929980b8eb60f456d10ab44628 Mon Sep 17 00:00:00 2001
+From 85d8b8cb8957459c6cdc97ee147c00bf1509b828 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 3 Feb 2013 08:17:16 +0100
-Subject: [PATCH 50/89] X11: use default screen parameters if no output
+Subject: [PATCH 50/87] X11: use default screen parameters if no output
  connected
 
 ---
@@ -6698,10 +6698,10 @@ index 4329a22..2adf8a0 100644
 1.8.5.1
 
 
-From 4b561afaaaef181c84515c6aa68355edf902bd6b Mon Sep 17 00:00:00 2001
+From c6c64b19d773c34cb5ed5a3d1f49300e57d73a4c Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 23 Mar 2013 15:13:32 +0100
-Subject: [PATCH 51/89] X11: create parent window
+Subject: [PATCH 51/87] X11: create parent window
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++--------------
@@ -6967,10 +6967,10 @@ index 2a1fb41..e8993f1 100644
 1.8.5.1
 
 
-From 1bb2ea4dd7c9d1dcb857c1d83559ba161019d4e2 Mon Sep 17 00:00:00 2001
+From b44c01be086849751662c19db5dbb5e1b2f2fcf8 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 24 Mar 2013 12:30:12 +0100
-Subject: [PATCH 52/89] X11: use system key repeat rate instead of hardcoded
+Subject: [PATCH 52/87] X11: use system key repeat rate instead of hardcoded
  one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441
 
 ---
@@ -7172,10 +7172,10 @@ index c69169c..6429291 100644
 1.8.5.1
 
 
-From a1f1fd1e364651468cde9430316945ffe26f7138 Mon Sep 17 00:00:00 2001
+From eb241172f74b1976df979b9d47f521d077e31347 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 24 Mar 2013 16:04:48 +0100
-Subject: [PATCH 53/89] linux: use CLOCK_MONOTONIC_RAW as this is not subject
+Subject: [PATCH 53/87] linux: use CLOCK_MONOTONIC_RAW as this is not subject
  to NTP
 
 ---
@@ -7213,10 +7213,10 @@ index c06b8c5..4390d2e 100644
 1.8.5.1
 
 
-From d997aed22731bd086b0f0a57f17f371c68ac647d Mon Sep 17 00:00:00 2001
+From 28b2d6835673469d0cb9dee5190d652e986a766f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 28 Mar 2013 15:18:53 +0100
-Subject: [PATCH 54/89] OMXPlayer: some caching fixes for pvr
+Subject: [PATCH 54/87] OMXPlayer: some caching fixes for pvr
 
 ---
  xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++-
@@ -7240,10 +7240,10 @@ index 9cccaac..4168195 100644
 1.8.5.1
 
 
-From b917a688dff3ace1fe9a5d0ef4b7d2574c2293af Mon Sep 17 00:00:00 2001
+From 0c753a2f4971c2549cd3c2cb9bbcfea968518e57 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 28 Mar 2013 20:50:59 +0100
-Subject: [PATCH 55/89] fix incorrect display of fps when dr kicks in
+Subject: [PATCH 55/87] fix incorrect display of fps when dr kicks in
 
 ---
  xbmc/Application.cpp | 3 ++-
@@ -7270,10 +7270,10 @@ index ffb90dc..1cea2da 100644
 1.8.5.1
 
 
-From 3d5a34ae46fd2926eb533175570b85ddedc5594b Mon Sep 17 00:00:00 2001
+From e2fc2c9681c8b8944e92adf37e8d765d6f681fb9 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 13 Apr 2013 08:32:06 +0200
-Subject: [PATCH 56/89] X11: fix mouse coverage
+Subject: [PATCH 56/87] X11: fix mouse coverage
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++---
@@ -7339,10 +7339,10 @@ index e8993f1..5cccfb7 100644
 1.8.5.1
 
 
-From 0f8dbfd4fc7d27c1fa7539c3c88abe2f9de100a8 Mon Sep 17 00:00:00 2001
+From 8b3e7725ae97e444c72793274a1bdcf8b3da510a Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Wed, 8 May 2013 13:14:58 +0200
-Subject: [PATCH 57/89] X11: fix incorrectly used screen num in desktop
+Subject: [PATCH 57/87] X11: fix incorrectly used screen num in desktop
  resolution
 
 ---
@@ -7377,10 +7377,10 @@ index 2acb36d..101ba98 100644
 1.8.5.1
 
 
-From 74d73a2486e8e464f49ba389ab10eaed08a03e82 Mon Sep 17 00:00:00 2001
+From 774a1a2f4c2ba3775e81aea7bd32c0837a028e6a Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 9 May 2013 12:07:09 +0200
-Subject: [PATCH 58/89] X11: do not overwrite user selected monitor with
+Subject: [PATCH 58/87] X11: do not overwrite user selected monitor with
  fallback
 
 ---
@@ -7505,10 +7505,10 @@ index 5cccfb7..1b658e2 100644
 1.8.5.1
 
 
-From 240beb1b793a570825ff5d85ce5cf395aedcc8d9 Mon Sep 17 00:00:00 2001
+From 1991e2c52b053ab3e843108b44e6066170d7b50e Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sun, 12 May 2013 10:50:30 +0200
-Subject: [PATCH 59/89] xrandr: add turn on/off to wrapper
+Subject: [PATCH 59/87] xrandr: add turn on/off to wrapper
 
 ---
  xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++----
@@ -7674,10 +7674,10 @@ index d37838a..059062f 100644
 1.8.5.1
 
 
-From d8f95be6e1cea15dc70a98fec39681129a8d0637 Mon Sep 17 00:00:00 2001
+From abb1f21e8fc73c559a9814bedf270c891da3a747 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sun, 19 May 2013 12:55:35 +0200
-Subject: [PATCH 60/89] xrandr: add GetPreferredMode to wrapper
+Subject: [PATCH 60/87] xrandr: add GetPreferredMode to wrapper
 
 ---
  xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++
@@ -7734,10 +7734,10 @@ index 059062f..ab7cc63 100644
 1.8.5.1
 
 
-From 3a101d60a16f4442750b5da19ab034b336f10d43 Mon Sep 17 00:00:00 2001
+From da132f2c4a01bfd0876efaae8e669338f5e2004e Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sat, 11 May 2013 17:12:12 +0200
-Subject: [PATCH 61/89] X11: multi-head improvement - poll for desired output
+Subject: [PATCH 61/87] X11: multi-head improvement - poll for desired output
  if we do not get an xrr event
 
 ---
@@ -7752,7 +7752,7 @@ Subject: [PATCH 61/89] X11: multi-head improvement - poll for desired output
  8 files changed, 105 insertions(+), 12 deletions(-)
 
 diff --git a/language/English/strings.po b/language/English/strings.po
-index 891845a..b83a8d2 100755
+index a96c8d0..3b301d5 100755
 --- a/language/English/strings.po
 +++ b/language/English/strings.po
 @@ -6464,7 +6464,7 @@ msgctxt "#14071"
@@ -8018,10 +8018,10 @@ index 62003f5..8525ede 100644
 1.8.5.1
 
 
-From dda5cfe8b536f9321d2c3bd2465d3376474775d6 Mon Sep 17 00:00:00 2001
+From 13ddb290423f91011e96536301da3a73abaeb298 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Wed, 15 May 2013 09:14:34 +0200
-Subject: [PATCH 62/89] X11: ignore mouse move event form other windows
+Subject: [PATCH 62/87] X11: ignore mouse move event form other windows
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 4 +++-
@@ -8053,10 +8053,10 @@ index 908c8b6..938ad26 100644
 1.8.5.1
 
 
-From de394da778f766e2d9289dc6e20dd123da07a4a1 Mon Sep 17 00:00:00 2001
+From c3e84823be7dd6759c66da5e98c61fb32497bfdf Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 11 Jun 2013 16:20:29 +0200
-Subject: [PATCH 63/89] renderer: allow some lateness within vblank interval
+Subject: [PATCH 63/87] renderer: allow some lateness within vblank interval
 
 ---
  xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++--
@@ -8116,10 +8116,10 @@ index 949c652b..d84ff6c 100644
 1.8.5.1
 
 
-From dd9d62113d9e69752511d83149a92d13cb4eca4b Mon Sep 17 00:00:00 2001
+From bfaafb6c138dde7079ecba76bf2b4b9d5384a483 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 16 Jun 2013 13:22:58 +0200
-Subject: [PATCH 64/89] X11: another fix for mouse coverage
+Subject: [PATCH 64/87] X11: another fix for mouse coverage
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 6 ++++--
@@ -8152,10 +8152,10 @@ index 938ad26..e4ca56d 100644
 1.8.5.1
 
 
-From 44d310093823adf9818e0c56f30cd208a702a6c7 Mon Sep 17 00:00:00 2001
+From e295a85b5e8d8066a8a362eb8cbd922260291ddd Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Fri, 5 Jul 2013 12:14:00 +0200
-Subject: [PATCH 65/89] X11: set windows class name
+Subject: [PATCH 65/87] X11: set windows class name
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++-
@@ -8197,17 +8197,17 @@ index b3fe5102..df5fe9b 100644
 1.8.5.1
 
 
-From e9ea4959e0ebc8f6959e99c27575bf04b087de8d Mon Sep 17 00:00:00 2001
+From 06cfcf203dece8b2e4d2949411daf9665ccc4675 Mon Sep 17 00:00:00 2001
 From: spiff <spiff@xbmc.org>
 Date: Tue, 16 Jul 2013 14:34:04 +0200
-Subject: [PATCH 66/89] fixed: typo
+Subject: [PATCH 66/87] fixed: typo
 
 ---
  language/English/strings.po | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/language/English/strings.po b/language/English/strings.po
-index b83a8d2..a864a97 100755
+index 3b301d5..4095e5c 100755
 --- a/language/English/strings.po
 +++ b/language/English/strings.po
 @@ -6598,7 +6598,7 @@ msgstr ""
@@ -8223,10 +8223,10 @@ index b83a8d2..a864a97 100755
 1.8.5.1
 
 
-From 5e5232700048e1311fbdfac2d8d5a55a95039a71 Mon Sep 17 00:00:00 2001
+From 8d9c0cb04beb3a2fc6f251d65e517fcc9429a514 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 25 Jul 2013 17:18:13 +0200
-Subject: [PATCH 67/89] ActiveAE: slightly reduce buffer size
+Subject: [PATCH 67/87] ActiveAE: slightly reduce buffer size
 
 ---
  xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++--
@@ -8251,10 +8251,10 @@ index abf1509..f25ab49 100644
 1.8.5.1
 
 
-From 2ad8b89ce9648ba531f0bb2bf2bb7fcc404ceaa2 Mon Sep 17 00:00:00 2001
+From 5c8683375f28ef8ba446e482437457a2fc6fd436 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sun, 4 Aug 2013 10:11:16 +0200
-Subject: [PATCH 68/89] Revert "vdpau: comment some features that will be added
+Subject: [PATCH 68/87] Revert "vdpau: comment some features that will be added
  later"
 
 This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf.
@@ -8310,10 +8310,10 @@ index 3292461..c04f161 100644
 1.8.5.1
 
 
-From 5882daad3e2f87bcb3d0e1ea0490cb80b3c99153 Mon Sep 17 00:00:00 2001
+From 312180ffcef1a7c98b8c0f6877b78cf09cb12423 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Fri, 9 Aug 2013 18:01:40 +0200
-Subject: [PATCH 69/89] X11: fix keysyms
+Subject: [PATCH 69/87] X11: fix keysyms
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 2 +-
@@ -8336,10 +8336,10 @@ index e4ca56d..b20130c 100644
 1.8.5.1
 
 
-From a80c14946d4cc5188b9b7178a43af01eaed93135 Mon Sep 17 00:00:00 2001
+From 1835f9aa96acb76744cf9a878a7900ee6b88669d Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Fri, 9 Aug 2013 18:42:36 +0200
-Subject: [PATCH 70/89] X11: fix keysym for non-IM
+Subject: [PATCH 70/87] X11: fix keysym for non-IM
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 2 +-
@@ -8362,10 +8362,10 @@ index b20130c..a38890c 100644
 1.8.5.1
 
 
-From b477141fe4ffb62146da2d2d0ad60caa48a63463 Mon Sep 17 00:00:00 2001
+From a21e7455e59f1d2387d47c259a08eeb5a29311ac Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sat, 10 Aug 2013 11:18:16 +0200
-Subject: [PATCH 71/89] add some missing multi media keys
+Subject: [PATCH 71/87] add some missing multi media keys
 
 ---
  system/keymaps/keyboard.xml  | 3 +++
@@ -8420,10 +8420,10 @@ index ee6bb69..364b45a 100644
 1.8.5.1
 
 
-From 8662a0f91ea837bfdcd8378eb2ac52167527fefe Mon Sep 17 00:00:00 2001
+From e552f3533b1cd258b4534fc255cab3936ccf24e4 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sat, 10 Aug 2013 15:53:45 +0200
-Subject: [PATCH 72/89] X11: squash multi
+Subject: [PATCH 72/87] X11: squash multi
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 2 +-
@@ -8446,10 +8446,10 @@ index df5fe9b..d8e04d6 100644
 1.8.5.1
 
 
-From 4528f971394c03d8b039e34f41aaa29a7a3e1471 Mon Sep 17 00:00:00 2001
+From 3f5edb14bea0ac6885fdd4d442e4a13424ead1fe Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 3 Sep 2013 20:46:17 +0200
-Subject: [PATCH 73/89] X11: do not poll default monitor
+Subject: [PATCH 73/87] X11: do not poll default monitor
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 2 +-
@@ -8472,10 +8472,10 @@ index d8e04d6..01f5272 100644
 1.8.5.1
 
 
-From d9146a163aed863187716ed216e40d86e5c8fc5e Mon Sep 17 00:00:00 2001
+From 58ac5f0fb0d6fb7f9a7ed128de68913b9a36178e Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 29 Oct 2013 20:57:28 +0100
-Subject: [PATCH 74/89] X11: fix broken monitor switching
+Subject: [PATCH 74/87] X11: fix broken monitor switching
 
 ---
  system/settings/settings.xml      |  1 -
@@ -8578,10 +8578,10 @@ index 40bc3b3..1663836 100644
 1.8.5.1
 
 
-From 956e57dbf2eddb37d57a9a995895b33aefd1ad49 Mon Sep 17 00:00:00 2001
+From a5a26d03d8c788053129d193846fccec40b889f5 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 29 Oct 2013 20:57:59 +0100
-Subject: [PATCH 75/89] X11: remove polling for connected outputs, use xrr
+Subject: [PATCH 75/87] X11: remove polling for connected outputs, use xrr
  events
 
 ---
@@ -8882,10 +8882,10 @@ index 7ec5be4..14622cb 100644
 1.8.5.1
 
 
-From 04d899ac67d05b44862e29654ed9b22c2b0624bb Mon Sep 17 00:00:00 2001
+From 4ef806770dacd235a0bed8569c10d1e02f3dc2e2 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 31 Oct 2013 09:37:13 +0100
-Subject: [PATCH 76/89] X11: remove grabbing of keyboard and mouse
+Subject: [PATCH 76/87] X11: remove grabbing of keyboard and mouse
 
 ---
  xbmc/windowing/WinEventsX11.cpp     |  4 ----
@@ -9003,10 +9003,10 @@ index 14622cb..d1c8729 100644
 1.8.5.1
 
 
-From 9d0bb8ef1be8d8c2ec7cf04b0ec7c54b1b4bc30e Mon Sep 17 00:00:00 2001
+From 55680e3aea08487e92784ebfa69d7488d82dbab5 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 31 Oct 2013 10:46:40 +0100
-Subject: [PATCH 77/89] X11: set ExposureMask on gl window, fixes not updated
+Subject: [PATCH 77/87] X11: set ExposureMask on gl window, fixes not updated
  areas
 
 ---
@@ -9032,10 +9032,10 @@ index 695b352..e55583c 100644
 1.8.5.1
 
 
-From 940c850d57c04d27b3525bcb5da285c1464d7842 Mon Sep 17 00:00:00 2001
+From e9c5e41a18b024fb070c7674082ea775bd74469a Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 31 Oct 2013 11:25:19 +0100
-Subject: [PATCH 78/89] X11: drop shortcuts, have WM do this
+Subject: [PATCH 78/87] X11: drop shortcuts, have WM do this
 
 ---
  xbmc/windowing/WinEventsX11.cpp | 21 ---------------------
@@ -9097,10 +9097,10 @@ index 6429291..4334d21 100644
 1.8.5.1
 
 
-From 98a8ec1aa65aebdc143e8d9e5e088943ac783f65 Mon Sep 17 00:00:00 2001
+From 924286696ec32bf1d7c6db2d01f56273f9912a2d Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 7 Nov 2013 15:02:00 +0100
-Subject: [PATCH 79/89] X11: adapt to new settings
+Subject: [PATCH 79/87] X11: adapt to new settings
 
 ---
  system/settings/settings.xml | 1 +
@@ -9122,10 +9122,10 @@ index 9a2c3d6..cf29088 100644
 1.8.5.1
 
 
-From 405528ada3f72a86d4750cdde7368c226def9280 Mon Sep 17 00:00:00 2001
+From 47798d7eb32d4c5b76b2aae3096ab240091c9098 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 14 Nov 2013 09:28:24 +0100
-Subject: [PATCH 80/89] X11: adapt to changes in cstdstring
+Subject: [PATCH 80/87] X11: adapt to changes in cstdstring
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp | 4 ++--
@@ -9173,10 +9173,10 @@ index 8525ede..c94f2e3 100644
 1.8.5.1
 
 
-From f722c3ae5f935d5b10d7bc0f3b879df030a34943 Mon Sep 17 00:00:00 2001
+From 5030971a557463734f9109aee08a162092068871 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 14 Nov 2013 18:50:57 +0100
-Subject: [PATCH 81/89] dvdplayer: fix failed to get stream message, lookup
+Subject: [PATCH 81/87] dvdplayer: fix failed to get stream message, lookup
  streams the same way as getting the index
 
 ---
@@ -9200,10 +9200,10 @@ index ad851e9..60475a3 100644
 1.8.5.1
 
 
-From 50b688685bae14dd692206233b6dfe7840044c92 Mon Sep 17 00:00:00 2001
+From c22a45926892111a9078e4274ac487b842886c6e Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 14 Nov 2013 19:22:01 +0100
-Subject: [PATCH 82/89] omxplayer: fix failed to get stream message
+Subject: [PATCH 82/87] omxplayer: fix failed to get stream message
 
 ---
  xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +-
@@ -9226,10 +9226,10 @@ index 4168195..f48a30f 100644
 1.8.5.1
 
 
-From 176989d4c0d42bde8e403cc52372206ecdc277a1 Mon Sep 17 00:00:00 2001
+From 72db3fc767f76710363a2392b0dd0d915544b5ac Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Mon, 18 Nov 2013 17:44:31 +0100
-Subject: [PATCH 83/89] ActiveAE: correct time of buffered samples by resample
+Subject: [PATCH 83/87] ActiveAE: correct time of buffered samples by resample
  ratio
 
 ---
@@ -9266,10 +9266,10 @@ index d5b01ea..9914e9e 100644
 1.8.5.1
 
 
-From b29203fd798ab3ebf2c602b6aaa6326adfb52989 Mon Sep 17 00:00:00 2001
+From c06109dac4d268ccf12de30368c2852d511858a3 Mon Sep 17 00:00:00 2001
 From: Marcel Groothuis <margro.xbmc@gmail.com>
 Date: Thu, 5 Dec 2013 22:02:50 +0100
-Subject: [PATCH 84/89] ffmpeg demuxer: faster channel change for PVR addons
+Subject: [PATCH 84/87] ffmpeg demuxer: faster channel change for PVR addons
  without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR)
  Credits: FernetMenta, Davilla, Popcornmix, Whaupt
 
@@ -9630,10 +9630,10 @@ index ca689d0..f383563 100644
 1.8.5.1
 
 
-From d54806452a6ba9fc5618c248ce3e0b673e9b0ae3 Mon Sep 17 00:00:00 2001
+From b6cdf70fff7c794948835e0bb5ee6a27ddcb596c Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Thu, 14 Nov 2013 20:35:04 +0100
-Subject: [PATCH 85/89] ffmpeg demuxer: make sure we start mpegts video with an
+Subject: [PATCH 85/87] ffmpeg demuxer: make sure we start mpegts video with an
  i-frame
 
 ---
@@ -9717,10 +9717,10 @@ index acde9a8..9ec0877 100644
 1.8.5.1
 
 
-From c9925e87c4fd45f4c58608ccbd662781960adb06 Mon Sep 17 00:00:00 2001
+From ed2c925ee93f2314e3bdd0a33f732cad88f3a9f8 Mon Sep 17 00:00:00 2001
 From: Wolfgang Haupt <w.haupt@at-visions.com>
 Date: Thu, 5 Dec 2013 22:11:57 +0100
-Subject: [PATCH 86/89] DVDFactoryDemuxer: skip streaminfo for udp tcp and
+Subject: [PATCH 86/87] DVDFactoryDemuxer: skip streaminfo for udp tcp and
  pvr-channels
 
 ---
@@ -9844,36 +9844,10 @@ index 146bf5c..e030b9d 100644
 1.8.5.1
 
 
-From 5b748ab133f7757081fa9b1dfcbd646f83f252ec Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Thu, 5 Dec 2013 14:19:10 +0100
-Subject: [PATCH 87/89] AE: add interface method KeepConfiguration
-
----
- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-index 9699858..706243c 100644
---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-@@ -858,7 +858,7 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt)
-   AEAudioFormat oldInternalFormat = m_internalFormat;
- 
-   inputFormat = GetInputFormat(desiredFmt);
--
-+  
-   m_sinkRequestFormat = inputFormat;
-   ApplySettingsToFormat(m_sinkRequestFormat, m_settings, (int*)&m_mode);
-   m_extKeepConfig = 0;
--- 
-1.8.5.1
-
-
-From 51b88de039ba9decbc47d2878763e22cea39b370 Mon Sep 17 00:00:00 2001
+From 8b27cb0e6c12a9462fe89ded548d27b5dc652220 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Tue, 10 Dec 2013 13:48:55 +0100
-Subject: [PATCH 89/89] ActiveAE: suspend hdmi audio during change of refresh
+Subject: [PATCH 87/87] ActiveAE: suspend hdmi audio during change of refresh
  rate
 
 ---
@@ -9881,7 +9855,7 @@ Subject: [PATCH 89/89] ActiveAE: suspend hdmi audio during change of refresh
  1 file changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-index 706243c..d325517 100644
+index 9699858..7fe68fc 100644
 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
 +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
 @@ -234,6 +234,8 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg)
diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch b/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch
deleted file mode 100644
index 20e6403177..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 29e44bb9f93767fd1235c33afa4877544f0f95b3 Mon Sep 17 00:00:00 2001
-From: xhaggi <sascha.woo@gmail.com>
-Date: Mon, 9 Dec 2013 15:25:11 +0100
-Subject: [PATCH] [pvr] observe PVRManager state to trigger epg create
-
----
- xbmc/pvr/PVRManager.cpp                       |  9 +++++++--
- xbmc/pvr/PVRManager.h                         |  3 ++-
- xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 12 +++++++++++-
- xbmc/pvr/channels/PVRChannelGroupInternal.h   |  5 ++++-
- xbmc/utils/Observer.h                         |  1 +
- 5 files changed, 25 insertions(+), 5 deletions(-)
-
-diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
-index 81d81c2..d35df1c 100644
---- a/xbmc/pvr/PVRManager.cpp
-+++ b/xbmc/pvr/PVRManager.cpp
-@@ -393,8 +393,13 @@ ManagerState CPVRManager::GetState(void) const
- 
- void CPVRManager::SetState(ManagerState state) 
- {
--  CSingleLock lock(m_managerStateMutex);
--  m_managerState = state;
-+  {
-+    CSingleLock lock(m_managerStateMutex);
-+    m_managerState = state;
-+    SetChanged();
-+  }
-+
-+  NotifyObservers(ObservableMessageManagerStateChanged);
- }
- 
- void CPVRManager::Process(void)
-diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h
-index 7038410..5359c05 100644
---- a/xbmc/pvr/PVRManager.h
-+++ b/xbmc/pvr/PVRManager.h
-@@ -26,6 +26,7 @@
- #include "threads/Event.h"
- #include "threads/Thread.h"
- #include "utils/JobManager.h"
-+#include "utils/Observer.h"
- 
- class CGUIDialogProgressBarHandle;
- class CStopWatch;
-@@ -83,7 +84,7 @@
- 
-   typedef boost::shared_ptr<PVR::CPVRChannelGroup> CPVRChannelGroupPtr;
- 
--  class CPVRManager : public ISettingCallback, private CThread
-+  class CPVRManager : public ISettingCallback, private CThread, public Observable
-   {
-     friend class CPVRClients;
- 
-diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
-index 0bb07d2..ff06d48 100644
---- a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
-+++ b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
-@@ -53,6 +53,7 @@
- CPVRChannelGroupInternal::~CPVRChannelGroupInternal(void)
- {
-   Unload();
-+  g_PVRManager.UnregisterObserver(this);
- }
- 
- bool CPVRChannelGroupInternal::Load(void)
-@@ -60,7 +61,8 @@ bool CPVRChannelGroupInternal::Load(void)
-   if (CPVRChannelGroup::Load())
-   {
-     UpdateChannelPaths();
--    g_PVRManager.TriggerEpgsCreate();
-+    g_PVRManager.RegisterObserver(this);
-+      
-     return true;
-   }
- 
-@@ -385,3 +387,11 @@ bool CPVRChannelGroupInternal::CreateChannelEpgs(bool bForce /* = false */)
- 
-   return true;
- }
-+
-+void CPVRChannelGroupInternal::Notify(const Observable &obs, const ObservableMessage msg)
-+{
-+  if (msg == ObservableMessageManagerStateChanged)
-+  {
-+    g_PVRManager.TriggerEpgsCreate();
-+  }
-+}
-diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h
-index cba4180..10f728a 100644
---- a/xbmc/pvr/channels/PVRChannelGroupInternal.h
-+++ b/xbmc/pvr/channels/PVRChannelGroupInternal.h
-@@ -21,6 +21,7 @@
-  */
- 
- #include "PVRChannelGroup.h"
-+#include "utils/Observer.h"
- 
- namespace PVR
- {
-@@ -29,7 +30,7 @@
- 
-   /** XBMC's internal group, the group containing all channels */
- 
--  class CPVRChannelGroupInternal : public CPVRChannelGroup
-+  class CPVRChannelGroupInternal : public CPVRChannelGroup, public Observer
-   {
-     friend class CPVRChannelGroups;
-     friend class CPVRDatabase;
-@@ -45,6 +46,8 @@
- 
-     virtual ~CPVRChannelGroupInternal(void);
- 
-+    virtual void Notify(const Observable &obs, const ObservableMessage msg);
-+
-     /**
-      * @brief The amount of channels in this container.
-      * @return The amount of channels in this container.
-diff --git a/xbmc/utils/Observer.h b/xbmc/utils/Observer.h
-index 291d86b..3ac032a 100644
---- a/xbmc/utils/Observer.h
-+++ b/xbmc/utils/Observer.h
-@@ -40,6 +40,7 @@
-   ObservableMessageTimersReset,
-   ObservableMessageRecordings,
-   ObservableMessagePeripheralsChanged,
-+  ObservableMessageManagerStateChanged
- } ObservableMessage;
- 
- class Observer
--- 
-1.8.5.1
-
diff --git a/packages/multimedia/crystalhd/meta b/packages/multimedia/crystalhd/meta
index f471341558..3ef420108d 100644
--- a/packages/multimedia/crystalhd/meta
+++ b/packages/multimedia/crystalhd/meta
@@ -27,6 +27,7 @@ PKG_SITE="http://git.linuxtv.org/jarod/crystalhd.git"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="linux"
 PKG_BUILD_DEPENDS="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="crystalhd: OSX and Linux driver and library support for the Broadcom Crystal HD Video Accelerator."
diff --git a/packages/multimedia/crystalhd/need_unpack b/packages/multimedia/crystalhd/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/multimedia/crystalhd/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/meta b/packages/x11/driver/xf86-video-nvidia-legacy/meta
index dec2b6cda5..c257e68ea3 100644
--- a/packages/x11/driver/xf86-video-nvidia-legacy/meta
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/meta
@@ -28,6 +28,7 @@ PKG_SITE="http://www.nvidia.com/"
 [ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
 PKG_DEPENDS="linux libXinerama"
 PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-nvidia-legacy: The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices too"
diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack b/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/x11/driver/xf86-video-nvidia-legacy/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta
index eff250db6a..7cfa82a0ab 100644
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="319.72"
+PKG_VERSION="319.76"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
@@ -28,6 +28,7 @@ PKG_SITE="http://www.nvidia.com/"
 [ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
 PKG_DEPENDS="linux libXinerama"
 PKG_BUILD_DEPENDS="toolchain util-macros linux xorg-server"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-nvidia: The Xorg driver for NVIDIA video chips"
diff --git a/packages/x11/driver/xf86-video-nvidia/need_unpack b/packages/x11/driver/xf86-video-nvidia/need_unpack
deleted file mode 100755
index 42f8077c7a..0000000000
--- a/packages/x11/driver/xf86-video-nvidia/need_unpack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/meta -nt $STAMP -o \
-     $PKG_DIR/package.mk -nt $STAMP -o \
-     $ROOT/packages/linux/meta -nt $STAMP -o \
-     $ROOT/packages/linux/package.mk -nt $STAMP && rm -f $STAMP
-
-exit 0
diff --git a/scripts/clean b/scripts/clean
index 1b68b2f508..bf20740cf9 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -22,8 +22,7 @@
 
 . config/options $1
 
-clean ()
-{
+if [ ! -z "$1" ]; then
   printf "%${BUILD_INDENT}c CLEAN    $1\n" ' '>&$SILENT_OUT
   export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
@@ -32,45 +31,20 @@ clean ()
     return
   fi
 
-  if [ "$FULL" = true ]; then
-    rm -rf $BUILD_BASE*/$STAMPS_NOARCH/$1*
-    rm -rf $BUILD_BASE*/$1*
-    rm -rf $STAMPS_NOARCH/$1
-    rm -rf $SOURCES/$1
-  else
-    for i in $BUILD/$1-*; do
-      if [ -d $i ] ; then
-        if [ -f $i/.openelec-unpack ] ; then
-          . $i/.openelec-unpack
-          if [ "$STAMP_PKG_NAME" = "$1" ]; then
-            printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
-            rm -rf $i
-          fi
-        else
-          printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
-          rm -rf $i
-        fi
+  for i in $BUILD/$1-*; do
+    if [ -d $i -a -f "$i/.openelec-unpack" ] ; then
+      . "$i/.openelec-unpack"
+      if [ "$STAMP_PKG_NAME" = "$1" ]; then
+        printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
+        rm -rf $i
       fi
-    done
-    rm -f $STAMPS/$1*/build_*
-  fi
-}
-
-if [ "$1" = "--full" ]; then
-  FULL=true
-  shift
-elif [ "$1" = "--sources" ]; then
-  CLEAN_SOURCES=true
-  shift
-fi
-
-if [ -z "$1" ]; then
-  for i in $PACKAGES/*; do clean ${i#$PACKAGES/}; done
-  rm -rf $BUILD/iso
-  rm -rf $BUILD/ziso
-  [ "$FULL" = true ] && rm -rf $CCACHE_DIR
-else
-  clean $1
+    else
+      # force clean if no stamp found (previous unpack failed)
+      printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
+      rm -rf $i
+    fi
+  done
+  rm -f $STAMPS/$1*/build_*
 fi
 
 exit 0
diff --git a/scripts/unpack b/scripts/unpack
index c10d2e10a0..ce862102b4 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -36,25 +36,34 @@ mkdir -p $BUILD
 
 [ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
 
-[ -f "$STAMP" -a -f "$PKG_DIR/need_unpack" ] && $PKG_DIR/need_unpack $@
-
-if [ -f $PKG_DIR/package.mk ]; then
-  # trigger unpack / full rebuild on any package.mk change
-  if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then
-    CLEAN_SOURCE=yes
-  fi
-elif [ -f $PKG_DIR/meta ]; then
-  # trigger unpack / full rebuild on any meta change (deprecated)
-  if [ -f $STAMP -a $PKG_DIR/meta -nt $STAMP ]; then
-    CLEAN_SOURCE=yes
-  fi
-fi
-
-for patch in $PKG_DIR/patches/*; do
-  # trigger unpack / full rebuild on any patch change
-  if [ "$patch" -nt "$STAMP" ]; then
-    CLEAN_SOURCE=yes
-    break
+for i in $BUILD/$1-*; do
+  if [ -d $i -a -f "$i/.openelec-unpack" ] ; then
+    . "$i/.openelec-unpack"
+    if [ "$STAMP_PKG_NAME" = "$1" ]; then
+      # trigger unpack / full rebuild on any package.mk change
+      if [ -f $PKG_DIR/package.mk -a $PKG_DIR/package.mk -nt "$i/.openelec-unpack" ]; then
+        CLEAN_SOURCE=yes
+        break
+      # TODO: remove after converting ALL packages
+      elif [ -f $PKG_DIR/meta -a $PKG_DIR/meta -nt "$i/.openelec-unpack" ]; then
+        CLEAN_SOURCE=yes
+        break
+      fi
+      # handle $PKG_NEED_UNPACK
+      for file in $PKG_NEED_UNPACK; do
+        if [ -f "$file" -a "$file" -nt "$i/.openelec-unpack" ] ; then
+          CLEAN_SOURCE=yes
+          break
+        fi
+      done
+      # trigger unpack / full rebuild on any patch change
+      for patch in $PKG_DIR/patches/* $PKG_DIR/patches.upstream/*; do
+        if [ -f "$patch" -a "$patch" -nt "$i/.openelec-unpack" ]; then
+          CLEAN_SOURCE=yes
+          break
+        fi
+      done
+    fi
   fi
 done