config/version: set version to 4.1.1, set OS version to 4.2

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/graphic

@@ -28,7 +28,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -69,11 +69,6 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
     fi
 
-    if [ "$drv" = "virtualbox" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
-    fi
-
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
@@ -101,12 +96,5 @@ get_graphicdrivers() {
       COMPOSITE_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "vmware" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
-      XORG_DRIVERS="$XORG_DRIVERS vmware"
-#      LLVM_SUPPORT="yes"
-    fi
-
   done
 }

config/version

@@ -1,8 +1,8 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.0.7"
+  OPENELEC_VERSION="4.1.1"
 
 # OS_VERSION: OS Version
-  OS_VERSION="4.0"
+  OS_VERSION="4.2"
 
 # ADDON_VERSION: Addon version
   ADDON_VERSION="4.1"

packages/3rdparty/multimedia/vdr-iptv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-iptv"
-PKG_VERSION="2.1.2"
+PKG_VERSION="2.1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="bf11f9e"
+PKG_VERSION="bdcad3f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-eepg"
-PKG_VERSION="69b47ba"
+PKG_VERSION="d7dc614"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-vnsiserver"
-PKG_VERSION="a3f7ac5"
+PKG_VERSION="7d4aa81"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-satip/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-satip"
-PKG_VERSION="0.2.0"
+PKG_VERSION="0.3.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-dont-build-i18n.patch

@@ -0,0 +1,25 @@
+From f1923761486397809be88b3344d0c498afe1bf29 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Mon, 9 Jun 2014 22:02:58 +0300
+Subject: [PATCH] dont build i18n
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 87d274e..b9f4b29 100644
+--- a/Makefile
++++ b/Makefile
+@@ -74,7 +74,7 @@ UNCRUSTIFY_FILES = scanner.c scanner.h scanfilter.c scanfilter.h statemachine.h
+ 
+ ### The main target:
+ 
+-all: libvdr-$(PLUGIN).so i18n
++all: libvdr-$(PLUGIN).so
+ 
+ ### Implicit rules:
+ 
+-- 
+1.7.2.5
+

packages/3rdparty/multimedia/vdr-wirbelscancontrol/patches/vdr-wirbelscancontrol-01-dont-build-i18n.patch

@@ -0,0 +1,25 @@
+From 60bb89fa8f5d29e72e06c68c0b48a374ac95d522 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Mon, 9 Jun 2014 22:04:41 +0300
+Subject: [PATCH] dont build i18n
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f3ae479..89e2970 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@ UNCRUSTIFY_FILES = $(PLUGIN).c scanmenu.c scanmenu.h
+ 
+ ### The main target:
+ 
+-all: libvdr-$(PLUGIN).so i18n
++all: libvdr-$(PLUGIN).so
+ 
+ ### Implicit rules:
+ 
+-- 
+1.7.2.5
+

packages/3rdparty/web/tntnet/package.mk

@@ -50,10 +50,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
                            --with-ssl=no \
                            --with-stressjob=no"
 
-pre_configure_target() {
-  strip_lto
-}
-
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/share

packages/addons/service/multimedia/tvheadend/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.4.27"
+PKG_VERSION="3.9.681"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -46,6 +46,8 @@ configure_target() {
             --enable-timeshift \
             --disable-libav \
             --disable-avahi \
+            --python=$ROOT/$TOOLCHAIN/bin/python \
+            --disable-uriparser \
             --enable-bundle
 }
 

packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch

@@ -0,0 +1,12 @@
+diff -Naur tvheadend-3.9.1050/Makefile tvheadend-3.9.1050.patch/Makefile
+--- tvheadend-3.9.1050/Makefile	2014-07-07 21:39:24.000000000 +0200
++++ tvheadend-3.9.1050.patch/Makefile	2014-07-14 17:57:09.483454814 +0200
+@@ -28,7 +28,7 @@
+ #
+ 
+ CFLAGS  += -g -O2
+-CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
++CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
+ CFLAGS  += -Wmissing-prototypes
+ CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
+ CFLAGS  += -D_FILE_OFFSET_BITS=64

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -72,11 +72,6 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
   . $driver_dvb
 done
 
-# (wait for) at least 1 adapter (xbmc allows to set 0)
-# xbmc allows "numeric" type field to be empty. lets handle thaat
-[ "$NUM_ADAPTERS" = "" ] && NUM_ADAPTERS=1
-# 0 does not make sense. should be 1 or more
-[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
 if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
   while [ true ] ; do
     if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then

packages/addons/service/multimedia/tvheadend/source/resources/settings.xml

@@ -14,7 +14,7 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
-		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
+		<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
 		<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
     </category>

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,11 @@
+4.1.7
+- add option to override epg charset
+- update to vdr-plugin-vnsiserver-7d4aa81
+- update to vdr-satip-0.3.3
+- update to vdr-plugin-eepg-d7dc614
+- update to vdr-plugin-dvbapi-bdcad3f
+- update to vdr-iptv-2.1.3
+
 4.1.6
 - update to vdr-2.1.6
 - add plugin 'vdr-dummydevice'

packages/addons/service/multimedia/vdr-addon/package.mk

@@ -19,7 +19,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="4.1"
-PKG_REV="6"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -76,13 +76,19 @@ if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
   fi
 fi
 
+if [ "$ENABLE_CHARSET_OVERRIDE" == "true" ] ; then
+  if [ ! -z "$CHARSET_OVERRIDE_STR" ] ; then
+    VDR_CHARSET_OVERRIDE="$CHARSET_OVERRIDE_STR"
+  fi
+fi
+
 # keep softcam first
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P dvbapi"
 fi
 VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
 if [ "$ENABLE_IPTV" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P iptv"
+  VDR_ARG="$VDR_ARG -P 'iptv -d $IPTV_NUM_DEVICES'"
 fi
 if [ "$ENABLE_STREAMDEV_SERVER" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P streamdev-server"
@@ -149,11 +155,6 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
   . $driver_dvb
 done
 
-# (wait for) at least 1 adapter (xbmc allows to set 0)
-# xbmc allows "numeric" type field to be empty. lets handle thaat
-[ "$NUM_ADAPTERS" = "" ] && NUM_ADAPTERS=1
-# 0 does not make sense. should be 1 or more
-[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
 if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
   while [ true ] ; do
     if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then
@@ -164,4 +165,4 @@ if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
 fi
 
 fix_config
-eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG
+eval LANG=en_US.UTF-8 VDR_CHARSET_OVERRIDE="$VDR_CHARSET_OVERRIDE" exec vdr.bin $VDR_ARG

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -7,6 +7,8 @@
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
 	<string id="1023">Number of adapters to wait for</string>
+	<string id="1024">Enable charset override</string>
+	<string id="1025">- charset</string>
 	<string id="1030">Plugin Configuration</string>
 	<string id="1031">Enable plugin: iptv</string>
 	<string id="1032">Enable plugin: streamdev-client</string>
@@ -27,4 +29,5 @@
 	<string id="1053">PVR plugin</string>
         <string id="1056">Enable external recdmd</string>
         <string id="1057">External recdmd path</string>
+        <string id="1058">- number of devices</string>
 </strings>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -4,8 +4,10 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
-		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
+		<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
+		<setting id="ENABLE_CHARSET_OVERRIDE" type="bool" label="1024" default="false" />
+		<setting id="CHARSET_OVERRIDE_STR" type="text" label="1025" visible="!eq(-1,false)" default="" />
     </category>
     <category label="1002">
 		<setting label="1051" type="lsep"/>
@@ -20,6 +22,7 @@
 		<setting type="sep" />
 		<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="vnsiserver" />
 		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
+		<setting id="IPTV_NUM_DEVICES" type="slider" option="int" range="1,4" label="1058" visible="!eq(-1,false)" default="1" />
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
 		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
 		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />

packages/addons/service/multimedia/vdr-addon/source/settings-default.xml

@@ -20,4 +20,7 @@
     <setting id="ENABLE_SATIP" value="false" />
     <setting id="ENABLE_EXTERNAL_RECCMD" value="false" />
     <setting id="EXTERNAL_RECCMD_PATH" value="" />
+    <setting id="ENABLE_CHARSET_OVERRIDE" value="false" />
+    <setting id="CHARSET_OVERRIDE_STR" value="" />
+    <setting id="IPTV_NUM_DEVICES" value="1" />
 </settings>

packages/debug/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain gdb strace"
+PKG_DEPENDS_TARGET="toolchain gdb"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="debug: Metapackage for installing debugging tools"

packages/debug/strace/patches/strace-4.8-autoreconf.patch

@@ -1,13 +0,0 @@
-diff -Naur strace-4.8/configure.ac strace-4.8.patch/configure.ac
---- strace-4.8/configure.ac	2013-05-04 21:51:57.000000000 +0200
-+++ strace-4.8.patch/configure.ac	2013-09-04 03:30:12.478057723 +0200
-@@ -1,8 +1,6 @@
- dnl Process this file with autoconf to create configure.  Use autoreconf.
- AC_PREREQ(2.57)
--AC_INIT([strace],
--	m4_esyscmd([./git-version-gen .tarball-version]),
--	[strace-devel@lists.sourceforge.net])
-+AC_INIT([strace],[4.8])
- AC_CONFIG_SRCDIR([strace.c])
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_HEADERS([config.h])

packages/debug/strace/patches/strace-fix-ptrace_peeksiginfo_args.patch

@@ -1,99 +0,0 @@
-From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001
-From: Ali Polatel <alip at exherbo.org>
-Date: Tue, 24 Sep 2013 20:04:32 +0300
-Subject: [PATCH 01/29] Work around conflict between <sys/ptrace.h> and
- <linux/ptrace.h>
-
-Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
-which collides with <linux/ptrace.h>.
-
-* configure.ac: Check for `struct ptrace_peeksiginfo_args' in <sys/ptrace.h>.
-* process.c: Work around potential conflict between <sys/ptrace.h>
-and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
-* signal.c: Likewise.
-* syscall.c: Likewise.
-* util.c: Likewise.
-
-Signed-off-by: Ali Polatel <alip at exherbo.org>
----
-
-diff --git a/configure.ac b/configure.ac
-index f19e4f2..aa4923a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
- 
- AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
- 
--AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
-+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,,
- 	       [#include <sys/ptrace.h>])
- 
- AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>])
-diff --git a/process.c b/process.c
-index 1a2181b..59428a4 100644
---- a/process.c
-+++ b/process.c
-@@ -63,7 +63,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
-diff --git a/signal.c b/signal.c
-index 7fb9abf..3411ddd 100644
---- a/signal.c
-+++ b/signal.c
-@@ -51,7 +51,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
-diff --git a/syscall.c b/syscall.c
-index 83a95bd..3477dcd 100644
---- a/syscall.c
-+++ b/syscall.c
-@@ -48,7 +48,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
-diff --git a/util.c b/util.c
-index 0dab902..30a7f19 100644
---- a/util.c
-+++ b/util.c
-@@ -55,7 +55,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-+#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-+# endif
- # include <linux/ptrace.h>
-+# undef ptrace_peeksiginfo_args
- # undef ia64_fpreg
- # undef pt_all_user_regs
- #endif
--- 
-1.8.3.2
-

packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch

@@ -0,0 +1,139 @@
+Upstream-Status: Pending
+
+Index: autoconf-2.63/bin/autoreconf.in
+===================================================================
+--- autoconf-2.63.orig/bin/autoreconf.in	2008-12-31 17:39:01.000000000 +0000
++++ autoconf-2.63/bin/autoreconf.in	2008-12-31 17:43:38.000000000 +0000
+@@ -76,6 +76,7 @@
+   -i, --install            copy missing auxiliary files
+       --no-recursive       don't rebuild sub-packages
+   -s, --symlink            with -i, install symbolic links instead of copies
++  -x, --exclude=STEPS      steps we should not run
+   -m, --make               when applicable, re-run ./configure && make
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
+ 
+@@ -136,6 +137,13 @@
+ # Recurse into subpackages
+ my $recursive = 1;
+ 
++# Steps to exclude
++my @exclude;
++my @ex;
++
++my $uses_gettext;
++my $configure_ac;
++
+ ## ---------- ##
+ ## Routines.  ##
+ ## ---------- ##
+@@ -153,6 +161,7 @@
+ 	  'B|prepend-include=s'	 => \@prepend_include,
+ 	  'i|install'            => \$install,
+ 	  's|symlink'            => \$symlink,
++  	  'x|exclude=s'          => \@exclude,
+ 	  'm|make'               => \$run_make,
+ 	  'recursive!'           => \$recursive);
+ 
+@@ -162,6 +171,8 @@
+   parse_WARNINGS;
+   parse_warnings '--warnings', @warning;
+ 
++  @exclude = map { split /,/ } @exclude;
++
+   # Even if the user specified a configure.ac, trim to get the
+   # directory, and look for configure.ac again.  Because (i) the code
+   # is simpler, and (ii) we are still able to diagnose simultaneous
+@@ -255,6 +266,11 @@
+ {
+   my ($aclocal, $flags) = @_;
+ 
++  @ex = grep (/^aclocal$/, @exclude);
++  if ($#ex != -1) {
++    return;
++  }
++
+   # aclocal 1.8+ does all this for free.  It can be recognized by its
+   # --force support.
+   if ($aclocal_supports_force)
+@@ -368,7 +384,10 @@
+     }
+   else
+     {
+-      xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++      @ex = grep (/^autopoint$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
++      }
+     }
+ 
+ 
+@@ -532,16 +551,17 @@
+ 	{
+ 	  $libtoolize .= " --ltdl";
+ 	}
+-      xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
+-      $rerun_aclocal = 1;
++      @ex = grep (/^libtoolize$/, @exclude);
++      if ($#ex == -1) {
++        xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
++        $rerun_aclocal = 1;
++      }
+     }
+   else
+     {
+       verb "$configure_ac: not running libtoolize: --install not given";
+     }
+ 
+-
+-
+   # ------------------- #
+   # Rerunning aclocal.  #
+   # ------------------- #
+@@ -572,7 +592,10 @@
+   # latter runs the former, and (ii) autoconf is stricter than
+   # autoheader.  So all in all, autoconf should give better error
+   # messages.
+-  xsystem ($autoconf);
++  @ex = grep (/^autoconf$/, @exclude);
++  if ($#ex == -1) {
++    xsystem ("$autoconf");
++  }
+ 
+ 
+   # -------------------- #
+@@ -593,7 +616,10 @@
+     }
+   else
+     {
+-      xsystem ($autoheader);
++      @ex = grep (/^autoheader$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autoheader");
++      }
+     }
+ 
+ 
+@@ -610,7 +636,10 @@
+       # We should always run automake, and let it decide whether it shall
+       # update the file or not.  In fact, the effect of `$force' is already
+       # included in `$automake' via `--no-force'.
+-      xsystem ($automake);
++      @ex = grep (/^automake$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$automake");
++      }
+     }
+ 
+ 
+@@ -634,7 +663,10 @@
+ 	    }
+ 	  else
+ 	    {
+-	      xsystem ("$make");
++              @ex = grep (/^make$/, @exclude);
++              if ($#ex == -1) {
++	        xsystem ("$make");
++              }
+ 	    }
+ 	}
+     }

packages/devel/cmake/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="2.8.12.1"
+PKG_VERSION="3.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.cmake.org/"
-PKG_URL="http://www.cmake.org/files/v2.8/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.cmake.org/files/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
@@ -33,15 +33,13 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 configure_host() {
-  ../configure --no-qt-gui -- -DBUILD_CursesDialog=0
+  ../configure --prefix=$ROOT/$TOOLCHAIN \
+               --no-qt-gui \
+               -- \
+               -DBUILD_CursesDialog=0
 }
 
-makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp -P bin/cmake $ROOT/$TOOLCHAIN/bin
-    cp -P bin/cpack $ROOT/$TOOLCHAIN/bin
-    cp -P bin/ctest $ROOT/$TOOLCHAIN/bin
-
+post_makeinstall_host() {
   mkdir -p $ROOT/$TOOLCHAIN/etc
 
   cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF

packages/devel/gettext/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gettext"
-PKG_VERSION="0.18.3.2"
+PKG_VERSION="0.19.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -39,4 +39,5 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
                          --with-gnu-ld \
                          --disable-java \
                          --disable-native-java \
+                         --disable-csharp \
                          --without-emacs"

packages/devel/glib/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.34.3"
+PKG_VERSION="2.40.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.40/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="ccache:host libffi:host libxml2:host zlib:host Python:host"
 PKG_DEPENDS_TARGET="toolchain zlib libffi pcre glib:host Python:host"
 PKG_PRIORITY="optional"
@@ -58,7 +58,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_mmap_fixed_mapped=yes \
                            --disable-man \
                            --disable-dtrace \
                            --disable-systemtap \
-                           --disable-gcov \
                            --enable-Bsymbolic \
                            --with-gnu-ld \
                            --with-threads=posix \

packages/devel/glib/patches/glib-2.34.3-automake_1.13.patch

@@ -1,11 +0,0 @@
-diff -Naur glib-2.34.3-old/configure.ac glib-2.34.3-new/configure.ac
---- glib-2.34.3-old/configure.ac	2012-12-29 06:22:04.000000000 -0800
-+++ glib-2.34.3-new/configure.ac	2012-12-29 06:22:28.000000000 -0800
-@@ -293,7 +293,6 @@
- 
- AC_HEADER_STDC
- 
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- 

packages/devel/glibc/package.mk

@@ -16,25 +16,25 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="eglibc"
-PKG_VERSION="2.19-25249"
+PKG_NAME="glibc"
+PKG_VERSION="2.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.eglibc.org/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_SITE="http://www.gnu.org/software/libc/"
+PKG_URL="ftp://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf:host linux:host gcc:bootstrap"
-PKG_DEPENDS_INIT="eglibc"
+PKG_DEPENDS_INIT="glibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
-PKG_SHORTDESC="eglibc: The Embedded GNU C library"
-PKG_LONGDESC="The Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing. In contrast to what Ulrich Drepper makes out of GLIBC, in EGLIBC all patches assigned to the FSF will be considered regardless of individual or company affiliation and cooperation is encouraged, as well as communication, civility, and respect among developers."
+PKG_SHORTDESC="glibc: The GNU C library"
+PKG_LONGDESC="The Glibc package contains the main C library. This library provides the basic routines for allocating memory, searching directories, opening and closing files, reading and writing files, string handling, pattern matching, arithmetic, and so on."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
-                           --libexecdir=/usr/lib/eglibc \
+                           --libexecdir=/usr/lib/glibc \
                            --cache-file=config.cache \
                            --disable-profile \
                            --disable-sanity-checks \
@@ -57,15 +57,14 @@ if [ "$DEBUG" = yes ]; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-debug"
 else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug"
-  DEBUG_OPTIONS="  OPTION_EGLIBC_MEMUSAGE = n"
 fi
 
 NSS_CONF_DIR="$PKG_BUILD/nss"
 
-EGLIBC_EXCLUDE_BIN="catchsegv getconf iconv iconvconfig ldconfig lddlibc4"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof tzselect"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN xtrace zdump zic"
+GLIBC_EXCLUDE_BIN="catchsegv gencat getconf iconv iconvconfig ldconfig lddlibc4"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof tzselect"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN xtrace zdump zic"
 
 pre_build_target() {
   cd $PKG_BUILD
@@ -78,7 +77,7 @@ pre_configure_target() {
 # Fails to compile with GCC's link time optimization.
   strip_lto
 
-# eglibc dont support GOLD linker.
+# glibc dont support GOLD linker.
   strip_gold
 
 # Filter out some problematic *FLAGS
@@ -103,49 +102,6 @@ pre_configure_target() {
   export BUILD_CC=$HOST_CC
   export OBJDUMP_FOR_HOST=objdump
 
-# create configuration
-cat >option-groups.config <<EOF
-
-  OPTION_EGLIBC_ADVANCED_INET6 = n
-
-# needed for connman:
-  OPTION_EGLIBC_BACKTRACE = y
-
-  OPTION_EGLIBC_BIG_MACROS = n
-  OPTION_EGLIBC_BSD = n
-  OPTION_EGLIBC_CATGETS = n
-
-# libiconv replacement:
-  OPTION_EGLIBC_CHARSETS = y
-
-  OPTION_EGLIBC_DB_ALIASES = n
-  OPTION_EGLIBC_LOCALES = n
-
-# needed for example with glib and Python:
-  OPTION_EGLIBC_LOCALE_CODE = y
-
-# activeperl fails without libnsl. keep it enabled for now
-  OPTION_EGLIBC_NIS = y
-  OPTION_EGLIBC_NSSWITCH = y
-  OPTION_EGLIBC_RCMD = n
-
-# needed by eglibc byself (todo):
-  OPTION_EGLIBC_RTLD_DEBUG = y
-
-# needed for speed (optionally/todo)
-  OPTION_POSIX_REGEXP_GLIBC = y
-
-# needed for PAM and Mysql:
-  OPTION_EGLIBC_GETLOGIN = y
-
-# needed for systemd and dropbear:
-  OPTION_EGLIBC_UTMP = y
-  OPTION_EGLIBC_UTMPX = y
-
-# debugging options:
-  $DEBUG_OPTIONS
-EOF
-
 cat >config.cache <<EOF
 ac_cv_header_cpuid_h=yes
 libc_cv_forced_unwind=yes
@@ -166,16 +122,23 @@ post_makeinstall_target() {
   ln -sf $(basename $INSTALL/lib/ld-*.so) $INSTALL/lib/ld.so
 
 # cleanup
-  for i in $EGLIBC_EXCLUDE_BIN; do
+  for i in $GLIBC_EXCLUDE_BIN; do
     rm -rf $INSTALL/usr/bin/$i
   done
   rm -rf $INSTALL/usr/lib/audit
-  rm -rf $INSTALL/usr/lib/eglibc
+  rm -rf $INSTALL/usr/lib/glibc
   rm -rf $INSTALL/usr/lib/libc_pic
   rm -rf $INSTALL/usr/lib/*.o
   rm -rf $INSTALL/usr/lib/*.map
   rm -rf $INSTALL/var
 
+# remove locales and charmaps
+  rm -rf $INSTALL/usr/share/i18n/charmaps
+  rm -rf $INSTALL/usr/share/i18n/locales
+
+  mkdir -p $INSTALL/usr/share/i18n/locales
+    cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+
 # create default configs
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc

packages/devel/gmp/package.mk

@@ -25,7 +25,6 @@ PKG_LICENSE="LGPLv3+"
 PKG_SITE="http://gmplib.org/"
 PKG_URL="https://gmplib.org/download/gmp/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="gmp: The GNU MP (multiple precision arithmetic) library"
@@ -35,15 +34,8 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_HOST="--enable-cxx"
-PKG_CONFIGURE_OPTS_TARGET="--disable-cxx"
 
 pre_configure_host() {
   export CFLAGS="$CFLAGS -fPIC -DPIC"
   export CPPFLAGS="$CPPFLAGS -fexceptions"
 }
-
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC"
-  export CPPFLAGS="$CPPFLAGS -fexceptions"
-  export CC_FOR_BUILD="$HOST_CC"
-}

packages/graphics/Mesa/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="10.1.6"
+PKG_VERSION="10.2.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -55,9 +55,6 @@ if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then
 fi
 
 XA_CONFIG="--disable-xa"
-for drv in $GRAPHIC_DRIVERS; do
-  [ "$drv" = "vmware" ] && XA_CONFIG="--enable-xa"
-done
 
 PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            CXX_FOR_BUILD=$HOST_CXX \

packages/graphics/Mesa/patches/Mesa-02-motion_adaptive_deinterlacer-v8.patch

@@ -1,828 +0,0 @@
-From 08155442aba570a9d2d351795c86fdea466d806d Mon Sep 17 00:00:00 2001
-From: Grigori Goronzy <greg@chown.ath.cx>
-Date: Sat, 2 Nov 2013 21:54:01 +0100
-Subject: [PATCH] WIP: st/vl, st/vdpau: motion adaptive deinterlacer
-
-v2: make it actually work
-v3: fix motion detection, simplify
-v4: use correct (field) semantics for past/future,
-    use 4-frame motion detection
-v5: cleanup, move dest surface handling into filter
-v6: implement skip_chroma
-v7: tweak motion detection, further cleanup
-v8: fix tgsi code, unbreaks with llvm
----
- src/gallium/auxiliary/Makefile.sources           |   3 +-
- src/gallium/auxiliary/vl/vl_deint_filter.c       | 494 +++++++++++++++++++++++
- src/gallium/auxiliary/vl/vl_deint_filter.h       |  78 ++++
- src/gallium/state_trackers/vdpau/mixer.c         |  69 +++-
- src/gallium/state_trackers/vdpau/query.c         |   1 +
- src/gallium/state_trackers/vdpau/vdpau_private.h |   7 +
- 6 files changed, 647 insertions(+), 5 deletions(-)
- create mode 100644 src/gallium/auxiliary/vl/vl_deint_filter.c
- create mode 100644 src/gallium/auxiliary/vl/vl_deint_filter.h
-
-diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
-index c89cbdd..19004e0 100644
---- a/src/gallium/auxiliary/Makefile.sources
-+++ b/src/gallium/auxiliary/Makefile.sources
-@@ -155,7 +155,8 @@ C_SOURCES := \
-         vl/vl_idct.c \
- 	vl/vl_mc.c \
-         vl/vl_vertex_buffers.c \
--        vl/vl_video_buffer.c
-+        vl/vl_video_buffer.c \
-+	vl/vl_deint_filter.c
- 
- GENERATED_SOURCES := \
- 	indices/u_indices_gen.c \
-diff --git a/src/gallium/auxiliary/vl/vl_deint_filter.c b/src/gallium/auxiliary/vl/vl_deint_filter.c
-new file mode 100644
-index 0000000..3b3cc6d
---- /dev/null
-+++ b/src/gallium/auxiliary/vl/vl_deint_filter.c
-@@ -0,0 +1,494 @@
-+/**************************************************************************
-+ *
-+ * Copyright 2013 Grigori Goronzy <greg@chown.ath.cx>.
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ **************************************************************************/
-+
-+/*
-+ *  References:
-+ *
-+ *  Lin, S. F., Chang, Y. L., & Chen, L. G. (2003).
-+ *  Motion adaptive interpolation with horizontal motion detection for deinterlacing.
-+ *  Consumer Electronics, IEEE Transactions on, 49(4), 1256-1265.
-+ *
-+ *  Pei-Yin, C. H. E. N., & Yao-Hsien, L. A. I. (2007).
-+ *  A low-complexity interpolation method for deinterlacing.
-+ *  IEICE transactions on information and systems, 90(2), 606-608.
-+ *
-+ */
-+
-+#include <stdio.h>
-+
-+#include "pipe/p_context.h"
-+
-+#include "tgsi/tgsi_ureg.h"
-+
-+#include "util/u_draw.h"
-+#include "util/u_memory.h"
-+#include "util/u_math.h"
-+
-+#include "vl_types.h"
-+#include "vl_video_buffer.h"
-+#include "vl_vertex_buffers.h"
-+#include "vl_deint_filter.h"
-+
-+enum VS_OUTPUT
-+{
-+   VS_O_VPOS = 0,
-+   VS_O_VTEX = 0
-+};
-+
-+static void *
-+create_vert_shader(struct vl_deint_filter *filter)
-+{
-+   struct ureg_program *shader;
-+   struct ureg_src i_vpos;
-+   struct ureg_dst o_vpos, o_vtex;
-+
-+   shader = ureg_create(TGSI_PROCESSOR_VERTEX);
-+   if (!shader)
-+      return NULL;
-+
-+   i_vpos = ureg_DECL_vs_input(shader, 0);
-+   o_vpos = ureg_DECL_output(shader, TGSI_SEMANTIC_POSITION, VS_O_VPOS);
-+   o_vtex = ureg_DECL_output(shader, TGSI_SEMANTIC_GENERIC, VS_O_VTEX);
-+
-+   ureg_MOV(shader, o_vpos, i_vpos);
-+   ureg_MOV(shader, o_vtex, i_vpos);
-+
-+   ureg_END(shader);
-+
-+   return ureg_create_shader_and_destroy(shader, filter->pipe);
-+}
-+
-+static void *
-+create_copy_frag_shader(struct vl_deint_filter *filter, unsigned field)
-+{
-+   struct ureg_program *shader;
-+   struct ureg_src i_vtex;
-+   struct ureg_src sampler;
-+   struct ureg_dst o_fragment;
-+   struct ureg_dst t_tex;
-+
-+   shader = ureg_create(TGSI_PROCESSOR_FRAGMENT);
-+   if (!shader) {
-+      return NULL;
-+   }
-+   t_tex = ureg_DECL_temporary(shader);
-+
-+   i_vtex = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_GENERIC, VS_O_VTEX, TGSI_INTERPOLATE_LINEAR);
-+   sampler = ureg_DECL_sampler(shader, 2);
-+   o_fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
-+
-+   ureg_MOV(shader, t_tex, i_vtex);
-+   if (field) {
-+      ureg_MOV(shader, ureg_writemask(t_tex, TGSI_WRITEMASK_ZW),
-+               ureg_imm4f(shader, 0, 0, 1.0f, 0));
-+   } else {
-+      ureg_MOV(shader, ureg_writemask(t_tex, TGSI_WRITEMASK_ZW),
-+               ureg_imm1f(shader, 0));
-+   }
-+
-+   ureg_TEX(shader, o_fragment, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_tex), sampler);
-+
-+   ureg_release_temporary(shader, t_tex);
-+   ureg_END(shader);
-+
-+   return ureg_create_shader_and_destroy(shader, filter->pipe);
-+}
-+
-+static void *
-+create_deint_frag_shader(struct vl_deint_filter *filter, unsigned field,
-+                         struct vertex2f *sizes, bool spatial_filter)
-+{
-+   struct ureg_program *shader;
-+   struct ureg_src i_vtex;
-+   struct ureg_src sampler_cur;
-+   struct ureg_src sampler_prevprev;
-+   struct ureg_src sampler_prev;
-+   struct ureg_src sampler_next;
-+   struct ureg_dst o_fragment;
-+   struct ureg_dst t_tex;
-+   struct ureg_dst t_comp_top, t_comp_bot;
-+   struct ureg_dst t_diff;
-+   struct ureg_dst t_a, t_b;
-+   struct ureg_dst t_weave, t_linear;
-+
-+   shader = ureg_create(TGSI_PROCESSOR_FRAGMENT);
-+   if (!shader) {
-+      return NULL;
-+   }
-+
-+   t_tex = ureg_DECL_temporary(shader);
-+   t_comp_top = ureg_DECL_temporary(shader);
-+   t_comp_bot = ureg_DECL_temporary(shader);
-+   t_diff = ureg_DECL_temporary(shader);
-+   t_a = ureg_DECL_temporary(shader);
-+   t_b = ureg_DECL_temporary(shader);
-+   t_weave = ureg_DECL_temporary(shader);
-+   t_linear = ureg_DECL_temporary(shader);
-+
-+   i_vtex = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_GENERIC, VS_O_VTEX, TGSI_INTERPOLATE_LINEAR);
-+   sampler_prevprev = ureg_DECL_sampler(shader, 0);
-+   sampler_prev = ureg_DECL_sampler(shader, 1);
-+   sampler_cur = ureg_DECL_sampler(shader, 2);
-+   sampler_next = ureg_DECL_sampler(shader, 3);
-+   o_fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
-+
-+   // we don't care about ZW interpolation (allows better optimization)
-+   ureg_MOV(shader, t_tex, i_vtex);
-+   ureg_MOV(shader, ureg_writemask(t_tex, TGSI_WRITEMASK_ZW),
-+            ureg_imm1f(shader, 0));
-+
-+   // sample between texels for cheap lowpass
-+   ureg_ADD(shader, t_comp_top, ureg_src(t_tex),
-+            ureg_imm4f(shader, sizes->x * 0.5f, sizes->y * -0.5f, 0, 0));
-+   ureg_ADD(shader, t_comp_bot, ureg_src(t_tex),
-+            ureg_imm4f(shader, sizes->x * -0.5f, sizes->y * 0.5f, 1.0f, 0));
-+
-+   if (field == 0) {
-+      /* interpolating top field -> current field is a bottom field */
-+      // cur vs prev2
-+      ureg_TEX(shader, t_a, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_bot), sampler_cur);
-+      ureg_TEX(shader, t_b, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_bot), sampler_prevprev);
-+      ureg_SUB(shader, ureg_writemask(t_diff, TGSI_WRITEMASK_X), ureg_src(t_a), ureg_src(t_b));
-+      // prev vs next
-+      ureg_TEX(shader, t_a, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_top), sampler_prev);
-+      ureg_TEX(shader, t_b, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_top), sampler_next);
-+      ureg_SUB(shader, ureg_writemask(t_diff, TGSI_WRITEMASK_Y), ureg_src(t_a), ureg_src(t_b));
-+   } else {
-+      /* interpolating bottom field -> current field is a top field */
-+      // cur vs prev2
-+      ureg_TEX(shader, t_a, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_top), sampler_cur);
-+      ureg_TEX(shader, t_b, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_top), sampler_prevprev);
-+      ureg_SUB(shader, ureg_writemask(t_diff, TGSI_WRITEMASK_X), ureg_src(t_a), ureg_src(t_b));
-+      // prev vs next
-+      ureg_TEX(shader, t_a, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_bot), sampler_prev);
-+      ureg_TEX(shader, t_b, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_bot), sampler_next);
-+      ureg_SUB(shader, ureg_writemask(t_diff, TGSI_WRITEMASK_Y), ureg_src(t_a), ureg_src(t_b));
-+   }
-+
-+   // absolute maximum of differences
-+   ureg_MAX(shader, ureg_writemask(t_diff, TGSI_WRITEMASK_X), ureg_abs(ureg_src(t_diff)),
-+            ureg_scalar(ureg_abs(ureg_src(t_diff)), TGSI_SWIZZLE_Y));
-+
-+   if (field == 0) {
-+      /* weave with prev top field */
-+      ureg_TEX(shader, t_weave, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_tex), sampler_prev);
-+      /* get linear interpolation from current bottom field */
-+      ureg_ADD(shader, t_comp_top, ureg_src(t_tex), ureg_imm4f(shader, 0, sizes->y * -1.0f, 1.0f, 0));
-+      ureg_TEX(shader, t_linear, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_top), sampler_cur);
-+   } else {
-+      /* weave with prev bottom field */
-+      ureg_ADD(shader, t_comp_bot, ureg_src(t_tex), ureg_imm4f(shader, 0, 0, 1.0f, 0));
-+      ureg_TEX(shader, t_weave, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_bot), sampler_prev);
-+      /* get linear interpolation from current top field */
-+      ureg_ADD(shader, t_comp_bot, ureg_src(t_tex), ureg_imm4f(shader, 0, sizes->y * 1.0f, 0, 0));
-+      ureg_TEX(shader, t_linear, TGSI_TEXTURE_2D_ARRAY, ureg_src(t_comp_bot), sampler_cur);
-+   }
-+
-+   // mix between weave and linear
-+   // fully weave if diff < 6 (0.02353), fully interpolate if diff > 14 (0.05490)
-+   ureg_ADD(shader, ureg_writemask(t_diff, TGSI_WRITEMASK_X), ureg_src(t_diff),
-+            ureg_imm4f(shader, -0.02353f, 0, 0, 0));
-+   ureg_MUL(shader, ureg_saturate(ureg_writemask(t_diff, TGSI_WRITEMASK_X)),
-+            ureg_src(t_diff), ureg_imm4f(shader, 31.8750f, 0, 0, 0));
-+   ureg_LRP(shader, ureg_writemask(o_fragment, TGSI_WRITEMASK_X), ureg_src(t_diff),
-+            ureg_src(t_linear), ureg_src(t_weave));
-+
-+   ureg_release_temporary(shader, t_tex);
-+   ureg_release_temporary(shader, t_comp_top);
-+   ureg_release_temporary(shader, t_comp_bot);
-+   ureg_release_temporary(shader, t_diff);
-+   ureg_release_temporary(shader, t_a);
-+   ureg_release_temporary(shader, t_b);
-+   ureg_release_temporary(shader, t_weave);
-+   ureg_release_temporary(shader, t_linear);
-+   ureg_END(shader);
-+
-+   return ureg_create_shader_and_destroy(shader, filter->pipe);
-+}
-+
-+bool
-+vl_deint_filter_init(struct vl_deint_filter *filter, struct pipe_context *pipe,
-+                     unsigned video_width, unsigned video_height,
-+                     bool skip_chroma, bool spatial_filter)
-+{
-+   struct pipe_rasterizer_state rs_state;
-+   struct pipe_blend_state blend;
-+   struct pipe_sampler_state sampler;
-+   struct pipe_vertex_element ve;
-+   struct vertex2f sizes;
-+   struct pipe_video_buffer templ;
-+
-+   assert(filter && pipe);
-+   assert(video_width && video_height);
-+
-+   memset(filter, 0, sizeof(*filter));
-+   filter->pipe = pipe;
-+   filter->skip_chroma = skip_chroma;
-+   filter->video_width = video_width;
-+   filter->video_height = video_height;
-+
-+   /* TODO: handle other than 4:2:0 subsampling */
-+   memset(&templ, 0, sizeof(templ));
-+   templ.buffer_format = PIPE_FORMAT_YV12;
-+   templ.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420;
-+   templ.width = video_width;
-+   templ.height = video_height;
-+   templ.interlaced = true;
-+   filter->video_buffer = vl_video_buffer_create(pipe, &templ);
-+   if (!filter->video_buffer)
-+      goto error_video_buffer;
-+
-+   memset(&rs_state, 0, sizeof(rs_state));
-+   rs_state.half_pixel_center = true;
-+   rs_state.bottom_edge_rule = true;
-+   rs_state.depth_clip = 1;
-+   filter->rs_state = pipe->create_rasterizer_state(pipe, &rs_state);
-+   if (!filter->rs_state)
-+      goto error_rs_state;
-+
-+   memset(&blend, 0, sizeof blend);
-+   blend.rt[0].colormask = PIPE_MASK_RGBA;
-+   filter->blend = pipe->create_blend_state(pipe, &blend);
-+   if (!filter->blend)
-+      goto error_blend;
-+
-+   memset(&sampler, 0, sizeof(sampler));
-+   sampler.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
-+   sampler.wrap_t = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
-+   sampler.wrap_r = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
-+   sampler.min_img_filter = PIPE_TEX_FILTER_LINEAR;
-+   sampler.min_mip_filter = PIPE_TEX_MIPFILTER_NONE;
-+   sampler.mag_img_filter = PIPE_TEX_FILTER_LINEAR;
-+   sampler.normalized_coords = 1;
-+   filter->sampler[0] = pipe->create_sampler_state(pipe, &sampler);
-+   filter->sampler[1] = filter->sampler[2] = filter->sampler[3] = filter->sampler[0];
-+   if (!filter->sampler[0])
-+      goto error_sampler;
-+
-+   filter->quad = vl_vb_upload_quads(pipe);
-+   if(!filter->quad.buffer)
-+      goto error_quad;
-+
-+   memset(&ve, 0, sizeof(ve));
-+   ve.src_offset = 0;
-+   ve.instance_divisor = 0;
-+   ve.vertex_buffer_index = 0;
-+   ve.src_format = PIPE_FORMAT_R32G32_FLOAT;
-+   filter->ves = pipe->create_vertex_elements_state(pipe, 1, &ve);
-+   if (!filter->ves)
-+      goto error_ves;
-+
-+   sizes.x = 1.0f / video_width;
-+   sizes.y = 1.0f / video_height;
-+
-+   filter->vs = create_vert_shader(filter);
-+   if (!filter->vs)
-+      goto error_vs;
-+
-+   filter->fs_copy_top = create_copy_frag_shader(filter, 0);
-+   if (!filter->fs_copy_top)
-+      goto error_fs_copy_top;
-+
-+   filter->fs_copy_bottom = create_copy_frag_shader(filter, 1);
-+   if (!filter->fs_copy_bottom)
-+      goto error_fs_copy_bottom;
-+
-+   filter->fs_deint_top = create_deint_frag_shader(filter, 0, &sizes, spatial_filter);
-+   if (!filter->fs_deint_top)
-+      goto error_fs_deint_top;
-+
-+   filter->fs_deint_bottom = create_deint_frag_shader(filter, 1, &sizes, spatial_filter);
-+   if (!filter->fs_deint_bottom)
-+      goto error_fs_deint_bottom;
-+
-+   return true;
-+
-+error_fs_deint_bottom:
-+   pipe->delete_fs_state(pipe, filter->fs_deint_top);
-+
-+error_fs_deint_top:
-+   pipe->delete_fs_state(pipe, filter->fs_copy_bottom);
-+
-+error_fs_copy_bottom:
-+   pipe->delete_fs_state(pipe, filter->fs_copy_top);
-+
-+error_fs_copy_top:
-+   pipe->delete_vs_state(pipe, filter->vs);
-+
-+error_vs:
-+   pipe->delete_vertex_elements_state(pipe, filter->ves);
-+
-+error_ves:
-+   pipe_resource_reference(&filter->quad.buffer, NULL);
-+
-+error_quad:
-+   pipe->delete_sampler_state(pipe, filter->sampler);
-+
-+error_sampler:
-+   pipe->delete_blend_state(pipe, filter->blend);
-+
-+error_blend:
-+   pipe->delete_rasterizer_state(pipe, filter->rs_state);
-+
-+error_rs_state:
-+   filter->video_buffer->destroy(filter->video_buffer);
-+
-+error_video_buffer:
-+   return false;
-+}
-+
-+void
-+vl_deint_filter_cleanup(struct vl_deint_filter *filter)
-+{
-+   assert(filter);
-+
-+   filter->pipe->delete_sampler_state(filter->pipe, filter->sampler[0]);
-+   filter->pipe->delete_blend_state(filter->pipe, filter->blend);
-+   filter->pipe->delete_rasterizer_state(filter->pipe, filter->rs_state);
-+   filter->pipe->delete_vertex_elements_state(filter->pipe, filter->ves);
-+   pipe_resource_reference(&filter->quad.buffer, NULL);
-+
-+   filter->pipe->delete_vs_state(filter->pipe, filter->vs);
-+   filter->pipe->delete_fs_state(filter->pipe, filter->fs_copy_top);
-+   filter->pipe->delete_fs_state(filter->pipe, filter->fs_copy_bottom);
-+   filter->pipe->delete_fs_state(filter->pipe, filter->fs_deint_top);
-+   filter->pipe->delete_fs_state(filter->pipe, filter->fs_deint_bottom);
-+
-+   filter->video_buffer->destroy(filter->video_buffer);
-+}
-+
-+bool
-+vl_deint_filter_check_buffers(struct vl_deint_filter *filter,
-+                              struct pipe_video_buffer *prevprev,
-+                              struct pipe_video_buffer *prev,
-+                              struct pipe_video_buffer *cur,
-+                              struct pipe_video_buffer *next)
-+{
-+   int i;
-+   struct pipe_video_buffer *bufs[] = { prevprev, prev, cur, next };
-+
-+   for (i = 0; i < 4; i++) {
-+      if (bufs[i]->chroma_format != PIPE_VIDEO_CHROMA_FORMAT_420)
-+         return false;
-+      if (bufs[i]->width < filter->video_width ||
-+          bufs[i]->height < filter->video_height)
-+         return false;
-+      if (!bufs[i]->interlaced)
-+         return false;
-+   }
-+
-+   return true;
-+}
-+
-+void
-+vl_deint_filter_render(struct vl_deint_filter *filter,
-+                       struct pipe_video_buffer *prevprev,
-+                       struct pipe_video_buffer *prev,
-+                       struct pipe_video_buffer *cur,
-+                       struct pipe_video_buffer *next,
-+                       unsigned field)
-+{
-+   struct pipe_viewport_state viewport;
-+   struct pipe_framebuffer_state fb_state;
-+   struct pipe_sampler_view **cur_sv;
-+   struct pipe_sampler_view **prevprev_sv;
-+   struct pipe_sampler_view **prev_sv;
-+   struct pipe_sampler_view **next_sv;
-+   struct pipe_sampler_view *sampler_views[4];
-+   struct pipe_surface **dst_surfaces;
-+   int j;
-+
-+   assert(filter && prevprev && prev && cur && next && field <= 1);
-+
-+   /* set up destination and source */
-+   dst_surfaces = filter->video_buffer->get_surfaces(filter->video_buffer);
-+   cur_sv = cur->get_sampler_view_components(cur);
-+   prevprev_sv = prevprev->get_sampler_view_components(prevprev);
-+   prev_sv = prev->get_sampler_view_components(prev);
-+   next_sv = next->get_sampler_view_components(next);
-+
-+   /* set up pipe state */
-+   filter->pipe->bind_rasterizer_state(filter->pipe, filter->rs_state);
-+   filter->pipe->bind_blend_state(filter->pipe, filter->blend);
-+   filter->pipe->set_vertex_buffers(filter->pipe, 0, 1, &filter->quad);
-+   filter->pipe->bind_vertex_elements_state(filter->pipe, filter->ves);
-+   filter->pipe->bind_vs_state(filter->pipe, filter->vs);
-+   filter->pipe->bind_sampler_states(filter->pipe, PIPE_SHADER_FRAGMENT,
-+                                     0, 4, filter->sampler);
-+
-+   /* prepare viewport */
-+   memset(&viewport, 0, sizeof(viewport));
-+   viewport.scale[2] = 1;
-+   viewport.scale[3] = 1;
-+
-+   /* prepare framebuffer */
-+   memset(&fb_state, 0, sizeof(fb_state));
-+   fb_state.nr_cbufs = 1;
-+
-+   /* process each plane separately */
-+   for (j = 0; j < 3; j++) {
-+      /* select correct YV12 surfaces */
-+      int k = j == 1 ? 2 :
-+              j == 2 ? 1 : 0;
-+      struct pipe_surface *blit_surf = dst_surfaces[2 * k + field];
-+      struct pipe_surface *dst_surf = dst_surfaces[2 * k + 1 - field];
-+
-+      /* update render target state */
-+      viewport.scale[0] = blit_surf->texture->width0;
-+      viewport.scale[1] = blit_surf->texture->height0;
-+      fb_state.width = blit_surf->texture->width0;
-+      fb_state.height = blit_surf->texture->height0;
-+
-+      /* update sampler view sources  */
-+      sampler_views[0] = prevprev_sv[j];
-+      sampler_views[1] = prev_sv[j];
-+      sampler_views[2] = cur_sv[j];
-+      sampler_views[3] = next_sv[j];
-+      filter->pipe->set_sampler_views(filter->pipe, PIPE_SHADER_FRAGMENT, 0, 4, sampler_views);
-+
-+      /* blit current field */
-+      fb_state.cbufs[0] = blit_surf;
-+      filter->pipe->bind_fs_state(filter->pipe, field ? filter->fs_copy_bottom : filter->fs_copy_top);
-+      filter->pipe->set_framebuffer_state(filter->pipe, &fb_state);
-+      filter->pipe->set_viewport_states(filter->pipe, 0, 1, &viewport);
-+      util_draw_arrays(filter->pipe, PIPE_PRIM_QUADS, 0, 4);
-+
-+      fb_state.cbufs[0] = dst_surf;
-+      if (j > 0 && filter->skip_chroma) {
-+         /* blit other field */
-+         filter->pipe->set_framebuffer_state(filter->pipe, &fb_state);
-+         util_draw_arrays(filter->pipe, PIPE_PRIM_QUADS, 0, 4);
-+      } else {
-+         /* interpolate other field */
-+         filter->pipe->bind_fs_state(filter->pipe, field ? filter->fs_deint_top : filter->fs_deint_bottom);
-+         filter->pipe->set_framebuffer_state(filter->pipe, &fb_state);
-+         util_draw_arrays(filter->pipe, PIPE_PRIM_QUADS, 0, 4);
-+      }
-+
-+   }
-+}
-+
-diff --git a/src/gallium/auxiliary/vl/vl_deint_filter.h b/src/gallium/auxiliary/vl/vl_deint_filter.h
-new file mode 100644
-index 0000000..5a21402
---- /dev/null
-+++ b/src/gallium/auxiliary/vl/vl_deint_filter.h
-@@ -0,0 +1,78 @@
-+/**************************************************************************
-+ *
-+ * Copyright 2013 Grigori Goronzy <greg@chown.ath.cx>
-+ * All Rights Reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sub license, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the
-+ * next paragraph) shall be included in all copies or substantial portions
-+ * of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
-+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ **************************************************************************/
-+
-+/* motion adaptive deinterlacer implementation */
-+
-+#ifndef vl_deint_filter_h
-+#define vl_deint_filter_h
-+
-+#include "pipe/p_state.h"
-+
-+struct vl_deint_filter
-+{
-+   struct pipe_context *pipe;
-+   struct pipe_vertex_buffer quad;
-+
-+   void *rs_state;
-+   void *blend;
-+   void *sampler[4];
-+   void *ves;
-+   void *vs;
-+   void *fs_copy_top, *fs_copy_bottom;
-+   void *fs_deint_top, *fs_deint_bottom;
-+
-+   unsigned video_width, video_height;
-+   bool skip_chroma;
-+
-+   struct pipe_video_buffer *video_buffer;
-+};
-+
-+bool
-+vl_deint_filter_init(struct vl_deint_filter *filter, struct pipe_context *pipe,
-+                     unsigned video_width, unsigned video_height,
-+                     bool skip_chroma, bool spatial_filter);
-+
-+void
-+vl_deint_filter_cleanup(struct vl_deint_filter *filter);
-+
-+bool
-+vl_deint_filter_check_buffers(struct vl_deint_filter *filter,
-+                              struct pipe_video_buffer *prevprev,
-+                              struct pipe_video_buffer *prev,
-+                              struct pipe_video_buffer *cur,
-+                              struct pipe_video_buffer *next);
-+
-+void
-+vl_deint_filter_render(struct vl_deint_filter *filter,
-+                       struct pipe_video_buffer *prevprev,
-+                       struct pipe_video_buffer *prev,
-+                       struct pipe_video_buffer *cur,
-+                       struct pipe_video_buffer *next,
-+                       unsigned field);
-+
-+#endif /* vl_deint_filter_h */
-+
-diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
-index f9b413e..74351c6 100644
---- a/src/gallium/state_trackers/vdpau/mixer.c
-+++ b/src/gallium/state_trackers/vdpau/mixer.c
-@@ -80,7 +80,6 @@
-    for (i = 0; i < feature_count; ++i) {
-       switch (features[i]) {
-       /* they are valid, but we doesn't support them */
--      case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-       case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL:
-       case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1:
-       case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L2:
-@@ -95,6 +94,10 @@
-       case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
-          break;
- 
-+      case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-+         vmixer->deint.supported = true;
-+         break;
-+
-       case VDP_VIDEO_MIXER_FEATURE_SHARPNESS:
-          vmixer->sharpness.supported = true;
-          break;
-@@ -181,6 +184,11 @@
- 
-    vl_compositor_cleanup_state(&vmixer->cstate);
- 
-+   if (vmixer->deint.filter) {
-+      vl_deint_filter_cleanup(vmixer->deint.filter);
-+      FREE(vmixer->deint.filter);
-+   }
-+
-    if (vmixer->noise_reduction.filter) {
-       vl_median_filter_cleanup(vmixer->noise_reduction.filter);
-       FREE(vmixer->noise_reduction.filter);
-@@ -219,6 +227,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-    enum vl_compositor_deinterlace deinterlace;
-    struct u_rect rect, clip, *prect;
-    unsigned i, layer = 0;
-+   struct pipe_video_buffer *video_buffer;
- 
-    vlVdpVideoMixer *vmixer;
-    vlVdpSurface *surf;
-@@ -233,6 +242,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-    compositor = &vmixer->device->compositor;
- 
-    surf = vlGetDataHTAB(video_surface_current);
-+   video_buffer = surf->video_buffer;
-    if (!surf)
-       return VDP_STATUS_INVALID_HANDLE;
- 
-@@ -283,6 +293,24 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-       pipe_mutex_unlock(vmixer->device->mutex);
-       return VDP_STATUS_INVALID_VIDEO_MIXER_PICTURE_STRUCTURE;
-    };
-+
-+   if (deinterlace != VL_COMPOSITOR_WEAVE && vmixer->deint.enabled &&
-+       video_surface_past_count > 1 && video_surface_future_count > 0) {
-+      vlVdpSurface *prevprev = vlGetDataHTAB(video_surface_past[1]);
-+      vlVdpSurface *prev = vlGetDataHTAB(video_surface_past[0]);
-+      vlVdpSurface *next = vlGetDataHTAB(video_surface_future[0]);
-+      if (prevprev && prev && next &&
-+          vl_deint_filter_check_buffers(vmixer->deint.filter,
-+          prevprev->video_buffer, prev->video_buffer, surf->video_buffer, next->video_buffer)) {
-+         vl_deint_filter_render(vmixer->deint.filter, prevprev->video_buffer,
-+                                prev->video_buffer, surf->video_buffer,
-+                                next->video_buffer,
-+                                deinterlace == VL_COMPOSITOR_BOB_BOTTOM);
-+         deinterlace = VL_COMPOSITOR_WEAVE;
-+         video_buffer = vmixer->deint.filter->video_buffer;
-+      }
-+   }
-+
-    prect = RectToPipe(video_source_rect, &rect);
-    if (!prect) {
-       rect.x0 = 0;
-@@ -291,7 +319,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-       rect.y1 = surf->templat.height;
-       prect = &rect;
-    }
--   vl_compositor_set_buffer_layer(&vmixer->cstate, compositor, layer, surf->video_buffer, prect, NULL, deinterlace);
-+   vl_compositor_set_buffer_layer(&vmixer->cstate, compositor, layer, video_buffer, prect, NULL, deinterlace);
-    vl_compositor_set_layer_dst_area(&vmixer->cstate, layer++, RectToPipe(destination_video_rect, &rect));
- 
-    for (i = 0; i < layer_count; ++i) {
-@@ -332,6 +360,31 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-    return VDP_STATUS_OK;
- }
- 
-+static void
-+vlVdpVideoMixerUpdateDeinterlaceFilter(vlVdpVideoMixer *vmixer)
-+{
-+   struct pipe_context *pipe = vmixer->device->context;
-+   assert(vmixer);
-+
-+   /* remove existing filter */
-+   if (vmixer->deint.filter) {
-+      vl_deint_filter_cleanup(vmixer->deint.filter);
-+      FREE(vmixer->deint.filter);
-+      vmixer->deint.filter = NULL;
-+   }
-+
-+   /* create a new filter if requested */
-+   if (vmixer->deint.enabled && vmixer->chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420) {
-+      vmixer->deint.filter = MALLOC(sizeof(struct vl_deint_filter));
-+      vmixer->deint.enabled = vl_deint_filter_init(vmixer->deint.filter, pipe,
-+            vmixer->video_width, vmixer->video_height,
-+            vmixer->skip_chroma_deint, vmixer->deint.spatial);
-+      if (!vmixer->deint.enabled) {
-+         FREE(vmixer->deint.filter);
-+      }
-+   }
-+}
-+
- /**
-  * Update the noise reduction setting
-  */
-@@ -424,7 +477,6 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-    for (i = 0; i < feature_count; ++i) {
-       switch (features[i]) {
-       /* they are valid, but we doesn't support them */
--      case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-       case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL:
-       case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1:
-       case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L2:
-@@ -440,6 +492,10 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-          feature_supports[i] = false;
-          break;
- 
-+      case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-+         feature_supports[i] = vmixer->deint.supported;
-+         break;
-+
-       case VDP_VIDEO_MIXER_FEATURE_SHARPNESS:
-          feature_supports[i] = vmixer->sharpness.supported;
-          break;
-@@ -479,7 +535,6 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-    for (i = 0; i < feature_count; ++i) {
-       switch (features[i]) {
-       /* they are valid, but we doesn't support them */
--      case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-       case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL:
-       case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1:
-       case VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L2:
-@@ -494,6 +549,11 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-       case VDP_VIDEO_MIXER_FEATURE_LUMA_KEY:
-          break;
- 
-+      case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-+         vmixer->deint.enabled = feature_enables[i];
-+         vlVdpVideoMixerUpdateDeinterlaceFilter(vmixer);
-+         break;
-+
-       case VDP_VIDEO_MIXER_FEATURE_SHARPNESS:
-          vmixer->sharpness.enabled = feature_enables[i];
-          vlVdpVideoMixerUpdateSharpnessFilter(vmixer);
-@@ -648,6 +708,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
-          if (*(uint8_t*)attribute_values[i] > 1)
-             return VDP_STATUS_INVALID_VALUE;
-          vmixer->skip_chroma_deint = *(uint8_t*)attribute_values[i];
-+         vlVdpVideoMixerUpdateDeinterlaceFilter(vmixer);
-          break;
-       default:
-          pipe_mutex_unlock(vmixer->device->mutex);
-diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
-index 1d35252..aba65ee 100644
---- a/src/gallium/state_trackers/vdpau/query.c
-+++ b/src/gallium/state_trackers/vdpau/query.c
-@@ -469,6 +469,7 @@
-    switch (feature) {
-    case VDP_VIDEO_MIXER_FEATURE_SHARPNESS:
-    case VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION:
-+   case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
-       *is_supported = VDP_TRUE;
-       break;
-    default:
-diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h
-index 60196ac..0811df6 100644
---- a/src/gallium/state_trackers/vdpau/vdpau_private.h
-+++ b/src/gallium/state_trackers/vdpau/vdpau_private.h
-@@ -42,8 +42,10 @@
- #include "util/u_rect.h"
- #include "os/os_thread.h"
- 
-+#include "vl/vl_video_buffer.h"
- #include "vl/vl_compositor.h"
- #include "vl/vl_csc.h"
-+#include "vl/vl_deint_filter.h"
- #include "vl/vl_matrix_filter.h"
- #include "vl/vl_median_filter.h"
- #include "vl/vl_winsys.h"
-@@ -351,6 +353,11 @@
-    struct vl_compositor_state cstate;
- 
-    struct {
-+	  bool supported, enabled, spatial;
-+	  struct vl_deint_filter *filter;
-+   } deint;
-+
-+   struct {
-       bool supported, enabled;
-       unsigned level;
-       struct vl_median_filter *filter;
--- 
-1.8.4
-

packages/graphics/glamor-egl/package.mk

@@ -1,40 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="glamor-egl"
-PKG_VERSION="0.6.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://cgit.freedesktop.org/xorg/driver/glamor/"
-PKG_URL="http://cgit.freedesktop.org/xorg/driver/glamor/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain Mesa xorg-server libdrm"
-PKG_PRIORITY="optional"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="glamor-egl: OpenGL based 2D rendering acceleration library"
-PKG_LONGDESC="glamor-egl is a OpenGL based 2D rendering acceleration library"
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-glamor-gles2 --enable-xv --disable-glamor-dri3 --enable-glx-tls"
-
-pre_configure_target() {
-  # glamor-egl fails to build with GOLD if we build with --enable-glx-tls
-  strip_gold
-}

packages/graphics/gpu-viv-bin-mx6q/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gpu-viv-bin-mx6q"
-PKG_VERSION="3.10.17-1.0.0"
+PKG_VERSION="3.10.17-1.0.0-1"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/graphics/libdrm/package.mk

@@ -55,10 +55,6 @@ configure_target() {
     [ "$drv" = "nouveau" ] && \
       DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
       DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-nouveau/enable-nouveau/'`
-
-    [ "$drv" = "vmware" ] && \
-      DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
-      DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-vmwgfx/enable-vmwgfx/'`
   done
 
   ../configure --host=$TARGET_NAME \

packages/graphics/libepoxy/package.mk

@@ -16,32 +16,20 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vboxguest"
-PKG_VERSION="4.3.8"
+PKG_NAME="libepoxy"
+PKG_VERSION="b2ae054"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.virtualbox.org"
-PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain linux"
-PKG_NEED_UNPACK="$LINUX_DEPENDS"
+PKG_SITE="https://github.com/anholt/libepoxy"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain Mesa"
 PKG_PRIORITY="optional"
-PKG_SECTION="driver"
-PKG_SHORTDESC="vboxguest"
-PKG_LONGDESC="vboxguest"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="libepoxy: a library for handling OpenGL function pointer management for you."
+PKG_LONGDESC="Epoxy is a library for handling OpenGL function pointer management for you."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
 
-pre_make_target() {
-  unset LDFLAGS
-}
-
-make_target() {
-  make KERN_DIR=$(kernel_path)
-}
-
-makeinstall_target() {
-  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
-}
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/initramfs/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init plymouth-lite:init diskdev_cmds:init"
+PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init plymouth-lite:init diskdev_cmds:init util-linux:init e2fsprogs:init dosfstools:init"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="initramfs: Metapackage for installing initramfs"

packages/lang/gcc/package.mk

@@ -25,7 +25,7 @@ PKG_SITE="http://gcc.gnu.org/"
 PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host"
 PKG_DEPENDS_TARGET="gcc:host"
-PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host eglibc"
+PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host glibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-012-add-support-for-Linux-3.15.patch

@@ -0,0 +1,60 @@
+diff -Naur bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_cfg80211.c bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_cfg80211.c
+--- bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_cfg80211.c	2013-04-14 23:10:38.000000000 +0200
++++ bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_cfg80211.c	2014-05-14 21:50:23.219067311 +0200
+@@ -1792,7 +1792,26 @@
+ 			wl_get_assoc_ies(wl);
+ 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 			wl_update_bss_info(wl);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++			{
++				struct wl_bss_info *bi;
++				u16 bss_info_channel;
++				struct ieee80211_channel *channel;
++				u32 freq;
++
++				bi = (struct wl_bss_info *)(wl->extra_buf + 4);
++				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
++
++				freq = ieee80211_channel_to_frequency(bss_info_channel,
++					(bss_info_channel <= CH_MAX_2G_CHANNEL) ?
++					IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++
++				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
++				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
++			}
++#else
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
++#endif
+ 			set_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl->profile->active = true;
+ 		}
+diff -Naur bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_cfg80211.c bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_cfg80211.c
+--- bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_cfg80211.c	2013-04-14 23:10:38.000000000 +0200
++++ bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_cfg80211.c	2014-05-14 21:50:45.102092217 +0200
+@@ -1792,7 +1792,26 @@
+ 			wl_get_assoc_ies(wl);
+ 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 			wl_update_bss_info(wl);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++			{
++				struct wl_bss_info *bi;
++				u16 bss_info_channel;
++				struct ieee80211_channel *channel;
++				u32 freq;
++
++				bi = (struct wl_bss_info *)(wl->extra_buf + 4);
++				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
++
++				freq = ieee80211_channel_to_frequency(bss_info_channel,
++					(bss_info_channel <= CH_MAX_2G_CHANNEL) ?
++					IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
++
++				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
++				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
++			}
++#else
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
++#endif
+ 			set_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl->profile->active = true;
+ 		}

packages/linux-drivers/tbs-linux-drivers/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="tbs-linux-drivers"
-PKG_VERSION="140113"
+PKG_VERSION="140707"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/linux-firmware/firmware-imx/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="firmware-imx"
-PKG_VERSION="3.5.7-1.0.0"
+PKG_VERSION="3.10.17-1.0.0"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="other"

packages/linux/package.mk

@@ -17,16 +17,8 @@
 ################################################################################
 
 PKG_NAME="linux"
-case "$LINUX" in
-  imx6)
-    PKG_VERSION="cuboxi-592b2d9"
-    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-  *)
-    PKG_VERSION="3.14.11"
-    PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-esac
+PKG_VERSION="3.15.5"
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/patches/3.14.11/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch

@@ -1,59 +0,0 @@
-Betreff: [RFC] hid/sony: add autorepeat for PS3 remotes
-Von: David Dillow <dave@thedillows.org>
-Datum: 28.06.2013 04:28
-An: linux-input@vger.kernel.org
-Kopie (CC): Stephan Raue <stephan@openelec.tv>
-
-Some applications using the PS3 remote would like to have autorepeat
-from the device. Use the input subsystem's software emulation to provide
-this capability, and enable those that don't need it to turn it off.
----
-I'm not sure this is the correct approach, or if it is even appropriate
-for a remote to do autorepeat. However, the media/rc subsystem does do
-it by default, and it's been requested by users, so there is at least
-some demand.
-
-This compiled against the hid-sony driver with the PS3 remote changes
-merged, but I have done no testing of it. If the approach seems
-reasonable, I'll try to test it when the MythTV is idle.
-
- drivers/hid/hid-sony.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff -Naur linux-3.14/drivers/hid/hid-sony.c linux-3.14.patch/drivers/hid/hid-sony.c
---- linux-3.14/drivers/hid/hid-sony.c	2014-03-31 05:40:15.000000000 +0200
-+++ linux-3.14.patch/drivers/hid/hid-sony.c	2014-03-31 11:50:35.755949680 +0200
-@@ -546,6 +546,24 @@
- 	return 1;
- }
- 
-+static int ps3remote_setup_repeat(struct hid_device *hdev)
-+{
-+	struct hid_input *hidinput = list_first_entry(&hdev->inputs,
-+						      struct hid_input, list);
-+	struct input_dev *input = hidinput->input;
-+
-+	/*
-+	 * Set up autorepeat defaults per the remote control subsystem;
-+	 * this must be done after hid_hw_start(), as having these non-zero
-+	 * at the time of input_register_device() tells the input system that
-+	 * the hardware does the autorepeat, and the PS3 remote does not.
-+	 */
-+	set_bit(EV_REP, input->evbit);
-+	input->rep[REP_DELAY]  = 500;
-+	input->rep[REP_PERIOD] = 125;
-+
-+	return 0;
-+}
- 
- /* Sony Vaio VGX has wrongly mouse pointer declared as constant */
- static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-@@ -1074,6 +1092,8 @@
- 	}
- 	else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
- 		ret = sixaxis_set_operational_bt(hdev);
-+	else if (sc->quirks & PS3REMOTE)
-+		ret = ps3remote_setup_repeat(hdev);
- 	else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
- 		/* Report 5 (31 bytes) is used to send data to the controller via USB */
- 		ret = sony_set_output_report(sc, 0x05, 248);

packages/linux/patches/3.14.11/linux-060-add_AUGUST_DVB-T205.patch

@@ -1,12 +0,0 @@
-diff -Naur linux-3.14.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.14.8.patch/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
---- linux-3.14.8/drivers/media/usb/dvb-usb-v2/rtl28xxu.c	2014-06-16 22:41:19.000000000 +0200
-+++ linux-3.14.8.patch/drivers/media/usb/dvb-usb-v2/rtl28xxu.c	2014-06-17 03:34:54.230287375 +0200
-@@ -1441,6 +1441,8 @@
- 		&rtl2832u_props, "Sveon STV20", NULL) },
- 	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV27,
- 		&rtl2832u_props, "Sveon STV27", NULL) },
-+	{ DVB_USB_DEVICE(USB_VID_GTEK, 0xa803,
-+		&rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
- 
- 	/* RTL2832P devices: */
- 	{ DVB_USB_DEVICE(USB_VID_HANFTEK, 0x0131,

packages/linux/patches/3.14.11/linux-061-nuvoton-cir-Activate-PNP-device-when-probing.patch

@@ -1,17 +0,0 @@
-diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
-index b41e52e..b81325d 100644
---- a/drivers/media/rc/nuvoton-cir.c
-+++ b/drivers/media/rc/nuvoton-cir.c
-@@ -985,6 +985,12 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
- 		goto exit_free_dev_rdev;
- 
- 	ret = -ENODEV;
-+	/* activate pnp device */
-+	if (pnp_activate_dev(pdev) < 0) {
-+		dev_err(&pdev->dev, "Could not activate PNP device!\n");
-+		goto exit_free_dev_rdev;
-+	}
-+
- 	/* validate pnp resources */
- 	if (!pnp_port_valid(pdev, 0) ||
- 	    pnp_port_len(pdev, 0) < CIR_IOREG_LENGTH) {

packages/linux/patches/3.14.11/linux-062-PNP-Work_around_BIOS_defects_in_Intel_MCH_area_reporting.patch

@@ -1,138 +0,0 @@
-From cb171f7abb9a1a250fb41d088b81799f75bd1357 Mon Sep 17 00:00:00 2001
-From: Bjorn Helgaas <bhelgaas@google.com>
-Date: Wed, 23 Apr 2014 10:21:06 -0600
-Subject: PNP: Work around BIOS defects in Intel MCH area reporting
-
-Work around BIOSes that don't report the entire Intel MCH area.
-
-MCHBAR is not an architected PCI BAR, so MCH space is usually reported as a
-PNP0C02 resource.  The MCH space was once 16KB, but is 32KB in newer parts.
-Some BIOSes still report a PNP0C02 resource that is only 16KB, which means
-the rest of the MCH space is consumed but unreported.
-
-This can cause resource map sanity check warnings or (theoretically) a
-device conflict if we assigned the unreported space to another device.
-
-The Intel perf event uncore driver tripped over this when it claimed the
-MCH region:
-
-  resource map sanity check conflict: 0xfed10000 0xfed15fff 0xfed10000 0xfed13fff pnp 00:01
-  Info: mapping multiple BARs. Your kernel is fine.
-
-To prevent this, if we find a PNP0C02 resource that covers part of the MCH
-space, extend it to cover the entire space.
-
-References: http://lkml.kernel.org/r/20140224162400.GE16457@pd.tnic
-Reported-and-tested-by: Borislav Petkov <bp@alien8.de>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-Acked-by: Borislav Petkov <bp@suse.de>
-Acked-by: Stephane Eranian <eranian@google.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
-index 258fef2..3736bc4 100644
---- a/drivers/pnp/quirks.c
-+++ b/drivers/pnp/quirks.c
-@@ -15,6 +15,7 @@
- 
- #include <linux/types.h>
- #include <linux/kernel.h>
-+#include <linux/pci.h>
- #include <linux/string.h>
- #include <linux/slab.h>
- #include <linux/pnp.h>
-@@ -334,6 +335,81 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
- }
- #endif
- 
-+#ifdef CONFIG_X86
-+/* Device IDs of parts that have 32KB MCH space */
-+static const unsigned int mch_quirk_devices[] = {
-+	0x0154,	/* Ivy Bridge */
-+	0x0c00,	/* Haswell */
-+};
-+
-+static struct pci_dev *get_intel_host(void)
-+{
-+	int i;
-+	struct pci_dev *host;
-+
-+	for (i = 0; i < ARRAY_SIZE(mch_quirk_devices); i++) {
-+		host = pci_get_device(PCI_VENDOR_ID_INTEL, mch_quirk_devices[i],
-+				      NULL);
-+		if (host)
-+			return host;
-+	}
-+	return NULL;
-+}
-+
-+static void quirk_intel_mch(struct pnp_dev *dev)
-+{
-+	struct pci_dev *host;
-+	u32 addr_lo, addr_hi;
-+	struct pci_bus_region region;
-+	struct resource mch;
-+	struct pnp_resource *pnp_res;
-+	struct resource *res;
-+
-+	host = get_intel_host();
-+	if (!host)
-+		return;
-+
-+	/*
-+	 * MCHBAR is not an architected PCI BAR, so MCH space is usually
-+	 * reported as a PNP0C02 resource.  The MCH space was originally
-+	 * 16KB, but is 32KB in newer parts.  Some BIOSes still report a
-+	 * PNP0C02 resource that is only 16KB, which means the rest of the
-+	 * MCH space is consumed but unreported.
-+	 */
-+
-+	/*
-+	 * Read MCHBAR for Host Member Mapped Register Range Base
-+	 * https://www-ssl.intel.com/content/www/us/en/processors/core/4th-gen-core-family-desktop-vol-2-datasheet
-+	 * Sec 3.1.12.
-+	 */
-+	pci_read_config_dword(host, 0x48, &addr_lo);
-+	region.start = addr_lo & ~0x7fff;
-+	pci_read_config_dword(host, 0x4c, &addr_hi);
-+	region.start |= (u64) addr_hi << 32;
-+	region.end = region.start + 32*1024 - 1;
-+
-+	memset(&mch, 0, sizeof(mch));
-+	mch.flags = IORESOURCE_MEM;
-+	pcibios_bus_to_resource(host->bus, &mch, &region);
-+
-+	list_for_each_entry(pnp_res, &dev->resources, list) {
-+		res = &pnp_res->res;
-+		if (res->end < mch.start || res->start > mch.end)
-+			continue;	/* no overlap */
-+		if (res->start == mch.start && res->end == mch.end)
-+			continue;	/* exact match */
-+
-+		dev_info(&dev->dev, FW_BUG "PNP resource %pR covers only part of %s Intel MCH; extending to %pR\n",
-+			 res, pci_name(host), &mch);
-+		res->start = mch.start;
-+		res->end = mch.end;
-+		break;
-+	}
-+
-+	pci_dev_put(host);
-+}
-+#endif
-+
- /*
-  *  PnP Quirks
-  *  Cards or devices that need some tweaking due to incomplete resource info
-@@ -364,6 +440,9 @@ static struct pnp_fixup pnp_fixups[] = {
- #ifdef CONFIG_AMD_NB
- 	{"PNP0c01", quirk_amd_mmconfig_area},
- #endif
-+#ifdef CONFIG_X86
-+	{"PNP0c02", quirk_intel_mch},
-+#endif
- 	{""}
- };
- 
--- 
-cgit v0.10.1
-

packages/linux/patches/3.14.11/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch

@@ -1,78 +0,0 @@
-commit aad0b407edfef6e2527a9bb877ce754e1efb7b10
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Mon Jul 1 13:06:10 2013 +0300
-
-    ALSA: hda - Avoid outputting HDMI audio before prepare() and after close()
-    
-    adapted to 3.10
-    
-    From a6024295fd3290a8c9c5519a03316081ee82378a Mon Sep 17 00:00:00 2001
-    From: Anssi Hannula <anssi.hannula@iki.fi>
-    Date: Sat, 16 Feb 2013 17:42:46 +0200
-    Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and
-     after close()
-    
-    Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100) start
-    transmitting an empty audio stream as soon as PIN_OUT and AC_DIG1_ENABLE
-    are enabled.
-    
-    Since commit 6169b673618bf0b2518ce413b54925782a603f06 ("ALSA: hda -
-    Always turn on pins for HDMI/DP") this happens at first open() time, and
-    will continue even after close().
-    
-    Additionally, some codecs (at least Intel PantherPoint HDMI) currently
-    continue transmitting HDMI audio even after close() in case some actual
-    audio was output after open() (this happens regardless of PIN_OUT).
-    
-    Empty HDMI audio transmission when not intended has the effect that a
-    possible HDMI audio sink/receiver may prefer the empty HDMI audio stream
-    over an actual audio stream on its S/PDIF inputs.
-    
-    To avoid the issue before first prepare(), set stream format to 0 on
-    codec initialization. 0 is not a valid format value for HDMI and will
-    prevent the audio stream from being output.
-    
-    Additionally, at close() time, make sure that the stream is cleaned up.
-    This will ensure that the format is reset to 0 at that time, preventing
-    audio from being output in that case.
-    
-    Thanks to OpenELEC developers and users for their help in investigating
-    this issue on the affected NVIDIA "ION2" hardware. Testing of the final
-    version on NVIDIA ION2 was done by OpenELEC user "MrXIII". Testing on
-    Intel PantherPoint was done by myself.
-    
-    Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-    Cc: stable@vger.kernel.org
-
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index e12f7a0..9bfdd51 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -1360,6 +1360,14 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
- 	if (err < 0)
- 		return err;
- 
-+	/*
-+	 * Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100)
-+	 * start transmitting an empty audio stream as soon as PIN_OUT and
-+	 * AC_DIG1_ENABLE are enabled, which happens at open() time.
-+	 * To avoid that, set format to 0, which is not valid for HDMI.
-+	*/
-+	snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
-+
- 	if (spec->num_cvts < ARRAY_SIZE(spec->cvt_nids))
- 		spec->cvt_nids[spec->num_cvts] = cvt_nid;
- 	spec->num_cvts++;
-@@ -1474,6 +1482,12 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
- 	struct hdmi_spec_per_pin *per_pin;
- 
- 	if (hinfo->nid) {
-+		/*
-+		 * Make sure no empty audio is output after this point by
-+		 * setting stream format to 0, which is not valid for HDMI.
-+		*/
-+		__snd_hda_codec_cleanup_stream(codec, hinfo->nid, 1);
-+
- 		cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);
- 		if (snd_BUG_ON(cvt_idx < 0))
- 			return -EINVAL;

packages/linux/patches/3.14.11/linux-999.03-drm-radeon-PLL-fixes.patch

@@ -1,599 +0,0 @@
-From 709b25580e01df28a97152a81010ce40f06ec01e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Fri, 28 Mar 2014 18:55:10 +0100
-Subject: [PATCH 1/6] drm/radeon: rework finding display PLL numbers v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This completely reworks how the PLL parameters are generated and
-should result in better matching dot clock frequencies.
-
-Probably needs quite a bit of testing.
-
-bugs: https://bugs.freedesktop.org/show_bug.cgi?id=76564
-
-v2: more cleanup and comments.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/radeon/radeon_display.c | 243 ++++++++++++++++++++------------
- 1 file changed, 153 insertions(+), 90 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index fbd8b93..4e83ffd 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -34,6 +34,8 @@
- #include <drm/drm_crtc_helper.h>
- #include <drm/drm_edid.h>
- 
-+#include <linux/gcd.h>
-+
- static void avivo_crtc_load_lut(struct drm_crtc *crtc)
- {
- 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-@@ -799,66 +801,57 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
- }
- 
- /* avivo */
--static void avivo_get_fb_div(struct radeon_pll *pll,
--			     u32 target_clock,
--			     u32 post_div,
--			     u32 ref_div,
--			     u32 *fb_div,
--			     u32 *frac_fb_div)
--{
--	u32 tmp = post_div * ref_div;
- 
--	tmp *= target_clock;
--	*fb_div = tmp / pll->reference_freq;
--	*frac_fb_div = tmp % pll->reference_freq;
--
--        if (*fb_div > pll->max_feedback_div)
--		*fb_div = pll->max_feedback_div;
--        else if (*fb_div < pll->min_feedback_div)
--                *fb_div = pll->min_feedback_div;
--}
--
--static u32 avivo_get_post_div(struct radeon_pll *pll,
--			      u32 target_clock)
-+/**
-+ * avivo_reduce_ratio - fractional number reduction
-+ *
-+ * @nom: nominator
-+ * @den: denominator
-+ * @nom_min: minimum value for nominator
-+ * @den_min: minimum value for denominator
-+ *
-+ * Find the greatest common divisor and apply it on both nominator and
-+ * denominator, but make nominator and denominator are at least as large
-+ * as their minimum values.
-+ */
-+static void avivo_reduce_ratio(unsigned *nom, unsigned *den,
-+			       unsigned nom_min, unsigned den_min)
- {
--	u32 vco, post_div, tmp;
--
--	if (pll->flags & RADEON_PLL_USE_POST_DIV)
--		return pll->post_div;
--
--	if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP) {
--		if (pll->flags & RADEON_PLL_IS_LCD)
--			vco = pll->lcd_pll_out_min;
--		else
--			vco = pll->pll_out_min;
--	} else {
--		if (pll->flags & RADEON_PLL_IS_LCD)
--			vco = pll->lcd_pll_out_max;
--		else
--			vco = pll->pll_out_max;
-+	unsigned tmp;
-+
-+	/* reduce the numbers to a simpler ratio */
-+	tmp = gcd(*nom, *den);
-+	*nom /= tmp;
-+	*den /= tmp;
-+
-+	/* make sure nominator is large enough */
-+        if (*nom < nom_min) {
-+		tmp = (nom_min + *nom - 1) / *nom;
-+		*nom *= tmp;
-+		*den *= tmp;
- 	}
- 
--	post_div = vco / target_clock;
--	tmp = vco % target_clock;
--
--	if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP) {
--		if (tmp)
--			post_div++;
--	} else {
--		if (!tmp)
--			post_div--;
-+	/* make sure the denominator is large enough */
-+	if (*den < den_min) {
-+		tmp = (den_min + *den - 1) / *den;
-+		*nom *= tmp;
-+		*den *= tmp;
- 	}
--
--	if (post_div > pll->max_post_div)
--		post_div = pll->max_post_div;
--	else if (post_div < pll->min_post_div)
--		post_div = pll->min_post_div;
--
--	return post_div;
- }
- 
--#define MAX_TOLERANCE 10
--
-+/**
-+ * radeon_compute_pll_avivo - compute PLL paramaters
-+ *
-+ * @pll: information about the PLL
-+ * @dot_clock_p: resulting pixel clock
-+ * fb_div_p: resulting feedback divider
-+ * frac_fb_div_p: fractional part of the feedback divider
-+ * ref_div_p: resulting reference divider
-+ * post_div_p: resulting reference divider
-+ *
-+ * Try to calculate the PLL parameters to generate the given frequency:
-+ * dot_clock = (ref_freq * feedback_div) / (ref_div * post_div)
-+ */
- void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 			      u32 freq,
- 			      u32 *dot_clock_p,
-@@ -867,53 +860,123 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 			      u32 *ref_div_p,
- 			      u32 *post_div_p)
- {
--	u32 target_clock = freq / 10;
--	u32 post_div = avivo_get_post_div(pll, target_clock);
--	u32 ref_div = pll->min_ref_div;
--	u32 fb_div = 0, frac_fb_div = 0, tmp;
-+	unsigned fb_div_min, fb_div_max, fb_div;
-+	unsigned post_div_min, post_div_max, post_div;
-+	unsigned ref_div_min, ref_div_max, ref_div;
-+	unsigned post_div_best, diff_best;
-+	unsigned nom, den, tmp;
- 
--	if (pll->flags & RADEON_PLL_USE_REF_DIV)
--		ref_div = pll->reference_div;
-+	/* determine allowed feedback divider range */
-+	fb_div_min = pll->min_feedback_div;
-+	fb_div_max = pll->max_feedback_div;
- 
- 	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
--		avivo_get_fb_div(pll, target_clock, post_div, ref_div, &fb_div, &frac_fb_div);
--		frac_fb_div = (100 * frac_fb_div) / pll->reference_freq;
--		if (frac_fb_div >= 5) {
--			frac_fb_div -= 5;
--			frac_fb_div = frac_fb_div / 10;
--			frac_fb_div++;
-+		fb_div_min *= 10;
-+		fb_div_max *= 10;
-+	}
-+
-+	/* determine allowed ref divider range */
-+	if (pll->flags & RADEON_PLL_USE_REF_DIV)
-+		ref_div_min = pll->reference_div;
-+	else
-+		ref_div_min = pll->min_ref_div;
-+	ref_div_max = pll->max_ref_div;
-+
-+	/* determine allowed post divider range */
-+	if (pll->flags & RADEON_PLL_USE_POST_DIV) {
-+		post_div_min = pll->post_div;
-+		post_div_max = pll->post_div;
-+	} else {
-+		unsigned target_clock = freq / 10;
-+		unsigned vco_min, vco_max;
-+
-+		if (pll->flags & RADEON_PLL_IS_LCD) {
-+			vco_min = pll->lcd_pll_out_min;
-+			vco_max = pll->lcd_pll_out_max;
-+		} else {
-+			vco_min = pll->pll_out_min;
-+			vco_max = pll->pll_out_max;
- 		}
--		if (frac_fb_div >= 10) {
--			fb_div++;
--			frac_fb_div = 0;
-+
-+		post_div_min = vco_min / target_clock;
-+		if ((target_clock * post_div_min) < vco_min)
-+			++post_div_min;
-+		if (post_div_min < pll->min_post_div)
-+			post_div_min = pll->min_post_div;
-+
-+		post_div_max = vco_max / target_clock;
-+		if ((target_clock * post_div_max) > vco_max)
-+			--post_div_max;
-+		if (post_div_max > pll->max_post_div)
-+			post_div_max = pll->max_post_div;
-+	}
-+
-+	/* represent the searched ratio as fractional number */
-+	nom = pll->flags & RADEON_PLL_USE_FRAC_FB_DIV ? freq : freq / 10;
-+	den = pll->reference_freq;
-+
-+	/* reduce the numbers to a simpler ratio */
-+	avivo_reduce_ratio(&nom, &den, fb_div_min, post_div_min);
-+
-+	/* now search for a post divider */
-+	if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP)
-+		post_div_best = post_div_min;
-+	else
-+		post_div_best = post_div_max;
-+	diff_best = ~0;
-+
-+	for (post_div = post_div_min; post_div <= post_div_max; ++post_div) {
-+		unsigned diff = abs(den - den / post_div * post_div);
-+		if (diff < diff_best || (diff == diff_best &&
-+		    !(pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP))) {
-+
-+			post_div_best = post_div;
-+			diff_best = diff;
- 		}
-+	}
-+	post_div = post_div_best;
-+
-+	/* get matching reference and feedback divider */
-+	ref_div = max(den / post_div, 1u);
-+	fb_div = nom;
-+
-+	/* we're almost done, but reference and feedback
-+	   divider might be to large now */
-+
-+	tmp = ref_div;
-+
-+        if (fb_div > fb_div_max) {
-+		ref_div = ref_div * fb_div_max / fb_div;
-+		fb_div = fb_div_max;
-+	}
-+
-+	if (ref_div > ref_div_max) {
-+		ref_div = ref_div_max;
-+		fb_div = nom * ref_div_max / tmp;
-+	}
-+
-+	/* reduce the numbers to a simpler ratio once more */
-+	/* this also makes sure that the reference divider is large enough */
-+	avivo_reduce_ratio(&fb_div, &ref_div, fb_div_min, ref_div_min);
-+
-+	/* and finally save the result */
-+	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
-+		*fb_div_p = fb_div / 10;
-+		*frac_fb_div_p = fb_div % 10;
- 	} else {
--		while (ref_div <= pll->max_ref_div) {
--			avivo_get_fb_div(pll, target_clock, post_div, ref_div,
--					 &fb_div, &frac_fb_div);
--			if (frac_fb_div >= (pll->reference_freq / 2))
--				fb_div++;
--			frac_fb_div = 0;
--			tmp = (pll->reference_freq * fb_div) / (post_div * ref_div);
--			tmp = (tmp * 10000) / target_clock;
--
--			if (tmp > (10000 + MAX_TOLERANCE))
--				ref_div++;
--			else if (tmp >= (10000 - MAX_TOLERANCE))
--				break;
--			else
--				ref_div++;
--		}
-+		*fb_div_p = fb_div;
-+		*frac_fb_div_p = 0;
- 	}
- 
--	*dot_clock_p = ((pll->reference_freq * fb_div * 10) + (pll->reference_freq * frac_fb_div)) /
--		(ref_div * post_div * 10);
--	*fb_div_p = fb_div;
--	*frac_fb_div_p = frac_fb_div;
-+	*dot_clock_p = ((pll->reference_freq * *fb_div_p * 10) +
-+			(pll->reference_freq * *frac_fb_div_p)) /
-+		       (ref_div * post_div * 10);
- 	*ref_div_p = ref_div;
- 	*post_div_p = post_div;
--	DRM_DEBUG_KMS("%d, pll dividers - fb: %d.%d ref: %d, post %d\n",
--		      *dot_clock_p, fb_div, frac_fb_div, ref_div, post_div);
-+
-+	DRM_DEBUG_KMS("%d - %d, pll dividers - fb: %d.%d ref: %d, post %d\n",
-+		      freq, *dot_clock_p, *fb_div_p, *frac_fb_div_p,
-+		      ref_div, post_div);
- }
- 
- /* pre-avivo */
--- 
-1.9.1
-
-From 514738e09ec3ec0d1fb15cc3eabe4698b0d51358 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Fri, 4 Apr 2014 13:45:42 +0200
-Subject: [PATCH 2/6] drm/radeon: apply more strict limits for PLL params v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Letting post and refernce divider get to big is bad for signal stability.
-
-v2: increase the limit to 210
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/radeon/radeon_display.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 4e83ffd..35129ad 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -936,6 +936,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	}
- 	post_div = post_div_best;
- 
-+	/* limit reference * post divider to a maximum */
-+	ref_div_max = min(210 / post_div, ref_div_max);
-+
- 	/* get matching reference and feedback divider */
- 	ref_div = max(den / post_div, 1u);
- 	fb_div = nom;
--- 
-1.9.1
-
-From 97856db97ccbf06adf0cd6ede973b922e59d3eaa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Wed, 16 Apr 2014 11:54:21 +0200
-Subject: [PATCH 3/6] drm/radeon: improve PLL params if we don't match exactly
- v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise we might be quite off on older chipsets.
-
-v2: keep ref_div minimum
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/radeon/radeon_display.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 35129ad..00f63d28 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -864,7 +864,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	unsigned post_div_min, post_div_max, post_div;
- 	unsigned ref_div_min, ref_div_max, ref_div;
- 	unsigned post_div_best, diff_best;
--	unsigned nom, den, tmp;
-+	unsigned nom, den;
- 
- 	/* determine allowed feedback divider range */
- 	fb_div_min = pll->min_feedback_div;
-@@ -940,22 +940,23 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	ref_div_max = min(210 / post_div, ref_div_max);
- 
- 	/* get matching reference and feedback divider */
--	ref_div = max(den / post_div, 1u);
--	fb_div = nom;
-+	ref_div = max(DIV_ROUND_CLOSEST(den, post_div), 1u);
-+	fb_div = DIV_ROUND_CLOSEST(nom * ref_div * post_div, den);
- 
- 	/* we're almost done, but reference and feedback
- 	   divider might be to large now */
- 
--	tmp = ref_div;
-+	nom = fb_div;
-+	den = ref_div;
- 
-         if (fb_div > fb_div_max) {
--		ref_div = ref_div * fb_div_max / fb_div;
-+		ref_div = DIV_ROUND_CLOSEST(den * fb_div_max, nom);
- 		fb_div = fb_div_max;
- 	}
- 
- 	if (ref_div > ref_div_max) {
- 		ref_div = ref_div_max;
--		fb_div = nom * ref_div_max / tmp;
-+		fb_div = DIV_ROUND_CLOSEST(nom * ref_div_max, den);
- 	}
- 
- 	/* reduce the numbers to a simpler ratio once more */
--- 
-1.9.1
-
-From 537669e14063df59dd0b1004382842e278e19aa2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Sat, 19 Apr 2014 18:57:14 +0200
-Subject: [PATCH 4/6] drm/radeon: use fixed PPL ref divider if needed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/radeon/radeon_display.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 00f63d28..0c26b3c 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -880,7 +880,12 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 		ref_div_min = pll->reference_div;
- 	else
- 		ref_div_min = pll->min_ref_div;
--	ref_div_max = pll->max_ref_div;
-+
-+	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV &&
-+	    pll->flags & RADEON_PLL_USE_REF_DIV)
-+		ref_div_max = pll->reference_div;
-+	else
-+		ref_div_max = pll->max_ref_div;
- 
- 	/* determine allowed post divider range */
- 	if (pll->flags & RADEON_PLL_USE_POST_DIV) {
--- 
-1.9.1
-
-From 09535920958a819e90f0178e9d6831dba0577aa0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Sun, 20 Apr 2014 13:24:32 +0200
-Subject: [PATCH 5/6] drm/radeon: improve PLL limit handling in post div
- calculation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This improves the PLL parameters when we work at
-the limits of the allowed ranges.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/radeon/radeon_display.c | 77 ++++++++++++++++++++++-----------
- 1 file changed, 51 insertions(+), 26 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 0c26b3c..12a01e9 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -840,6 +840,38 @@ static void avivo_reduce_ratio(unsigned *nom, unsigned *den,
- }
- 
- /**
-+ * avivo_get_fb_ref_div - feedback and ref divider calculation
-+ *
-+ * @nom: nominator
-+ * @den: denominator
-+ * @post_div: post divider
-+ * @fb_div_max: feedback divider maximum
-+ * @ref_div_max: reference divider maximum
-+ * @fb_div: resulting feedback divider
-+ * @ref_div: resulting reference divider
-+ *
-+ * Calculate feedback and reference divider for a given post divider. Makes
-+ * sure we stay within the limits.
-+ */
-+static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div,
-+				 unsigned fb_div_max, unsigned ref_div_max,
-+				 unsigned *fb_div, unsigned *ref_div)
-+{
-+	/* limit reference * post divider to a maximum */
-+	ref_div_max = min(210 / post_div, ref_div_max);
-+
-+	/* get matching reference and feedback divider */
-+	*ref_div = min(max(DIV_ROUND_CLOSEST(den, post_div), 1u), ref_div_max);
-+	*fb_div = DIV_ROUND_CLOSEST(nom * *ref_div * post_div, den);
-+
-+	/* limit fb divider to its maximum */
-+        if (*fb_div > fb_div_max) {
-+		*ref_div = DIV_ROUND_CLOSEST(*ref_div * fb_div_max, *fb_div);
-+		*fb_div = fb_div_max;
-+	}
-+}
-+
-+/**
-  * radeon_compute_pll_avivo - compute PLL paramaters
-  *
-  * @pll: information about the PLL
-@@ -860,6 +892,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 			      u32 *ref_div_p,
- 			      u32 *post_div_p)
- {
-+	unsigned target_clock = pll->flags & RADEON_PLL_USE_FRAC_FB_DIV ?
-+		freq : freq / 10;
-+
- 	unsigned fb_div_min, fb_div_max, fb_div;
- 	unsigned post_div_min, post_div_max, post_div;
- 	unsigned ref_div_min, ref_div_max, ref_div;
-@@ -892,7 +927,6 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 		post_div_min = pll->post_div;
- 		post_div_max = pll->post_div;
- 	} else {
--		unsigned target_clock = freq / 10;
- 		unsigned vco_min, vco_max;
- 
- 		if (pll->flags & RADEON_PLL_IS_LCD) {
-@@ -903,6 +937,11 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 			vco_max = pll->pll_out_max;
- 		}
- 
-+		if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
-+			vco_min *= 10;
-+			vco_max *= 10;
-+		}
-+
- 		post_div_min = vco_min / target_clock;
- 		if ((target_clock * post_div_min) < vco_min)
- 			++post_div_min;
-@@ -917,7 +956,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	}
- 
- 	/* represent the searched ratio as fractional number */
--	nom = pll->flags & RADEON_PLL_USE_FRAC_FB_DIV ? freq : freq / 10;
-+	nom = target_clock;
- 	den = pll->reference_freq;
- 
- 	/* reduce the numbers to a simpler ratio */
-@@ -931,7 +970,12 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	diff_best = ~0;
- 
- 	for (post_div = post_div_min; post_div <= post_div_max; ++post_div) {
--		unsigned diff = abs(den - den / post_div * post_div);
-+		unsigned diff;
-+		avivo_get_fb_ref_div(nom, den, post_div, fb_div_max,
-+				     ref_div_max, &fb_div, &ref_div);
-+		diff = abs(target_clock - (pll->reference_freq * fb_div) /
-+			(ref_div * post_div));
-+
- 		if (diff < diff_best || (diff == diff_best &&
- 		    !(pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP))) {
- 
-@@ -941,28 +985,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	}
- 	post_div = post_div_best;
- 
--	/* limit reference * post divider to a maximum */
--	ref_div_max = min(210 / post_div, ref_div_max);
--
--	/* get matching reference and feedback divider */
--	ref_div = max(DIV_ROUND_CLOSEST(den, post_div), 1u);
--	fb_div = DIV_ROUND_CLOSEST(nom * ref_div * post_div, den);
--
--	/* we're almost done, but reference and feedback
--	   divider might be to large now */
--
--	nom = fb_div;
--	den = ref_div;
--
--        if (fb_div > fb_div_max) {
--		ref_div = DIV_ROUND_CLOSEST(den * fb_div_max, nom);
--		fb_div = fb_div_max;
--	}
--
--	if (ref_div > ref_div_max) {
--		ref_div = ref_div_max;
--		fb_div = DIV_ROUND_CLOSEST(nom * ref_div_max, den);
--	}
-+	/* get the feedback and reference divider for the optimal value */
-+	avivo_get_fb_ref_div(nom, den, post_div, fb_div_max, ref_div_max,
-+			     &fb_div, &ref_div);
- 
- 	/* reduce the numbers to a simpler ratio once more */
- 	/* this also makes sure that the reference divider is large enough */
-@@ -984,7 +1009,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll,
- 	*post_div_p = post_div;
- 
- 	DRM_DEBUG_KMS("%d - %d, pll dividers - fb: %d.%d ref: %d, post %d\n",
--		      freq, *dot_clock_p, *fb_div_p, *frac_fb_div_p,
-+		      freq, *dot_clock_p * 10, *fb_div_p, *frac_fb_div_p,
- 		      ref_div, post_div);
- }
- 
--- 
-1.9.1
-

packages/linux/patches/3.15.5/linux-051-ouya_controller_support.patch

@@ -0,0 +1,315 @@
+diff -Naur linux-3.15-rc6.orig/drivers/hid/hid-core.c linux-3.15-rc6/drivers/hid/hid-core.c
+--- linux-3.15-rc6.orig/drivers/hid/hid-core.c	2014-06-06 13:46:49.711845049 -0700
++++ linux-3.15-rc6/drivers/hid/hid-core.c	2014-06-06 13:50:33.019965538 -0700
+@@ -1848,6 +1848,7 @@
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_OUYA, USB_DEVICE_ID_OUYA_CONTROLLER) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) },
+diff -Naur linux-3.15-rc6.orig/drivers/hid/hid-ids.h linux-3.15-rc6/drivers/hid/hid-ids.h
+--- linux-3.15-rc6.orig/drivers/hid/hid-ids.h	2014-06-06 13:46:49.711845049 -0700
++++ linux-3.15-rc6/drivers/hid/hid-ids.h	2014-06-06 13:51:36.146564828 -0700
+@@ -700,6 +700,9 @@
+ #define USB_DEVICE_ID_ORTEK_PKB1700	0x1700
+ #define USB_DEVICE_ID_ORTEK_WKB2000	0x2000
+ 
++#define USB_VENDOR_ID_OUYA		0x2836
++#define USB_DEVICE_ID_OUYA_CONTROLLER	0x0001
++
+ #define USB_VENDOR_ID_PANASONIC		0x04da
+ #define USB_DEVICE_ID_PANABOARD_UBT780	0x1044
+ #define USB_DEVICE_ID_PANABOARD_UBT880	0x104d
+diff -Naur linux-3.15-rc6.orig/drivers/hid/hid-ouya.c linux-3.15-rc6/drivers/hid/hid-ouya.c
+--- linux-3.15-rc6.orig/drivers/hid/hid-ouya.c	1969-12-31 16:00:00.000000000 -0800
++++ linux-3.15-rc6/drivers/hid/hid-ouya.c	2014-06-06 13:52:22.785007560 -0700
+@@ -0,0 +1,260 @@
++/*
++ *  HID driver for OUYA Game Controller(s)
++ *
++ *  Copyright (c) 2013 OUYA
++ */
++
++#include <linux/device.h>
++#include <linux/input.h>
++#include <linux/hid.h>
++#include <linux/module.h>
++
++#include "hid-ids.h"
++
++#define OUYA_TOUCHPAD_FIXUP     (1 << 0)
++
++struct ouya_sc {
++	unsigned long quirks;
++};
++
++/* Fixed report descriptor */
++static __u8 ouya_rdesc_fixed[] = {
++
++	0x05, 0x01,         /*  Usage Page (Desktop),           */
++	0x09, 0x05,         /*  Usage (Game Pad),               */
++
++	0xA1, 0x01,         /*  Collection (Application),       */
++	0x85, 0x07,         /*      Report ID (7),              */
++
++	0xA1, 0x00,         /*      Collection (Physical),      */
++	0x09, 0x30,         /*          Usage (X),              */
++	0x09, 0x31,         /*          Usage (Y),              */
++	0x15, 0x00,         /*          Logical Minimum (0),    */
++	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */
++	0x35, 0x00,         /*          Physical Minimum (0),   */
++	0x46, 0xFF, 0x00,   /*          Physical Maximum (255), */
++	0x95, 0x02,         /*          Report Count (2),       */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0xC0,               /*      End Collection,             */
++
++	0xA1, 0x00,         /*      Collection (Physical),      */
++	0x09, 0x33,         /*          Usage (Rx),             */
++	0x09, 0x34,         /*          Usage (Ry),             */
++	0x15, 0x00,         /*          Logical Minimum (0),    */
++	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */
++	0x35, 0x00,         /*          Physical Minimum (0),   */
++	0x46, 0xFF, 0x00,   /*          Physical Maximum (255), */
++	0x95, 0x02,         /*          Report Count (2),       */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0xC0,               /*      End Collection,             */
++
++	0xA1, 0x00,         /*      Collection (Physical),      */
++	0x09, 0x32,         /*          Usage (Z),              */
++	0x15, 0x00,         /*          Logical Minimum (0),    */
++	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */
++	0x35, 0x00,         /*          Physical Minimum (0),   */
++	0x46, 0xFF, 0x00,   /*          Physical Maximum (255), */
++	0x95, 0x01,         /*          Report Count (1),       */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0xC0,               /*      End Collection,             */
++
++	0xA1, 0x00,         /*      Collection (Physical),      */
++	0x09, 0x35,         /*          Usage (Rz),             */
++	0x15, 0x00,         /*          Logical Minimum (0),    */
++	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */
++	0x35, 0x00,         /*          Physical Minimum (0),   */
++	0x46, 0xFF, 0x00,   /*          Physical Maximum (255), */
++	0x95, 0x01,         /*          Report Count (1),       */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0xC0,               /*      End Collection,             */
++
++	0x05, 0x09,         /*      Usage Page (Button),        */
++	0x19, 0x01,         /*      Usage Minimum (01h),        */
++	0x29, 0x10,         /*      Usage Maximum (10h),        */
++	0x95, 0x10,         /*      Report Count (16),          */
++	0x75, 0x01,         /*      Report Size (1),            */
++	0x81, 0x02,         /*      Input (Variable),           */
++
++	/*   ORIGINAL REPORT DESCRIPTOR FOR TOUCHPAD INPUT  */
++    /* 06 00 ff a1 02 09 02 15 00 26 ff 00 35 00 46 ff 00 95 03 75 08 81 02 c0 */
++
++	0x06, 0x00, 0xFF,   /*      Usage Page (Custom),        */
++	0x09, 0x02,         /*      Usage (Mouse),              */
++	0x09, 0x01,         /*      Usage (Pointer),            */
++	0xA1, 0x00,         /*      Collection (Physical),      */
++	0x05, 0x09,         /*          Usage Page (Button),    */
++	0x19, 0x01,         /*          Usage Minimum (01h),    */
++	0x29, 0x03,         /*          Usage Maximum (03h),    */
++	0x15, 0x00,         /*          Logical Minimum (0),    */
++	0x25, 0x01,         /*          Logical Maximum (1),    */
++	0x95, 0x03,         /*          Report Count (3),       */
++	0x75, 0x01,         /*          Report Size (1),        */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0x95, 0x01,         /*          Report Count (1),       */
++	0x75, 0x05,         /*          Report Size (5),        */
++	0x81, 0x01,         /*          Input (Constant),       */
++	0x05, 0x01,         /*          Usage Page (Desktop),   */
++	0x09, 0x30,         /*          Usage (X),              */
++	0x09, 0x31,         /*          Usage (Y),              */
++	0x15, 0x81,         /*          Logical Minimum (-127), */
++	0x25, 0x7f,         /*          Logical Maximum (127),  */
++	0x95, 0x02,         /*          Report Count (2),       */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x81, 0x06,         /*          Input (Relative),       */
++	0xC0,               /*      End Collection,             */
++
++	0x06, 0x00, 0xFF,   /*      Usage Page (Custom),        */
++	0xA1, 0x02,         /*      Collection (Logical),       */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x95, 0x07,         /*          Report Count (7),       */
++	0x46, 0xFF, 0x00,   /*          Physical Maximum (255), */
++	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */
++	0x09, 0x01,         /*          Usage (Pointer),        */
++	0x91, 0x02,         /*          Output (Variable),      */
++	0xC0,               /*      End Collection,             */
++
++	0xC0,               /*  End Collection                  */
++
++
++	0x06, 0x00, 0xFF,   /*  Usage Page (Custom),            */
++	0x05, 0x0C,         /*  Usage Page (Consumer),          */
++	0x09, 0x01,         /*  Usage (Consumer Control),       */
++
++	0xA1, 0x01,         /*  Collection (Application),       */
++	0x85, 0x03,         /*      Report ID (3),              */
++	0x05, 0x01,         /*      Usage Page (Desktop),       */
++	0x09, 0x06,         /*      Usage (Keyboard),           */
++	0xA1, 0x02,         /*      Collection (Logical),       */
++	0x05, 0x06,         /*          Usage Page (Generic),   */
++	0x09, 0x20,         /*          Usage (Battery Strgth), */
++	0x15, 0x00,         /*          Logical Minimum (0),    */
++	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),  */
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x95, 0x01,         /*          Report Count (1),       */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0x06, 0xBC, 0xFF,   /*          Usage Page (Custom),    */
++
++	0x0A, 0xAD, 0xBD,   /*  UNKNOWN */
++
++	0x75, 0x08,         /*          Report Size (8),        */
++	0x95, 0x06,         /*          Report Count (6),       */
++	0x81, 0x02,         /*          Input (Variable),       */
++	0xC0,               /*      End Collection,             */
++
++	0xC0,               /*  End Collection                  */
++	
++	0x00 
++};
++
++static __u8 *ouya_report_fixup(struct hid_device *hdev, __u8 *rdesc,
++		unsigned int *rsize)
++{
++	struct ouya_sc *sc = hid_get_drvdata(hdev);
++
++	if (sc->quirks & OUYA_TOUCHPAD_FIXUP) {
++		rdesc = ouya_rdesc_fixed;
++		*rsize = sizeof(ouya_rdesc_fixed);
++	}
++    return rdesc;
++}
++
++static int ouya_input_mapping(struct hid_device *hdev, struct hid_input *hi,
++			       struct hid_field *field, struct hid_usage *usage,
++			       unsigned long **bit, int *max)
++{
++	struct ouya_sc *sc = hid_get_drvdata(hdev);
++
++	if (!(sc->quirks & OUYA_TOUCHPAD_FIXUP)) {
++		return 0;
++	}
++
++	if ((usage->hid & 0x90000) == 0x90000 &&
++		(field->physical & 0xff000000) == 0xff000000 &&
++		usage->collection_index == 5 &&
++		field->report_count == 3) {
++
++		hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_MOUSE + (usage->hid - 0x90001));
++
++		return 1;
++	}
++
++	return 0;
++}
++
++static int ouya_probe(struct hid_device *hdev, const struct hid_device_id *id)
++{
++	int ret;
++	struct ouya_sc *sc;
++
++	sc = kzalloc(sizeof(*sc), GFP_KERNEL);
++	if (sc == NULL) {
++		hid_err(hdev, "can't alloc ouya descriptor\n");
++		return -ENOMEM;
++	}
++
++	if(((hdev->version & 0xff00) == 0x0100 && (hdev->version & 0xff) >= 0x04) ||
++		((hdev->version & 0xff00) == 0xe100 && (hdev->version & 0xff) >= 0x3a)) {
++		hid_info(hdev, "ouya controller - new version\n");
++		sc->quirks = OUYA_TOUCHPAD_FIXUP;	
++	} else {
++		sc->quirks = 0;	
++	}
++	hid_set_drvdata(hdev, sc);
++
++	ret = hid_parse(hdev);
++	if (ret) {
++		hid_err(hdev, "parse failed\n");
++		goto err_free;
++	}
++
++	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |
++			HID_CONNECT_HIDDEV_FORCE);
++	if (ret) {
++		hid_err(hdev, "hw start failed\n");
++		goto err_free;
++	}
++
++	return 0;
++
++err_free:
++	kfree(sc);
++	return ret;
++}
++
++static void ouya_remove(struct hid_device *hdev)
++{
++	hid_hw_stop(hdev);
++	kfree(hid_get_drvdata(hdev));
++}
++
++static const struct hid_device_id ouya_devices[] = {
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_OUYA, USB_DEVICE_ID_OUYA_CONTROLLER) },
++	{ }
++};
++MODULE_DEVICE_TABLE(hid, ouya_devices);
++
++static struct hid_driver ouya_driver = {
++	.name = "ouya",
++	.id_table = ouya_devices,
++	.probe = ouya_probe,
++	.remove = ouya_remove,
++	.input_mapping = ouya_input_mapping,	
++	.report_fixup = ouya_report_fixup
++};
++
++static int __init ouya_init(void)
++{
++	return hid_register_driver(&ouya_driver);
++}
++
++static void __exit ouya_exit(void)
++{
++	hid_unregister_driver(&ouya_driver);
++}
++
++module_init(ouya_init);
++module_exit(ouya_exit);
+diff -Naur linux-3.15-rc6.orig/drivers/hid/Kconfig linux-3.15-rc6/drivers/hid/Kconfig
+--- linux-3.15-rc6.orig/drivers/hid/Kconfig	2014-06-06 13:46:49.710845040 -0700
++++ linux-3.15-rc6/drivers/hid/Kconfig	2014-06-06 13:48:41.674908325 -0700
+@@ -499,6 +499,12 @@
+ 	   - Ortek WKB-2000
+ 	   - Skycable wireless presenter
+ 
++config HID_OUYA
++	tristate "OUYA Game Controller"
++	depends on USB_HID
++	---help---
++	Support for OUYA Game Controller.
++
+ config HID_PANTHERLORD
+ 	tristate "Pantherlord/GreenAsia game controller"
+ 	depends on HID
+diff -Naur linux-3.15-rc6.orig/drivers/hid/Makefile linux-3.15-rc6/drivers/hid/Makefile
+--- linux-3.15-rc6.orig/drivers/hid/Makefile	2014-06-06 13:46:49.710845040 -0700
++++ linux-3.15-rc6/drivers/hid/Makefile	2014-06-06 13:49:23.951309760 -0700
+@@ -68,6 +68,7 @@
+ obj-$(CONFIG_HID_MULTITOUCH)	+= hid-multitouch.o
+ obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o
+ obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o
++obj-$(CONFIG_HID_OUYA)		+= hid-ouya.o
+ obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prodikeys.o
+ obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o
+ obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

packages/linux/patches/3.15.5/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch

@@ -1,3 +1,10 @@
+From 7051422474e4c4e302ede3d07ffd8ef2682e07a2 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Tue, 22 Apr 2014 16:05:14 +0300
+Subject: [PATCH] [RFC] hid/sony: add autorepeat for PS3 remotes
+
+adapted to 3.15
+
 Betreff: [RFC] hid/sony: add autorepeat for PS3 remotes
 Von: David Dillow <dave@thedillows.org>
 Datum: 28.06.2013 04:28
@@ -16,21 +23,22 @@ some demand.
 This compiled against the hid-sony driver with the PS3 remote changes
 merged, but I have done no testing of it. If the approach seems
 reasonable, I'll try to test it when the MythTV is idle.
+---
+ drivers/hid/hid-sony.c |   21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
 
- drivers/hid/hid-sony.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
 diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
-index ecbc749..0bbcd07 100644
+index 6647dc0..02ff292 100644
 --- a/drivers/hid/hid-sony.c
 +++ b/drivers/hid/hid-sony.c
-@@ -274,6 +274,24 @@ static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
- 	return 1;
+@@ -785,6 +785,25 @@ static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
  }
  
+ 
 +static int ps3remote_setup_repeat(struct hid_device *hdev)
 +{
 +	struct hid_input *hidinput = list_first_entry(&hdev->inputs,
-+						      struct hid_input, list);
++                                                     struct hid_input, list);
 +	struct input_dev *input = hidinput->input;
 +
 +	/*
@@ -38,24 +46,26 @@ index ecbc749..0bbcd07 100644
 +	 * this must be done after hid_hw_start(), as having these non-zero
 +	 * at the time of input_register_device() tells the input system that
 +	 * the hardware does the autorepeat, and the PS3 remote does not.
-+	 */
++	*/
 +	set_bit(EV_REP, input->evbit);
 +	input->rep[REP_DELAY]  = 500;
 +	input->rep[REP_PERIOD] = 125;
 +
 +	return 0;
 +}
- 
++
  /* Sony Vaio VGX has wrongly mouse pointer declared as constant */
  static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-@@ -659,6 +677,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
- 		ret = sixaxis_set_operational_bt(hdev);
- 	else if (sc->quirks & BUZZ_CONTROLLER)
- 		ret = buzz_init(hdev);
+ 		unsigned int *rsize)
+@@ -1608,6 +1627,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
+ 		connect_mask |= HID_CONNECT_HIDDEV_FORCE;
+ 	else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
+ 		connect_mask |= HID_CONNECT_HIDDEV_FORCE;
 +	else if (sc->quirks & PS3REMOTE)
 +		ret = ps3remote_setup_repeat(hdev);
- 	else
- 		ret = 0;
  
-
+ 	ret = hid_hw_start(hdev, connect_mask);
+ 	if (ret) {
+-- 
+1.7.2.5
 

packages/linux/patches/3.15.5/linux-060-add_AUGUST_DVB-T205.patch

@@ -0,0 +1,14 @@
+diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+index 61d196e..ae87b9c 100644
+--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
++++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+@@ -1497,6 +1497,9 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
+ 		&rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) },
+ 	{ DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A,
+ 		&rtl2832u_props, "Crypto ReDi PC 50 A", NULL) },
++	{ DVB_USB_DEVICE(USB_VID_GTEK, 0xa803,
++		&rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
++
+ 	{ DVB_USB_DEVICE(USB_VID_KYE, 0x707f,
+ 		&rtl2832u_props, "Genius TVGo DVB-T03", NULL) },
+ 

packages/linux/patches/3.15.5/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch

@@ -0,0 +1,83 @@
+From 56ca3555ed8e0f5fd741477fd23497f5455c3f53 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Tue, 22 Apr 2014 15:58:50 +0300
+Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and after close()
+
+adapted to 3.15
+
+From a6024295fd3290a8c9c5519a03316081ee82378a Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi.hannula@iki.fi>
+Date: Sat, 16 Feb 2013 17:42:46 +0200
+Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and
+ after close()
+
+Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100) start
+transmitting an empty audio stream as soon as PIN_OUT and AC_DIG1_ENABLE
+are enabled.
+
+Since commit 6169b673618bf0b2518ce413b54925782a603f06 ("ALSA: hda -
+Always turn on pins for HDMI/DP") this happens at first open() time, and
+will continue even after close().
+
+Additionally, some codecs (at least Intel PantherPoint HDMI) currently
+continue transmitting HDMI audio even after close() in case some actual
+audio was output after open() (this happens regardless of PIN_OUT).
+
+Empty HDMI audio transmission when not intended has the effect that a
+possible HDMI audio sink/receiver may prefer the empty HDMI audio stream
+over an actual audio stream on its S/PDIF inputs.
+
+To avoid the issue before first prepare(), set stream format to 0 on
+codec initialization. 0 is not a valid format value for HDMI and will
+prevent the audio stream from being output.
+
+Additionally, at close() time, make sure that the stream is cleaned up.
+This will ensure that the format is reset to 0 at that time, preventing
+audio from being output in that case.
+
+Thanks to OpenELEC developers and users for their help in investigating
+this issue on the affected NVIDIA "ION2" hardware. Testing of the final
+version on NVIDIA ION2 was done by OpenELEC user "MrXIII". Testing on
+Intel PantherPoint was done by myself.
+
+Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
+Cc: stable@vger.kernel.org
+---
+ sound/pci/hda/patch_hdmi.c |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
+index 0cb5b89..e92f24f 100644
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -1698,6 +1698,14 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
+ 	if (err < 0)
+ 		return err;
+ 
++	/*
++	 * Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100)
++	 * start transmitting an empty audio stream as soon as PIN_OUT and
++	 * AC_DIG1_ENABLE are enabled, which happens at open() time.
++	 * To avoid that, set format to 0, which is not valid for HDMI.
++	*/
++	snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
++
+ 	if (spec->num_cvts < ARRAY_SIZE(spec->cvt_nids))
+ 		spec->cvt_nids[spec->num_cvts] = cvt_nid;
+ 	spec->num_cvts++;
+@@ -1823,6 +1831,12 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
+ 	int pinctl;
+ 
+ 	if (hinfo->nid) {
++		/*
++		 * Make sure no empty audio is output after this point by
++		 * setting stream format to 0, which is not valid for HDMI.
++		*/
++		__snd_hda_codec_cleanup_stream(codec, hinfo->nid, 1);
++
+ 		cvt_idx = cvt_nid_to_cvt_index(codec, hinfo->nid);
+ 		if (snd_BUG_ON(cvt_idx < 0))
+ 			return -EINVAL;
+-- 
+1.7.2.5
+

packages/linux/patches/3.15.5/linux-999.03-0001-fix-mceusb.patch

@@ -1,6 +1,28 @@
---- linux-3.14.1/drivers/media/rc/mceusb.c	2014-04-09 12:37:46.510492000 -0500
-+++ linux-3.14.1/drivers/media/rc/mceusb.c	2014-04-23 17:58:17.224854949 -0500
-@@ -761,11 +761,18 @@ static void mce_request_packet(struct mc
+From: Matt DeVillier <matt.devillier@gmail.com>
+
+Change the I/O endpoint handling of the mceusb driver to respect the endpoint 
+type reported by device (bulk/interrupt), rather than treating all endpoints 
+as type interrupt, which breaks devices using bulk endpoints when connected 
+to a xhci controller.  Accordingly, change the function calls to initialize 
+an endpoint's transfer pipe and urb handlers to use the correct function based 
+on the endpoint type.
+
+Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
+Tested-by: Sean Young <sean@mess.org>
+-
+This is a continuation of the work started in patch #21648
+Patch compiled and tested against linux-media git master. Backported and tested 
+against 3.14.1 stable as well.
+v3 corrects formatting issues which prevented the patch from being applied
+with 'git am,' and replaces a few complex conditionals with inline functions 
+for improved clarity.
+---
+
+diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
+index 5d8f3d4..74721cc 100644
+--- a/drivers/media/rc/mceusb.c
++++ b/drivers/media/rc/mceusb.c
+@@ -747,11 +747,19 @@  static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
  		}
  
  		/* outbound data */
@@ -18,13 +40,14 @@
 +		} else {
 +			pipe = usb_sndbulkpipe(ir->usbdev,
 +					 ir->usb_ep_out->bEndpointAddress);
-+			usb_fill_bulk_urb(async_urb, ir->usbdev, pipe, async_buf,
-+					 size, mce_async_callback, ir);
++			usb_fill_bulk_urb(async_urb, ir->usbdev, pipe,
++					 async_buf, size, mce_async_callback,
++					 ir);
 +		}
  		memcpy(async_buf, data, size);
  
  	} else if (urb_type == MCEUSB_RX) {
-@@ -1283,34 +1290,26 @@ static int mceusb_dev_probe(struct usb_i
+@@ -1269,32 +1277,26 @@  static int mceusb_dev_probe(struct usb_interface *intf,
  	for (i = 0; i < idesc->desc.bNumEndpoints; ++i) {
  		ep = &idesc->endpoint[i].desc;
  
@@ -39,16 +62,15 @@
 -			ep_in = ep;
 -			ep_in->bmAttributes = USB_ENDPOINT_XFER_INT;
 -			ep_in->bInterval = 1;
--			mce_dbg(&intf->dev, "acceptable inbound endpoint "
--				"found\n");
+-			dev_dbg(&intf->dev, "acceptable inbound endpoint found");
 +		if (ep_in == NULL) {
 +			if (usb_endpoint_is_bulk_in(ep)) {
 +				ep_in = ep;
-+				mce_dbg(&intf->dev, "acceptable bulk inbound endpoint found\n");
++				dev_dbg(&intf->dev, "acceptable bulk inbound endpoint found\n");
 +			} else if (usb_endpoint_is_int_in(ep)) {
 +				ep_in = ep;
 +				ep_in->bInterval = 1;
-+				mce_dbg(&intf->dev, "acceptable interrupt inbound endpoint found\n");
++				dev_dbg(&intf->dev, "acceptable interrupt inbound endpoint found\n");
 +			}
  		}
  
@@ -63,30 +85,28 @@
 -			ep_out = ep;
 -			ep_out->bmAttributes = USB_ENDPOINT_XFER_INT;
 -			ep_out->bInterval = 1;
--			mce_dbg(&intf->dev, "acceptable outbound endpoint "
--				"found\n");
+-			dev_dbg(&intf->dev, "acceptable outbound endpoint found");
 +		if (ep_out == NULL) {
 +			if (usb_endpoint_is_bulk_out(ep)) {
 +				ep_out = ep;
-+				mce_dbg(&intf->dev, "acceptable bulk outbound endpoint found\n");
++				dev_dbg(&intf->dev, "acceptable bulk outbound endpoint found\n");
 +			} else if (usb_endpoint_is_int_out(ep)) {
 +				ep_out = ep;
 +				ep_out->bInterval = 1;
-+				mce_dbg(&intf->dev, "acceptable interrupt outbound endpoint found\n");
++				dev_dbg(&intf->dev, "acceptable interrupt outbound endpoint found\n");
 +			}
  		}
  	}
  	if (ep_in == NULL) {
-@@ -1318,7 +1317,11 @@ static int mceusb_dev_probe(struct usb_i
+@@ -1302,7 +1304,10 @@  static int mceusb_dev_probe(struct usb_interface *intf,
  		return -ENODEV;
  	}
  
 -	pipe = usb_rcvintpipe(dev, ep_in->bEndpointAddress);
-+	if (usb_endpoint_xfer_int(ep_in)) {
++	if (usb_endpoint_xfer_int(ep_in))
 +		pipe = usb_rcvintpipe(dev, ep_in->bEndpointAddress);
-+	} else {
++	else
 +		pipe = usb_rcvbulkpipe(dev, ep_in->bEndpointAddress);
-+	}
  	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
  
  	ir = kzalloc(sizeof(struct mceusb_dev), GFP_KERNEL);

packages/mediacenter/service.openelec.settings/addon

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -R $PKG_BUILD/.install_pkg/usr/share/xbmc/addons/$PKG_ADDON_ID/* $ADDON_BUILD/$PKG_ADDON_ID

packages/mediacenter/service.openelec.settings/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.3.18"
+PKG_VERSION="0.3.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

packages/mediacenter/xbmc-pvr-addons/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-addons"
-PKG_VERSION="f38b2eb"
+PKG_VERSION="18c52bb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-999.02-picons-support.patch

@@ -0,0 +1,200 @@
+From e0281842588c867fdf3f26fe15f70576e1363f4e Mon Sep 17 00:00:00 2001
+From: Rainer Hochecker <fernetmenta@online.de>
+Date: Sun, 11 May 2014 12:01:23 +0200
+Subject: [PATCH] VNSI: add icon path to channels
+
+---
+ .../addon/resources/language/English/strings.po           |  6 +++++-
+ addons/pvr.vdr.vnsi/addon/resources/settings.xml          |  1 +
+ addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp                     |  6 +++++-
+ addons/pvr.vdr.vnsi/src/VNSIData.cpp                      | 13 +++++++++++++
+ addons/pvr.vdr.vnsi/src/VNSISession.cpp                   |  6 +++---
+ addons/pvr.vdr.vnsi/src/VNSISession.h                     |  6 +++---
+ addons/pvr.vdr.vnsi/src/client.cpp                        | 15 +++++++++++++++
+ addons/pvr.vdr.vnsi/src/client.h                          |  1 +
+ addons/pvr.vdr.vnsi/src/vnsicommand.h                     |  5 ++++-
+ 9 files changed, 50 insertions(+), 9 deletions(-)
+
+diff --git a/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po b/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po
+index 0dbd547..b5ca004 100644
+--- a/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po
++++ b/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po
+@@ -210,7 +210,11 @@ msgctxt "#30047"
+ msgid "Request Timeshift"
+ msgstr ""
+ 
+-#empty strings from id 30048 to 30099
++msgctxt "#30048"
++msgid "Path to channel icons"
++msgstr ""
++
++#empty strings from id 30049 to 30099
+ 
+ msgctxt "#30100"
+ msgid "VDR OSD"
+diff --git a/addons/pvr.vdr.vnsi/addon/resources/settings.xml b/addons/pvr.vdr.vnsi/addon/resources/settings.xml
+index c75cc8c..e750ee0 100644
+--- a/addons/pvr.vdr.vnsi/addon/resources/settings.xml
++++ b/addons/pvr.vdr.vnsi/addon/resources/settings.xml
+@@ -8,4 +8,5 @@
+     <setting id="timeout" type="enum" label="30004" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="3"/>
+     <setting id="handlemessages" type="bool" label="30005" default="true" />
+     <setting id="autochannelgroups" type="bool" label="30046" default="false" />
++    <setting id="iconpath" type="folder" source="files" label="30048" default="" />
+ </settings>
+diff --git a/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp b/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp
+index a8b5403..36a2dff 100644
+--- a/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp
++++ b/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp
+@@ -1427,11 +1427,15 @@ bool cVNSIAdmin::ReadChannelList(bool radio)
+     char *strChannelName  = vresp->extract_String();
+     channel.m_name = strChannelName;
+     char *strProviderName = vresp->extract_String();
+-    channel.m_provider = strProviderName;
++    channel.m_provider    = strProviderName;
+     channel.m_id          = vresp->extract_U32();
+                             vresp->extract_U32(); // first caid
+     char *strCaids        = vresp->extract_String();
+     channel.SetCaids(strCaids);
++    if (m_protocol >= 6)
++    {
++      std::string ref = vresp->extract_String();
++    }
+     channel.m_radio       = radio;
+ 
+     delete[] strChannelName;
+diff --git a/addons/pvr.vdr.vnsi/src/VNSIData.cpp b/addons/pvr.vdr.vnsi/src/VNSIData.cpp
+index cc14adf..34ed599 100644
+--- a/addons/pvr.vdr.vnsi/src/VNSIData.cpp
++++ b/addons/pvr.vdr.vnsi/src/VNSIData.cpp
+@@ -235,6 +235,19 @@ bool cVNSIData::GetChannelsList(ADDON_HANDLE handle, bool radio)
+     tag.iUniqueId         = vresp->extract_U32();
+     tag.iEncryptionSystem = vresp->extract_U32();
+     char *strCaids        = vresp->extract_String();
++    if (m_protocol >= 6)
++    {
++      std::string path = g_szIconPath;
++      std::string ref = vresp->extract_String();
++      if (!path.empty())
++      {
++        if (path[path.length()-1] != '/')
++          path += '/';
++        path += ref;
++        path += ".png";
++        strncpy(tag.strIconPath, path.c_str(), sizeof(tag.strIconPath) - 1);
++      }
++    }
+     tag.bIsRadio          = radio;
+ 
+     PVR->TransferChannelEntry(handle, &tag);
+diff --git a/addons/pvr.vdr.vnsi/src/VNSISession.cpp b/addons/pvr.vdr.vnsi/src/VNSISession.cpp
+index fe2766f..01ff652 100644
+--- a/addons/pvr.vdr.vnsi/src/VNSISession.cpp
++++ b/addons/pvr.vdr.vnsi/src/VNSISession.cpp
+@@ -44,8 +44,8 @@ using namespace ADDON;
+ using namespace PLATFORM;
+ 
+ cVNSISession::cVNSISession()
+-  : m_socket(NULL)
+-  , m_protocol(0)
++  : m_protocol(0)
++  , m_socket(NULL)
+   , m_connectionLost(false)
+ {
+ }
+@@ -131,7 +131,7 @@ bool cVNSISession::Login()
+     m_version   = ServerVersion;
+     m_protocol  = (int)protocol;
+ 
+-    if (m_protocol < VNSI_PROTOCOLVERSION)
++    if (m_protocol < VNSI_MIN_PROTOCOLVERSION)
+       throw "Protocol versions do not match";
+ 
+     if (m_name.empty())
+diff --git a/addons/pvr.vdr.vnsi/src/VNSISession.h b/addons/pvr.vdr.vnsi/src/VNSISession.h
+index c09e276..b8bdabc 100644
+--- a/addons/pvr.vdr.vnsi/src/VNSISession.h
++++ b/addons/pvr.vdr.vnsi/src/VNSISession.h
+@@ -70,6 +70,9 @@ class cVNSISession
+   int              m_port;
+   std::string      m_name;
+   PLATFORM::CMutex m_mutex;
++  int              m_protocol;
++  std::string      m_server;
++  std::string      m_version;
+ 
+ private:
+ 
+@@ -77,8 +80,5 @@ class cVNSISession
+ 
+   PLATFORM::CTcpConnection *m_socket;
+   PLATFORM::CMutex          m_readMutex;
+-  int                       m_protocol;
+-  std::string               m_server;
+-  std::string               m_version;
+   bool                      m_connectionLost;
+ };
+diff --git a/addons/pvr.vdr.vnsi/src/client.cpp b/addons/pvr.vdr.vnsi/src/client.cpp
+index 5898615..9cd7f8f 100644
+--- a/addons/pvr.vdr.vnsi/src/client.cpp
++++ b/addons/pvr.vdr.vnsi/src/client.cpp
+@@ -49,6 +49,7 @@ int           g_iConnectTimeout         = DEFAULT_TIMEOUT;      ///< The Socket
+ int           g_iPriority               = DEFAULT_PRIORITY;     ///< The Priority this client have in response to other clients
+ bool          g_bAutoChannelGroups      = DEFAULT_AUTOGROUPS;
+ int           g_iTimeshift              = 1;
++std::string   g_szIconPath              = "";
+ 
+ CHelper_libXBMC_addon *XBMC   = NULL;
+ CHelper_libXBMC_codec *CODEC  = NULL;
+@@ -178,6 +179,20 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props)
+     g_bAutoChannelGroups = DEFAULT_AUTOGROUPS;
+   }
+ 
++  /* Read setting "iconpath" from settings.xml */
++  buffer = (char*) malloc(512);
++  buffer[0] = 0; /* Set the end of string */
++
++  if (XBMC->GetSetting("iconpath", buffer))
++    g_szIconPath = buffer;
++  else
++  {
++    /* If setting is unknown fallback to defaults */
++    XBMC->Log(LOG_ERROR, "Couldn't get 'iconpath' setting");
++    g_szHostname = "";
++  }
++  free(buffer);
++
+   VNSIData = new cVNSIData;
+   if (!VNSIData->Open(g_szHostname, g_iPort))
+   {
+diff --git a/addons/pvr.vdr.vnsi/src/client.h b/addons/pvr.vdr.vnsi/src/client.h
+index 454be38..02093fa 100644
+--- a/addons/pvr.vdr.vnsi/src/client.h
++++ b/addons/pvr.vdr.vnsi/src/client.h
+@@ -41,6 +41,7 @@ extern int          g_iPriority;          ///< The Priority this client have in
+ extern bool         g_bCharsetConv;       ///< Convert VDR's incoming strings to UTF8 character set
+ extern bool         g_bHandleMessages;    ///< Send VDR's OSD status messages to XBMC OSD
+ extern int          g_iTimeshift;
++extern std::string  g_szIconPath;         ///< path to channel icons
+ 
+ extern ADDON::CHelper_libXBMC_addon *XBMC;
+ extern CHelper_libXBMC_codec *CODEC;
+diff --git a/addons/pvr.vdr.vnsi/src/vnsicommand.h b/addons/pvr.vdr.vnsi/src/vnsicommand.h
+index f570fd3..c227188 100644
+--- a/addons/pvr.vdr.vnsi/src/vnsicommand.h
++++ b/addons/pvr.vdr.vnsi/src/vnsicommand.h
+@@ -23,7 +23,10 @@
+ #define VNSI_COMMAND_H
+ 
+ /** Current VNSI Protocol Version number */
+-#define VNSI_PROTOCOLVERSION 5
++#define VNSI_PROTOCOLVERSION 6
++
++/** Minimum VNSI Protocol Version number */
++#define VNSI_MIN_PROTOCOLVERSION 5
+ 
+ /** Packet types */
+ #define VNSI_CHANNEL_REQUEST_RESPONSE 1
+-- 
+1.9.3
+

packages/mediacenter/xbmc-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13-84725b0"
+PKG_VERSION="13-450924a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="13-84725b0"
+PKG_VERSION="13-450924a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -191,7 +191,7 @@ else
 fi
 
 if [ "$AVAHI_DAEMON" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi nss-mdns"
   XBMC_AVAHI="--enable-avahi"
 else
   XBMC_AVAHI="--disable-avahi"
@@ -301,6 +301,11 @@ else
   XBMC_CRYSTALHD="--disable-crystalhd"
 fi
 
+if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
+# TODO: hack to for including FM patch on x86, rework this in OpenELEC-5.0
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET ffmpeg"
+fi
+
 export CXX_FOR_BUILD="$HOST_CXX"
 export CC_FOR_BUILD="$HOST_CC"
 export CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS"
@@ -511,4 +516,5 @@ post_install() {
   enable_service xbmc-waitonnetwork.service
   enable_service xbmc.service
   enable_service xbmc-lirc-suspend.service
+  enable_service display-manager.service
 }

packages/mediacenter/xbmc/patches/xbmc-051-add_ouya_controller_keymap.patch

@@ -0,0 +1,338 @@
+diff -Naur xbmc-master-14-5ec51aa.orig/system/keymaps/joystick.Ouya.Controller.xml xbmc-master-14-5ec51aa/system/keymaps/joystick.Ouya.Controller.xml
+--- xbmc-master-14-5ec51aa.orig/system/keymaps/joystick.Ouya.Controller.xml	1969-12-31 16:00:00.000000000 -0800
++++ xbmc-master-14-5ec51aa/system/keymaps/joystick.Ouya.Controller.xml	2014-06-06 16:31:54.812044875 -0700
+@@ -0,0 +1,334 @@
++<!-- Joystick Name: OUYA Game Controller       -->
++<!-- created by: N3MIS15 on the xbmc forum     -->
++<!-- http://forum.xbmc.org/showthread.php?tid=173516 -->
++
++<!-- Button Mappings in OpenELEC:              -->
++<!--                                           -->
++<!-- ID              Button                    -->
++<!--                                           -->
++<!-- 1               O                         -->
++<!-- 2               U                         -->
++<!-- 3               Y                         -->
++<!-- 4               A                         -->
++<!-- 5               Left Sholder              -->
++<!-- 6               Right Sholder             -->
++<!-- 7               Left Stick Button         -->
++<!-- 8               Right Stick Button        -->
++<!-- 9               D-Pad Up                  -->
++<!-- 10              D-Pad Down                -->
++<!-- 11              D-Pad Left                -->
++<!-- 12              D-Pad Right               -->
++
++<!-- Axis Mappings:                            -->
++<!--                                           -->
++<!-- ID              Button                    -->
++<!--                                           -->
++<!-- 1               Left Stick L/R            -->
++<!-- 2               Left Stick U/D            -->
++<!-- 3 limit +1      Left Trigger Pressed      -->
++<!-- 3 limit -1      Left Trigger Depressed    -->
++<!-- 4               Right Stick L/R           -->
++<!-- 5               Right Stick U/D           -->
++<!-- 6 limit +1      Right Trigger Pressed     -->
++<!-- 6 limit -1      Right Trigger Depressed   -->
++
++<keymap>
++  
++  <global>
++    <joystick name="OUYA Game Controller">
++      <button id="1">Select</button>
++      <button id="2">ContextMenu</button>
++      <button id="3">FullScreen</button>
++      <button id="4">Back</button>
++      <button id="5">Queue</button>
++      <button id="6">Playlist</button>
++      <button id="7">PreviousMenu</button>
++      <button id="8">XBMC.ActivateWindow(Home)</button>
++      <button id="9">Up</button>
++      <button id="10">Down</button>
++      <button id="11">Left</button>
++      <button id="12">Right</button>
++      <axis id="4" limit="-1">AnalogSeekBack</axis>
++      <axis id="4" limit="+1">AnalogSeekForward</axis>
++      <axis id="2" limit="-1">ScrollUp</axis>
++      <axis id="2" limit="+1">ScrollDown</axis>
++    </joystick>
++  </global>
++
++  <Home>
++  </Home>
++
++  <MyFiles>
++  </MyFiles>
++
++  <MyMusicPlaylist>
++    <joystick name="OUYA Game Controller">
++      <button id="5">Delete</button>
++    </joystick>
++  </MyMusicPlaylist>
++
++  <MyMusicFiles>
++  </MyMusicFiles>
++
++  <MyMusicLibrary>
++  </MyMusicLibrary>
++
++  <FullscreenVideo>
++    <joystick name="OUYA Game Controller">
++      <button id="1">Pause</button>
++      <button id="2">OSD</button>
++      <button id="4">Stop</button>
++      <button id="5">AspectRatio</button>
++      <button id="6">ShowSubtitles</button>
++      <button id="7">SmallStepBack</button>
++      <button id="8">Info</button>
++      <button id="9">BigStepForward</button>
++      <button id="10">BigStepBack</button>
++      <button id="11">StepBack</button>
++      <button id="12">StepForward</button>
++    </joystick>
++  </FullscreenVideo>
++
++  <FullscreenLiveTV>
++    <joystick name="OUYA Game Controller">
++      <button id="9">ChannelUp</button>
++      <button id="10">ChannelDown</button>
++      <button id="11">PreviousChannelGroup</button>
++      <button id="12">NextChannelGroup</button>
++    </joystick>
++  </FullscreenLiveTV>
++
++  <FullscreenInfo>
++    <joystick name="OUYA Game Controller">
++      <button id="2">OSD</button>
++      <button id="4">Close</button>
++      <button id="8">Close</button>
++      <axis id="3" limit="+1">AnalogRewind</axis>
++      <axis id="3" limit="-1">AnalogFastForward</axis>
++    </joystick>
++  </FullscreenInfo>
++
++  <PlayerControls>
++    <joystick name="OUYA Game Controller">
++      <button id="2">Close</button>
++      <button id="7">Close</button>
++      <button id="8">Close</button>
++    </joystick>
++  </PlayerControls>
++
++  <Visualisation>
++    <joystick name="OUYA Game Controller">
++      <button id="1">Pause</button>
++      <button id="4">Stop</button>
++      <button id="2">XBMC.ActivateWindow(MusicOSD)</button>
++      <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
++      <button id="6">Info</button>
++      <button id="8">XBMC.ActivateWindow(MusicOSD)</button>
++      <button id="9">SkipNext</button>
++      <button id="10">SkipPrevious</button>
++      <button id="11">PreviousPreset</button>
++      <button id="12">NextPreset</button>
++      <axis id="3" limit="+1">AnalogRewind</axis>
++      <axis id="6" limit="+1">AnalogFastForward</axis>
++    </joystick>
++  </Visualisation>
++
++  <MusicOSD>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++      <button id="6">Info</button>
++    </joystick>
++  </MusicOSD>
++
++  <VisualisationSettings>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </VisualisationSettings>
++
++  <VisualisationPresetList>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </VisualisationPresetList>
++
++  <SlideShow>
++    <joystick name="OUYA Game Controller">
++      <button id="1">Pause</button>
++      <button id="4">Stop</button>
++      <button id="3">ZoomNormal</button>
++      <button id="5">Rotate</button>
++      <button id="6">CodecInfo</button>
++      <button id="11">PreviousPicture</button>
++      <button id="12">NextPicture</button>
++      <axis id="1">AnalogMove</axis>
++      <axis id="2">AnalogMove</axis>
++      <axis id="3" limit="+1">ZoomOut</axis>
++      <axis id="6" limit="+1">ZoomIn</axis>
++    </joystick>
++  </SlideShow>
++
++  <ScreenCalibration>
++    <joystick name="OUYA Game Controller">
++      <button id="2">ResetCalibration</button>
++      <button id="5">NextResolution</button>
++      <button id="6">NextCalibration</button>
++    </joystick>
++  </ScreenCalibration>
++
++  <GUICalibration>
++    <joystick name="OUYA Game Controller">
++      <button id="2">ResetCalibration</button>
++      <button id="5">NextResolution</button>
++      <button id="6">NextCalibration</button>
++    </joystick>
++  </GUICalibration>
++
++  <VideoOSD>
++    <joystick name="OUYA Game Controller">
++      <button id="2">Close</button>
++    </joystick>
++  </VideoOSD>
++
++  <VideoMenu>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Stop</button>
++      <button id="2">OSD</button>
++      <button id="5">AspectRatio</button>
++      <button id="8">Info</button>
++    </joystick>
++  </VideoMenu>
++
++  <OSDVideoSettings>
++    <joystick name="OUYA Game Controller">
++      <button id="5">AspectRatio</button>
++      <button id="2">Close</button>
++    </joystick>
++  </OSDVideoSettings>
++
++  <OSDAudioSettings>
++    <joystick name="OUYA Game Controller">
++      <button id="5">AspectRatio</button>
++      <button id="2">Close</button>
++    </joystick>
++  </OSDAudioSettings>
++
++  <VideoBookmarks>
++    <joystick name="OUYA Game Controller">
++      <button id="5">Delete</button>
++    </joystick>
++  </VideoBookmarks>
++
++  <MyVideoLibrary>
++  </MyVideoLibrary>
++
++  <MyVideoFiles>
++  </MyVideoFiles>
++
++  <MyVideoPlaylist>
++    <joystick name="OUYA Game Controller">
++      <button id="5">Delete</button>
++    </joystick>
++  </MyVideoPlaylist>
++
++  <VirtualKeyboard>
++    <joystick name="OUYA Game Controller">
++      <button id="4">BackSpace</button>
++      <button id="3">Symbols</button>
++      <button id="5">Shift</button>
++      <button id="7">Enter</button>
++      <axis id="3" limit="+1">CursorLeft</axis>
++      <axis id="6" limit="+1">CursorRight</axis>
++    </joystick>
++  </VirtualKeyboard>
++
++  <ContextMenu>
++    <joystick name="OUYA Game Controller">
++      <button id="2">Close</button>
++      <button id="4">Close</button>
++    </joystick>
++  </ContextMenu>
++
++  <Scripts>
++    <joystick name="OUYA Game Controller">
++      <button id="2">Info</button>
++    </joystick>
++  </Scripts>
++
++  <Settings>
++    <joystick name="OUYA Game Controller">
++      <button id="4">PreviousMenu</button>
++    </joystick>
++  </Settings>
++
++  <AddonInformation>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </AddonInformation>
++
++  <AddonSettings>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </AddonSettings>
++
++  <TextViewer>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </TextViewer>
++
++  <shutdownmenu>
++    <joystick name="OUYA Game Controller">
++      <button id="4">PreviousMenu</button>
++      <button id="7">PreviousMenu</button>
++    </joystick>
++  </shutdownmenu>
++
++  <submenu>
++    <joystick name="OUYA Game Controller">
++      <button id="4">PreviousMenu</button>
++    </joystick>
++  </submenu>
++
++  <MusicInformation>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </MusicInformation>
++
++  <MovieInformation>
++    <joystick name="OUYA Game Controller">
++      <button id="4">Close</button>
++    </joystick>
++  </MovieInformation>
++
++  <NumericInput>
++    <joystick name="OUYA Game Controller">
++      <button id="4">BackSpace</button>
++      <button id="7">Enter</button>
++    </joystick>
++  </NumericInput>
++
++  <GamepadInput>
++    <joystick name="OUYA Game Controller">
++      <button id="7">Stop</button>
++    </joystick>
++  </GamepadInput>
++
++  <LockSettings>
++    <joystick name="OUYA Game Controller">
++      <button id="4">PreviousMenu</button>
++      <button id="7">Close</button>
++    </joystick>
++  </LockSettings>
++
++  <ProfileSettings>
++    <joystick name="OUYA Game Controller">
++      <button id="4">PreviousMenu</button>
++      <button id="7">Close</button>
++    </joystick>
++  </ProfileSettings>
++
++</keymap>

packages/mediacenter/xbmc/patches/xbmc-052-ps4_controller_support.patch

@@ -0,0 +1,328 @@
+diff -Naur xbmc-master-14-5ec51aa.orig/system/keymaps/joystick.PS4.Controller.xml xbmc-master-14-5ec51aa/system/keymaps/joystick.PS4.Controller.xml
+--- xbmc-master-14-5ec51aa.orig/system/keymaps/joystick.PS4.Controller.xml	1969-12-31 16:00:00.000000000 -0800
++++ xbmc-master-14-5ec51aa/system/keymaps/joystick.PS4.Controller.xml	2014-06-06 16:53:33.786191904 -0700
+@@ -0,0 +1,324 @@
++<!-- Joystick Name: Wireless Controller (PS4)  -->
++
++<!-- Button Mappings:                          -->
++<!--                                           -->
++<!-- ID              Button                    -->
++<!--                                           -->
++<!-- 1               Square                    -->
++<!-- 2               Cross                     -->
++<!-- 3               Circle                    -->
++<!-- 4               Triangle                  -->
++<!-- 5               L1                        -->
++<!-- 6               R1                        -->
++<!-- 7               L2                        -->
++<!-- 8               R2                        -->
++<!-- 9               Share     (not used)      -->
++<!-- 10              Options   (not used)      -->
++<!-- 11              L3                        -->
++<!-- 12              R3                        -->
++<!-- 13              PS Button (not used)      -->
++
++<!-- Hat Mappings:                             -->
++<!--                                           -->
++<!-- ID              Button                    -->
++<!--                                           -->
++<!-- 1 up            D-Pad Up                  -->
++<!-- 1 down          D-Pad Down                -->
++<!-- 1 left          D-Pad Left                -->
++<!-- 1 right         D-Pad Right               -->
++
++<!-- Axis Mappings:                            -->
++<!--                                           -->
++<!-- ID              Button                    -->
++<!--                                           -->
++<!-- 1               Left Stick L/R            -->
++<!-- 2               Left Stick U/D            -->
++<!-- 3               Right Stick L/R           -->
++<!-- 4               Right Stick U/D           -->
++
++<keymap>
++  
++  <global>
++    <joystick name="Wireless Controller">
++      <button id="2">Select</button>
++      <button id="1">ContextMenu</button>
++      <button id="4">FullScreen</button>
++      <button id="3">Back</button>
++      <button id="5">Queue</button>
++      <button id="6">Playlist</button>
++      <button id="11">PreviousMenu</button>
++      <button id="12">XBMC.ActivateWindow(Home)</button>
++      <hat    id="1" position="left">Left</hat>
++      <hat    id="1" position="right">Right</hat>
++      <hat    id="1" position="up">Up</hat>
++      <hat    id="1" position="down">Down</hat>
++      <axis limit="+1" id="3">AnalogSeekForward</axis>
++      <axis limit="-1" id="3">AnalogSeekBack</axis>
++      <axis limit="-1" id="2">ScrollUp</axis>
++      <axis limit="+1" id="2">ScrollDown</axis>
++    </joystick>
++  </global>
++
++  <Home>
++  </Home>
++
++  <MyFiles>
++  </MyFiles>
++
++  <MyMusicPlaylist>
++    <joystick name="Wireless Controller">
++      <button id="5">Delete</button>
++    </joystick>
++  </MyMusicPlaylist>
++
++  <MyMusicFiles>
++  </MyMusicFiles>
++
++  <MyMusicLibrary>
++  </MyMusicLibrary>
++
++  <FullscreenVideo>
++    <joystick name="Wireless Controller">
++      <button id="2">Pause</button>
++      <button id="1">OSD</button>
++      <button id="3">Stop</button>
++      <button id="5">AspectRatio</button>
++      <button id="6">ShowSubtitles</button>
++      <button id="11">SmallStepBack</button>
++      <button id="12">Info</button>
++      <hat    id="1" position="left">StepBack</hat>
++      <hat    id="1" position="right">StepForward</hat>
++      <hat    id="1" position="up">BigStepForward</hat>
++      <hat    id="1" position="down">BigStepBack</hat>
++    </joystick>
++  </FullscreenVideo>
++
++  <FullscreenLiveTV>
++    <joystick name="Wireless Controller">
++      <hat    id="1" position="up">ChannelUp</hat>
++      <hat    id="1" position="down">ChannelDown</hat>
++      <hat    id="1" position="left">PreviousChannelGroup</hat>
++      <hat    id="1" position="right">NextChannelGroup</hat>
++    </joystick>
++  </FullscreenLiveTV>
++
++  <FullscreenInfo>
++    <joystick name="Wireless Controller">
++      <button id="1">OSD</button>
++      <button id="3">Close</button>
++    </joystick>
++  </FullscreenInfo>
++
++  <PlayerControls>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </PlayerControls>
++
++  <Visualisation>
++    <joystick name="Wireless Controller">
++      <button id="2">Pause</button>
++      <button id="3">Stop</button>
++      <button id="1">XBMC.ActivateWindow(MusicOSD)</button>
++      <button id="12">Info</button>
++      <button id="6">SkipNext</button>
++      <button id="5">SkipPrevious</button>
++      <button id="7">PreviousPreset</button>
++      <button id="8">NextPreset</button>
++    </joystick>
++  </Visualisation>
++
++  <MusicOSD>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++      <button id="12">Info</button>
++    </joystick>
++  </MusicOSD>
++
++  <VisualisationSettings>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </VisualisationSettings>
++
++  <VisualisationPresetList>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </VisualisationPresetList>
++
++  <SlideShow>
++    <joystick name="Wireless Controller">
++      <button id="2">Pause</button>
++      <button id="3">Stop</button>
++      <button id="4">ZoomNormal</button>
++      <button id="5">Rotate</button>
++      <button id="6">CodecInfo</button>
++      <hat    id="1" position="left">PreviousPicture</hat>
++      <hat    id="1" position="right">NextPicture</hat>
++      <axis id="1">AnalogMove</axis>
++      <axis id="2">AnalogMove</axis>
++      <button id="7">ZoomOut</button>
++      <button id="8">ZoomIn</button>
++    </joystick>
++  </SlideShow>
++
++  <ScreenCalibration>
++    <joystick name="Wireless Controller">
++      <button id="2">ResetCalibration</button>
++      <button id="5">NextResolution</button>
++      <button id="6">NextCalibration</button>
++    </joystick>
++  </ScreenCalibration>
++
++  <GUICalibration>
++    <joystick name="Wireless Controller">
++      <button id="2">ResetCalibration</button>
++      <button id="5">NextResolution</button>
++      <button id="6">NextCalibration</button>
++    </joystick>
++  </GUICalibration>
++
++  <VideoOSD>
++    <joystick name="Wireless Controller">
++      <button id="2">Close</button>
++    </joystick>
++  </VideoOSD>
++
++  <VideoMenu>
++    <joystick name="Wireless Controller">
++      <button id="3">Stop</button>
++      <button id="2">OSD</button>
++      <button id="5">AspectRatio</button>
++      <button id="12">Info</button>
++    </joystick>
++  </VideoMenu>
++
++  <OSDVideoSettings>
++    <joystick name="Wireless Controller">
++      <button id="5">AspectRatio</button>
++      <button id="2">Close</button>
++    </joystick>
++  </OSDVideoSettings>
++
++  <OSDAudioSettings>
++    <joystick name="Wireless Controller">
++      <button id="5">AspectRatio</button>
++      <button id="2">Close</button>
++    </joystick>
++  </OSDAudioSettings>
++
++  <VideoBookmarks>
++    <joystick name="Wireless Controller">
++      <button id="5">Delete</button>
++    </joystick>
++  </VideoBookmarks>
++
++  <MyVideoLibrary>
++  </MyVideoLibrary>
++
++  <MyVideoFiles>
++  </MyVideoFiles>
++
++  <MyVideoPlaylist>
++    <joystick name="Wireless Controller">
++      <button id="5">Delete</button>
++    </joystick>
++  </MyVideoPlaylist>
++
++  <VirtualKeyboard>
++    <joystick name="Wireless Controller">
++      <button id="3">BackSpace</button>
++      <button id="4">Symbols</button>
++      <button id="5">Shift</button>
++      <button id="11">Enter</button>
++      <button id="7">CursorLeft</button>
++      <button id="8">CursorRight</button>
++    </joystick>
++  </VirtualKeyboard>
++
++  <ContextMenu>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </ContextMenu>
++
++  <Scripts>
++  </Scripts>
++
++  <Settings>
++    <joystick name="Wireless Controller">
++      <button id="3">PreviousMenu</button>
++    </joystick>
++  </Settings>
++
++  <AddonInformation>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </AddonInformation>
++
++  <AddonSettings>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </AddonSettings>
++
++  <TextViewer>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </TextViewer>
++
++  <shutdownmenu>
++    <joystick name="Wireless Controller">
++      <button id="3">PreviousMenu</button>
++    </joystick>
++  </shutdownmenu>
++
++  <submenu>
++    <joystick name="Wireless Controller">
++      <button id="3">PreviousMenu</button>
++    </joystick>
++  </submenu>
++
++  <MusicInformation>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </MusicInformation>
++
++  <MovieInformation>
++    <joystick name="Wireless Controller">
++      <button id="3">Close</button>
++    </joystick>
++  </MovieInformation>
++
++  <NumericInput>
++    <joystick name="Wireless Controller">
++      <button id="3">BackSpace</button>
++      <button id="11">Enter</button>
++    </joystick>
++  </NumericInput>
++
++  <GamepadInput>
++    <joystick name="Wireless Controller">
++      <button id="11">Stop</button>
++    </joystick>
++  </GamepadInput>
++
++  <LockSettings>
++    <joystick name="Wireless Controller">
++      <button id="3">PreviousMenu</button>
++      <button id="11">Close</button>
++    </joystick>
++  </LockSettings>
++
++  <ProfileSettings>
++    <joystick name="Wireless Controller">
++      <button id="3">PreviousMenu</button>
++      <button id="11">Close</button>
++    </joystick>
++  </ProfileSettings>
++
++</keymap>