Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0

config/path

@@ -20,6 +20,10 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
+if [ "$OPENELEC_VERSION" = "devel" ] ; then
+  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION
+fi
+
 if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
 fi

distributions/OpenELEC/options

@@ -2,7 +2,7 @@
   DISTRONAME="OpenELEC"
 
 # short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
+  DESCRIPTION="OpenELEC is a fast and user friendly Kodi Entertainment Center distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

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

@@ -1,3 +1,9 @@
+6.0.1
+- update to vdr-plugin-dvbapi-0489e01
+- update to vdr-plugin-vnsiserver-a7b0670
+- update to vdr-satip-2.2.2
+- update to vdr-iptv-2.2.1
+
 6.0.0
 - rebuild for OpenELEC-6.0
 - remove plugin 'control'

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

@@ -19,7 +19,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="6.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
@@ -33,7 +33,7 @@ PKG_AUTORECONF="no"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_ADDON_PROVIDES=""
-PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0"
+PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
 PKG_ADDON_NAME="VDR PVR Backend"
 PKG_ADDON_REPOVERSION="6.0"
 

packages/audio/dcadec/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="dcadec"
-PKG_VERSION="7b3b44c"
+PKG_VERSION="37d8e68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3081001"
+PKG_VERSION="autoconf-3081002"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
@@ -63,6 +63,10 @@ PKG_AUTORECONF="yes"
 # mmap_size pragma.
   CFLAGS="$CFLAGS -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456"
 
+pre_make_target() {
+  # dont build parallel
+  MAKEFLAGS=-j1
+}
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \

packages/debug/gdb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.9"
+PKG_VERSION="7.9.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/arm-mem/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="arm-mem"
-PKG_VERSION="2e6f275"
+PKG_VERSION="4418bb4"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
@@ -33,7 +33,17 @@ PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from s
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_MAKE_OPTS_TARGET="libarmmem.so"
+if [  "$TARGET_CPU" = "arm1176jzf-s" ]; then
+  ARMMEM_SO=libarmmem.so
+elif [  "$TARGET_CPU" = "cortex-a7" ]; then
+  ARMMEM_SO=libarmmem-a7.so
+fi
+
+PKG_MAKE_OPTS_TARGET="$ARMMEM_SO"
+
+pre_make_target() {
+  export CROSS_COMPILE=$TARGET_PREFIX
+}
 
 make_init() {
   : # reuse make_target()
@@ -41,17 +51,17 @@ make_init() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P $ARMMEM_SO $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
 }
 
 makeinstall_init() {
   mkdir -p $INSTALL/lib
-    cp -P libarmmem.so $INSTALL/lib
+    cp -P $ARMMEM_SO $INSTALL/lib
 
   mkdir -p $INSTALL/etc
-    echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/lib/$ARMMEM_SO" >> $INSTALL/etc/ld.so.preload
 }
 

packages/devel/glib/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.42.2"
+PKG_VERSION="2.44.1"
 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.42/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.44/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib libffi pcre Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="b7bbd3d"
+PKG_VERSION="70b0598"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/glfw/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      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="glfw"
+PKG_VERSION="2.7.9"
+PKG_REV="1"
+PKG_ARCH="x86_64"
+PKG_LICENSE="BSD"
+PKG_SITE="http://glfw.org"
+PKG_URL="$SOURCEFORGE_SRC/glfw/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain mesa glu"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="glfw:"
+PKG_LONGDESC="glfw:"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+make_target() {
+  make x11 PREFIX=$SYSROOT_PREFIX/usr
+}
+
+makeinstall_target() {
+  make x11-install PREFIX=$SYSROOT_PREFIX/usr
+}

packages/graphics/mesa/package.mk

@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="mesa"
-PKG_VERSION="10.5.5"
+PKG_VERSION="10.6.0-rc1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="ftp://freedesktop.org/pub/mesa/10.6.0/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
@@ -66,7 +67,6 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
                            --enable-opengl \
                            --disable-gles1 \
                            --disable-gles2 \
-                           --disable-openvg \
                            --enable-dri \
                            --disable-dri3 \
                            --enable-glx \

packages/graphics/soil/package.mk

@@ -0,0 +1,46 @@
+################################################################################
+#      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="soil"
+PKG_VERSION="1.07"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="PD"
+PKG_SITE="http://www.lonesock.net/soil.html"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="mesa"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="libsoil: Simple OpenGL Image Library"
+PKG_LONGDESC="libsoil: Simple OpenGL Image Library"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  mkdir projects/makefile/obj
+  make CXX="$CXX" CC="$CC" LD="$CC" AR="$AR" CFLAGS="-fPIC -O2" CXXFLAGS="-fPIC -O2" -C projects/makefile
+}
+
+makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp -PR lib/libSOIL.a $SYSROOT_PREFIX/usr/lib
+
+  mkdir -p $SYSROOT_PREFIX/usr/include/SOIL
+    cp -P src/SOIL.h $SYSROOT_PREFIX/usr/include/SOIL
+}

packages/graphics/vsxu/package.mk

@@ -0,0 +1,59 @@
+################################################################################
+#      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="vsxu"
+PKG_VERSION="0.5.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.vsxu.com"
+# repackaged from https://github.com/vovoid/vsxu/archive/$PKG_VERSION.tar.gz
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain glew glfw"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vsxu:"
+PKG_LONGDESC="vsxu:"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \
+        -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        -DBUILD_SHARED_LIBS=0 \
+	-DVSXU_STATIC=1 \
+	-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
+	-DCMAKE_CXX_FLAGS="-I$SYSROOT_PREFIX/usr/include/freetype2" \
+        ..
+}
+
+post_makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/lib/vsxu
+  cp -PR $INSTALL/usr/lib/* $SYSROOT_PREFIX/usr/lib
+
+  mkdir -p $SYSROOT_PREFIX/usr/include/
+  cp -RP $INSTALL/usr/include/* $SYSROOT_PREFIX/usr/include
+
+  mkdir -p $SYSROOT_PREFIX/usr/share/
+    cp -RP $INSTALL/usr/share/vsxu $SYSROOT_PREFIX/usr/share
+}

packages/graphics/vsxu/patches/vsxu-01-fix-order.patch

@@ -0,0 +1,75 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e61faf..435cf29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,10 +389,11 @@ add_definitions(-DVSXU_INSTALL_LIB_DIR="${VSXU_INSTALL_LIB_DIR}")
+ ################################################################################
+ # VSXU LIBRARIES ###############################################################
+ ################################################################################
+-add_subdirectory(engine)
+ add_subdirectory(engine_audiovisual)
+ add_subdirectory(engine_graphics)
++# order matters - need to add plugins before engine to create static glue
+ add_subdirectory(plugins)
++add_subdirectory(engine)
+ add_subdirectory(widget)
+ 
+ ################################################################################
+--- vsxu-0.5.1/CMakeLists.txt.orig	2015-05-12 14:43:04.427596836 +0200
++++ vsxu-0.5.1/CMakeLists.txt	2015-05-12 14:43:13.995596648 +0200
+@@ -56,27 +56,6 @@
+ endif()
+ 
+ ################################################################################
+-# The pkg-config file
+-################################################################################
+-IF (UNIX OR VSXU_WINDOWS_LIB_BUILD)
+-  if (VSXU_STATIC EQUAL 1 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs")
+-    file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs" VSXU_PLUGIN_PKGCONFIG_LIBS)
+-    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.static
+-                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+-                    @ONLY)
+-
+-  else()
+-    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.dynamic
+-                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+-                    @ONLY)
+-  endif()
+-
+-  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+-           DESTINATION ${VSXU_INSTALL_LIB_DIR}/pkgconfig)
+-ENDIF()
+-
+-
+-################################################################################
+ # CPACK OPTIONS ################################################################
+ ################################################################################
+ SET(CPACK_PACKAGE_NAME "vsxu")
+@@ -417,6 +396,27 @@
+     add_subdirectory(tools/vsxl)
+ endif(UNIX)
+ 
++################################################################################
++# The pkg-config file
++################################################################################
++IF (UNIX OR VSXU_WINDOWS_LIB_BUILD)
++  if (VSXU_STATIC EQUAL 1 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs")
++    file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs" VSXU_PLUGIN_PKGCONFIG_LIBS)
++    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.static
++                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
++                    @ONLY)
++
++  else()
++    CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.dynamic
++                    ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
++                    @ONLY)
++  endif()
++
++  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
++           DESTINATION ${VSXU_INSTALL_LIB_DIR}/pkgconfig)
++ENDIF()
++
++
+ 
+ 
+ 

packages/graphics/vsxu/patches/vsxu-02-fix-glfw.patch

@@ -0,0 +1,27 @@
+--- vsxu-0.5.1/cmake/modules/FindGLFW.cmake.orig	2015-05-12 14:22:23.123621176 +0200
++++ vsxu-0.5.1/cmake/modules/FindGLFW.cmake	2015-05-12 14:23:14.863620161 +0200
+@@ -19,6 +19,14 @@
+ # TODO:
+ # Allow the user to select to link to a shared library or to a static library.
+ 
++find_package(PkgConfig)
++
++pkg_check_modules(GLFW libglfw)
++set(GLFW_INCLUDE_PATH ${GLFW_INCLUDE_DIRS})
++set(GLFW_LIBRARY ${GLFW_LIBRARIES} -lXrandr)
++
++if(NOT GLFW_FOUND)
++
+ #Search for the include file...
+ FIND_PATH(GLFW_INCLUDE_PATH GL/glfw.h DOC "Path to GLFW include directory."
+   HINTS
+@@ -45,5 +53,7 @@
+   ${GLFW_ROOT_DIR}/lib-msvc100/release # added by ptr
+ )
+ 
++endif()
++
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)
+\ No newline at end of file
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)

packages/graphics/vsxu/patches/vsxu-03-fix-exr.patch

@@ -0,0 +1,11 @@
+--- vsxu-0.5.1/plugins/src/texture/CMakeLists.txt.orig	2015-05-12 14:04:42.659641970 +0200
++++ vsxu-0.5.1/plugins/src/texture/CMakeLists.txt	2015-05-12 14:05:43.315640780 +0200
+@@ -8,7 +8,7 @@
+ 
+ message("configuring vsxu module            " ${module_id})
+ 
+-include_directories(/usr/include/OpenEXR)
++#include_directories(/usr/include/OpenEXR)
+ 
+ # set defines for MOD_CM, MOD_DM, MOD_NM
+ CREATE_STATIC_GLUE(${module_id})

packages/graphics/vsxu/patches/vsxu-04-fix-freetype.patch

@@ -0,0 +1,11 @@
+--- vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt.orig	2015-05-12 14:07:20.367638877 +0200
++++ vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt	2015-05-12 14:07:24.371638799 +0200
+@@ -20,7 +20,7 @@
+ endif(WIN32)
+ 
+ if(UNIX)
+-  include_directories(/usr/include/freetype2)
++  #  include_directories(/usr/include/freetype2)
+ endif(UNIX)
+ 
+ # include common

packages/lang/llvm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.6.0"
+PKG_VERSION="3.6.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8188EU/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="RTL8188EU"
-PKG_VERSION="fcc9034"
+PKG_VERSION="3091828"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/RTL8188EU/patches/RTL8188EU-gcc-4.9.patch

@@ -1,11 +0,0 @@
-diff -Naur RTL8188EU-fcc9034/os_dep/usb_intf.c RTL8188EU-fcc9034.patch/os_dep/usb_intf.c
---- RTL8188EU-fcc9034/os_dep/usb_intf.c	2014-03-25 15:05:52.000000000 +0100
-+++ RTL8188EU-fcc9034.patch/os_dep/usb_intf.c	2014-04-28 17:42:46.059538024 +0200
-@@ -865,7 +865,6 @@
- 	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_entry\n"));
- 
- 	DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
--	DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
- 
- 	rtw_suspend_lock_init();
- 

packages/linux-drivers/RTL8188EU/patches/RTL8188EU-kernel-4.0.patch

@@ -1,25 +0,0 @@
-diff -Naur RTL8188EU-fcc9034/os_dep/rtw_android.c RTL8188EU-fcc9034.patch/os_dep/rtw_android.c
---- RTL8188EU-fcc9034/os_dep/rtw_android.c	2014-03-25 15:05:52.000000000 +0100
-+++ RTL8188EU-fcc9034.patch/os_dep/rtw_android.c	2015-04-04 20:44:25.386732963 +0200
-@@ -20,6 +20,7 @@
- 
- #include <linux/module.h>
- #include <linux/netdevice.h>
-+#include <linux/version.h>
- 
- #include <rtw_android.h>
- #include <osdep_service.h>
-@@ -80,8 +81,13 @@
- {
- 	int cmd_num;
- 	for (cmd_num = 0; cmd_num < ANDROID_WIFI_CMD_MAX; cmd_num++)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
-+		if (!strncasecmp(cmdstr , android_wifi_cmd_str[cmd_num],
-+				  strlen(android_wifi_cmd_str[cmd_num])))
-+#else
- 		if (0 == strnicmp(cmdstr , android_wifi_cmd_str[cmd_num],
- 				  strlen(android_wifi_cmd_str[cmd_num])))
-+#endif
- 			break;
- 	return cmd_num;
- }

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

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

packages/linux/package.mk

@@ -17,20 +17,6 @@
 ################################################################################
 
 PKG_NAME="linux"
-case "$LINUX" in
-  amlogic)
-    PKG_VERSION="amlogic-3.10-a9cef51"
-    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-  imx6)
-    PKG_VERSION="cuboxi-3.14-ea83bda"
-    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-  *)
-    PKG_VERSION="4.0.2"
-    PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
-    ;;
-esac
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -43,6 +29,21 @@ PKG_PRIORITY="optional"
 PKG_SECTION="linux"
 PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
+case "$LINUX" in
+  amlogic)
+    PKG_VERSION="amlogic-3.10-a9cef51"
+    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+    ;;
+  imx6)
+    PKG_VERSION="cuboxi-3.14-ea83bda"
+    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
+    ;;
+  *)
+    PKG_VERSION="4.0.4"
+    PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
+    ;;
+esac
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"

packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.modplug"
-PKG_VERSION="c7e8ca8"
+PKG_VERSION="2de539b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.nosefart"
-PKG_VERSION="c77e5a1"
+PKG_VERSION="a49ba6e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.qsf"
-PKG_VERSION="294fd39"
+PKG_VERSION="6aaf860"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.sidplay"
-PKG_VERSION="f2e7d98"
+PKG_VERSION="6568676"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.snesapu"
-PKG_VERSION="9fc775b"
+PKG_VERSION="2bd1e34"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.stsound"
-PKG_VERSION="775c858"
+PKG_VERSION="640b049"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.timidity"
-PKG_VERSION="bf9ff93"
+PKG_VERSION="7f079c1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="audiodecoder.vgmstream"
-PKG_VERSION="0c3a51a"
+PKG_VERSION="715c580"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.argustv"
-PKG_VERSION="96ee875"
+PKG_VERSION="fa84ac2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.demo"
-PKG_VERSION="b4b7de1"
+PKG_VERSION="34d60a1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvblink"
-PKG_VERSION="5d505b8"
+PKG_VERSION="7f51543"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvbviewer"
-PKG_VERSION="bd2c01f"
+PKG_VERSION="3dd826e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.filmon"
-PKG_VERSION="413fe9e"
+PKG_VERSION="8c02f43"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.hts"
-PKG_VERSION="4bf1a97"
+PKG_VERSION="d038dfc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.iptvsimple"
-PKG_VERSION="a2e6c6f"
+PKG_VERSION="27c4221"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="6f8ca82"
+PKG_VERSION="d9bfdee"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="ef9cf41"
+PKG_VERSION="c810489"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="1ecbf87"
+PKG_VERSION="ecc6598"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.njoy"
-PKG_VERSION="fcd6294"
+PKG_VERSION="2733f34"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.pctv"
-PKG_VERSION="0a0924e"
+PKG_VERSION="c240226"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.stalker"
-PKG_VERSION="118b2ef"
+PKG_VERSION="2d65b21"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vbox"
-PKG_VERSION="4449aa5"
+PKG_VERSION="375eab3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vdr.vnsi"
-PKG_VERSION="3a28e39"
+PKG_VERSION="244b893"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vuplus"
-PKG_VERSION="d6abad3"
+PKG_VERSION="d727091"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.wmc"
-PKG_VERSION="37b4b29"
+PKG_VERSION="295b216"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.asteroids"
+PKG_VERSION="09d7693"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.asteroids"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.asteroids"
+PKG_LONGDESC="screensaver.asteroids"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.biogenesis"
+PKG_VERSION="7d91c2a"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.biogenesis"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.biogenesis"
+PKG_LONGDESC="screensaver.biogenesis"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.greynetic"
+PKG_VERSION="c27a2a5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.greynetic"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.greynetic"
+PKG_LONGDESC="screensaver.greynetic"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.matrixtrails"
+PKG_VERSION="ae13b62"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.matrixtrails"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform soil"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.matrixtrails"
+PKG_LONGDESC="screensaver.matrixtrails"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.pingpong"
+PKG_VERSION="8562fec"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.pingpong"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.pingpong"
+PKG_LONGDESC="screensaver.pingpong"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.pyro"
+PKG_VERSION="3e050db"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.pyro"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.pyro"
+PKG_LONGDESC="screensaver.pyro"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      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="screensaver.stars"
+PKG_VERSION="79a6364"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/screensaver.stars"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="screensaver.stars"
+PKG_LONGDESC="screensaver.stars"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.ui.screensaver"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk

@@ -0,0 +1,59 @@
+################################################################################
+#      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="visualization.vsxu"
+PKG_VERSION="059e5e0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/notspiff/visualization.vsxu"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain kodi-platform vsxu"
+PKG_PRIORITY="optional"
+PKG_SECTION=""
+PKG_SHORTDESC="visualization.vsxu"
+PKG_LONGDESC="visualization.vsxu"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.player.musicviz"
+
+if [ "$OPENGL" = "no" ] ; then
+  exit 0
+fi
+
+# dont build and upload for repos for now
+# TODO fix
+# undefined symbol: mt_32_to_double
+# vis.vsxu also not linked against libGL ?
+
+exit 0
+
+configure_target() {
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
+        -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
+        ..
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
+}

packages/mediacenter/kodi-platform/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="kodi-platform"
-PKG_VERSION="48bdd985"
+PKG_VERSION="054a42f66"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain tinyxml kodi"
+PKG_DEPENDS_TARGET="toolchain tinyxml kodi platform"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="kodi-platform:"

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="15.0-beta2-6e5ede3"
+PKG_VERSION="15.0-beta2-c34fc22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="15.0-beta2-6e5ede3"
+PKG_VERSION="15.0-beta2-c34fc22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/patches/kodi-995.01-add-dcadec-support.patch

@@ -1,132 +0,0 @@
-From 448c71da440d4504432ac513e8493e27b1f06915 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 23 Mar 2015 22:33:04 +0000
-Subject: [PATCH] [dcadec] Add settings option to enable libdcadec
-
----
- addons/resource.language.en_gb/resources/strings.po          | 10 ++++++++++
- system/settings/rbp.xml                                      |  5 +++++
- system/settings/rbp2.xml                                     |  3 +++
- xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp |  6 +++++-
- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp          | 10 ++++++++++
- xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp                    |  6 +++++-
- 7 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
-index 1dde154..f641439 100644
---- a/addons/resource.language.en_gb/resources/strings.po
-+++ b/addons/resource.language.en_gb/resources/strings.po
-@@ -16689,3 +16689,13 @@ msgstr ""
- msgctxt "#38103"
- msgid "Extract thumbnails from video files"
- msgstr ""
-+
-+#: system/settings/rbp.xml
-+msgctxt "#38120"
-+msgid "Support 8 channel DTS HD audio"
-+msgstr ""
-+
-+#: system/settings/rbp.xml
-+msgctxt "#38121"
-+msgid "This option supports 8 channel DTS HD but may use more CPU "
-+msgstr ""
-diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
---- a/system/settings/rbp.xml
-+++ b/system/settings/rbp.xml
-@@ -27,6 +27,13 @@
-           <control type="edit" format="integer" />
-         </setting>
-       </group>
-+      <group id="3">
-+        <setting id="videoplayer.supportdtshd" type="boolean" label="38120" help="38121">
-+          <level>2</level>
-+          <default>false</default>
-+          <control type="toggle" />
-+        </setting>
-+      </group>
-     </category>
-     <category id="myvideos">
-       <group id="1">
-diff --git a/system/settings/rbp2.xml b/system/settings/rbp2.xml
-index 8cc8f19..197e255 100644
---- a/system/settings/rbp2.xml
-+++ b/system/settings/rbp2.xml
-@@ -6,6 +6,9 @@
-         <setting id="videoplayer.useomxplayer">
-           <default>false</default>
-         </setting>
-+        <setting id="videoplayer.supportdtshd">
-+          <default>true</default>
-+        </setting>
-       </group>
-     </category>
-   </section>
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
-index 991449b..135bb43 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
-@@ -33,6 +33,7 @@ extern "C" {
- #include "settings/Settings.h"
- #include "cores/AudioEngine/Utils/AEUtil.h"
- #endif
-+#include "settings/Settings.h"
- 
- CDVDAudioCodecFFmpeg::CDVDAudioCodecFFmpeg() : CDVDAudioCodec()
- {
-@@ -57,7 +58,10 @@ bool CDVDAudioCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
-   AVCodec* pCodec;
-   m_bOpenedCodec = false;
- 
--  pCodec = avcodec_find_decoder(hints.codec);
-+  if (hints.codec == AV_CODEC_ID_DTS && CSettings::Get().GetBool("videoplayer.supportdtshd"))
-+    pCodec = avcodec_find_decoder_by_name("libdcadec");
-+  else
-+    pCodec = avcodec_find_decoder(hints.codec);
-   if (!pCodec)
-   {
-     CLog::Log(LOGDEBUG,"CDVDAudioCodecFFmpeg::Open() Unable to find codec %d", hints.codec);
-diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-index f9b3232..1f8e15e 100644
---- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -439,6 +439,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein
- 
-   if (m_streaminfo)
-   {
-+    if (CSettings::Get().GetBool("videoplayer.supportdtshd"))
-+    {
-+      for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
-+      {
-+        AVStream *st = m_pFormatContext->streams[i];
-+        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == AV_CODEC_ID_DTS)
-+          st->codec->codec = avcodec_find_decoder_by_name("libdcadec");
-+      }
-+    }
-+
-     /* to speed up dvd switches, only analyse very short */
-     if(m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
-       av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
-diff --git a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
-index 1a920f7..093864d 100644
---- a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
-+++ b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
-@@ -26,6 +26,7 @@
- 
- #include "cores/AudioEngine/Utils/AEUtil.h"
- #include "cores/AudioEngine/AEFactory.h"
-+#include "settings/Settings.h"
- 
- // the size of the audio_render output port buffers
- #define AUDIO_DECODE_OUTPUT_BUFFER (32*1024)
-@@ -65,7 +66,10 @@ bool COMXAudioCodecOMX::Open(CDVDStreamInfo &hints)
-   AVCodec* pCodec;
-   m_bOpenedCodec = false;
- 
--  pCodec = avcodec_find_decoder(hints.codec);
-+  if (hints.codec == AV_CODEC_ID_DTS && CSettings::Get().GetBool("videoplayer.supportdtshd"))
-+    pCodec = avcodec_find_decoder_by_name("libdcadec");
-+  else
-+    pCodec = avcodec_find_decoder(hints.codec);
-   if (!pCodec)
-   {
-     CLog::Log(LOGDEBUG,"COMXAudioCodecOMX::Open() Unable to find codec %d", hints.codec);

packages/mediacenter/kodi/patches/kodi-999.20-PR7102.patch

@@ -0,0 +1,840 @@
+From 17db313334d564b34e00154e6d3d5cf6163c13fb Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Mon, 23 Mar 2015 17:12:31 +0000
+Subject: [PATCH 1/6] [ffmpeg] Add support for libdcadec
+
+---
+ Makefile.in                                        |   2 +-
+ configure.ac                                       |   4 +
+ tools/depends/target/Makefile                      |   4 +-
+ .../0001-avcodec-add-libdcadec-decoder.patch       | 280 +++++++++++++++++++++
+ .../0002-avcodec-Fix-libdcadec-include-dir.patch   |  40 +++
+ ...vcodec-add-profile-define-for-DTS-Express.patch |  25 ++
+ tools/depends/target/ffmpeg/Makefile               |   7 +-
+ tools/depends/target/libdcadec/Makefile            |  38 +++
+ 8 files changed, 396 insertions(+), 4 deletions(-)
+ create mode 100644 tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch
+ create mode 100644 tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch
+ create mode 100644 tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch
+ create mode 100644 tools/depends/target/libdcadec/Makefile
+
+diff --git a/Makefile.in b/Makefile.in
+index 7ed7c37..4a8aeef 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -445,7 +445,7 @@ FFMPEGOBJS = @FFMPEG_LIBDIR@/libavcodec.a \
+              @FFMPEG_LIBDIR@/libpostproc.a \
+              @FFMPEG_LIBDIR@/libswscale.a
+ DYNOBJSXBMC+= $(FFMPEGOBJS)
+-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
++LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @DCADEC_ALL_LIBS@
+ 
+ $(FFMPEGOBJS): dvdpcodecs
+ endif
+diff --git a/configure.ac b/configure.ac
+index cf18212..ad9ae6d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1088,6 +1088,7 @@ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library),
+ AC_CHECK_HEADER([jpeglib.h],,        AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([ogg/ogg.h],,        AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
++AC_CHECK_HEADER([libdcadec/dca_context.h],, AC_MSG_ERROR($missing_library))
+ 
+ PKG_CHECK_MODULES([LIBCURL], [libcurl],, AC_MSG_ERROR([libcurl not found]))
+ XB_FIND_SONAME([CURL], [curl])
+@@ -1119,6 +1120,7 @@ PKG_CHECK_MODULES([GNUTLS], [gnutls], [have_gnutls=yes];AC_DEFINE([HAVE_GNUTLS],
+ AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
+ AC_CHECK_LIB([tiff],        [main],, AC_MSG_ERROR($missing_library))
++AC_CHECK_LIB([dcadec],      [main],, AC_MSG_ERROR($missing_library))
+ if echo "$ARCH" | grep -q freebsd; then
+ AC_CHECK_LIB([pthread],     [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([pthread],     [pthread_set_name_np],
+@@ -1806,6 +1808,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; then
+   FFMPEG_LIBDIR=${pkg_cfg_prefix}$(PKG_CONFIG_SYSROOT_DIR="" ${PKG_CONFIG} --static --variable=libdir libavcodec)
+   GNUTLS_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls)
+   VORBISENC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc)
++  DCADEC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors dcadec)
+ 
+   # check if static libs are available
+   for ff_lib in ${ff_libs}; do
+@@ -2630,6 +2633,7 @@ AC_SUBST(FFMPEG_LIBDIR)
+ AC_SUBST(USE_STATIC_FFMPEG)
+ AC_SUBST(GNUTLS_ALL_LIBS)
+ AC_SUBST(VORBISENC_ALL_LIBS)
++AC_SUBST(DCADEC_ALL_LIBS)
+ AC_SUBST(USE_TOUCH_SKIN)
+ AC_SUBST(USE_LIBAV_HACKS)
+ AC_SUBST(PYTHON_VERSION)
+diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
+index 915de85..5d85ca8 100644
+--- a/tools/depends/target/Makefile
++++ b/tools/depends/target/Makefile
+@@ -15,7 +15,7 @@ DEPENDS = \
+ 	python26 libshairplay \
+ 	libplist libcec libbluray boost tinyxml dummy-libxbmc \
+ 	libamplayer libssh taglib libusb libnfs libmp3lame \
+-	pythonmodule-pil libxslt ffmpeg platform
++	pythonmodule-pil libxslt ffmpeg platform libdcadec
+ 
+ FFMPEG_DEPENDS = gnutls
+ 
+@@ -96,7 +96,7 @@ nettle: gmp
+ pythonmodule-pil: $(ZLIB) libjpeg-turbo libpng freetype2 python26
+ libsdl2: $(LINUX_SYSTEM_LIBS)
+ libxslt: libgcrypt
+-ffmpeg: $(ICONV) $(ZLIB) bzip2 libvorbis $(FFMPEG_DEPENDS)
++ffmpeg: $(ICONV) $(ZLIB) bzip2 libvorbis libdcadec $(FFMPEG_DEPENDS)
+ libcec: platform
+ 
+ .installed-$(PLATFORM): $(DEPENDS)
+diff --git a/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch b/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch
+new file mode 100644
+index 0000000..c0c2ac1
+--- /dev/null
++++ b/tools/depends/target/ffmpeg/0001-avcodec-add-libdcadec-decoder.patch
+@@ -0,0 +1,280 @@
++From 519868de7d9c99876efcaf57d6a9683c22732cde Mon Sep 17 00:00:00 2001
++From: Hendrik Leppkes <h.leppkes@gmail.com>
++Date: Thu, 19 Mar 2015 23:56:22 +0100
++Subject: [PATCH] avcodec: add libdcadec decoder
++
++Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
++---
++ configure              |   4 +
++ libavcodec/Makefile    |   1 +
++ libavcodec/allcodecs.c |   1 +
++ libavcodec/libdcadec.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++++
++ 4 files changed, 203 insertions(+)
++ create mode 100644 libavcodec/libdcadec.c
++
++diff --git a/configure b/configure
++index 1bf8f80..a449bc7 100755
++--- a/configure
+++++ b/configure
++@@ -210,6 +210,7 @@ External library support:
++   --enable-libcdio         enable audio CD grabbing with libcdio [no]
++   --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
++                            and libraw1394 [no]
+++  --enable-libdcadec       enable DCA decoding via libdcadec [no]
++   --enable-libfaac         enable AAC encoding via libfaac [no]
++   --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
++   --enable-libflite        enable flite (voice synthesis) support via libflite [no]
++@@ -1353,6 +1354,7 @@ EXTERNAL_LIBRARY_LIST="
++     libcdio
++     libcelt
++     libdc1394
+++    libdcadec
++     libfaac
++     libfdk_aac
++     libflite
++@@ -2359,6 +2361,7 @@ vc1_parser_select="mpegvideo startcode vc1_decoder"
++ # external libraries
++ libaacplus_encoder_deps="libaacplus"
++ libcelt_decoder_deps="libcelt"
+++libdcadec_decoder_deps="libdcadec"
++ libfaac_encoder_deps="libfaac"
++ libfaac_encoder_select="audio_frame_queue"
++ libfdk_aac_decoder_deps="libfdk_aac"
++@@ -4922,6 +4925,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
++                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
++                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
++ enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
+++enabled libdcadec         && require libdcadec dca_context.h dcadec_context_create -ldcadec
++ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
++ enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
++ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
++diff --git a/libavcodec/Makefile b/libavcodec/Makefile
++index 4173f88..1a0c734 100644
++--- a/libavcodec/Makefile
+++++ b/libavcodec/Makefile
++@@ -732,6 +732,7 @@ OBJS-$(CONFIG_ELBG_FILTER)             += elbg.o
++ # external codec libraries
++ OBJS-$(CONFIG_LIBAACPLUS_ENCODER)         += libaacplus.o
++ OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
+++OBJS-$(CONFIG_LIBDCADEC_DECODER)          += libdcadec.o
++ OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
++ OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
++ OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
++diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
++index 5194e74..bbf70a6 100644
++--- a/libavcodec/allcodecs.c
+++++ b/libavcodec/allcodecs.c
++@@ -512,6 +512,7 @@ void avcodec_register_all(void)
++ 
++     /* external libraries */
++     REGISTER_DECODER(LIBCELT,           libcelt);
+++    REGISTER_DECODER(LIBDCADEC,         libdcadec)
++     REGISTER_ENCODER(LIBFAAC,           libfaac);
++     REGISTER_ENCDEC (LIBFDK_AAC,        libfdk_aac);
++     REGISTER_ENCDEC (LIBGSM,            libgsm);
++diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
++new file mode 100644
++index 0000000..d060db5
++--- /dev/null
+++++ b/libavcodec/libdcadec.c
++@@ -0,0 +1,197 @@
+++/*
+++ * libdcadec decoder wrapper
+++ * Copyright (C) 2015 Hendrik Leppkes
+++ *
+++ * This file is part of FFmpeg.
+++ *
+++ * FFmpeg is free software; you can redistribute it and/or
+++ * modify it under the terms of the GNU Lesser General Public
+++ * License as published by the Free Software Foundation; either
+++ * version 2.1 of the License, or (at your option) any later version.
+++ *
+++ * FFmpeg 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
+++ * Lesser General Public License for more details.
+++ *
+++ * You should have received a copy of the GNU Lesser General Public
+++ * License along with FFmpeg; if not, write to the Free Software
+++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+++ */
+++
+++#include <dca_context.h>
+++
+++#include "libavutil/avassert.h"
+++#include "libavutil/channel_layout.h"
+++#include "libavutil/common.h"
+++#include "libavutil/opt.h"
+++#include "avcodec.h"
+++#include "dca.h"
+++#include "dca_syncwords.h"
+++#include "internal.h"
+++
+++typedef struct DCADecContext {
+++    struct dcadec_context *ctx;
+++    uint8_t *buffer;
+++    int buffer_size;
+++} DCADecContext;
+++
+++static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
+++                               int *got_frame_ptr, AVPacket *avpkt)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++    AVFrame *frame = data;
+++    int ret, i, k;
+++    int **samples, nsamples, channel_mask, sample_rate, bits_per_sample, profile;
+++    uint32_t mrk;
+++    uint8_t *input = avpkt->data;
+++    int input_size = avpkt->size;
+++
+++    /* convert bytestream syntax to RAW BE format if required */
+++    mrk = AV_RB32(input);
+++    if (mrk != DCA_SYNCWORD_CORE_BE && mrk != DCA_SYNCWORD_SUBSTREAM) {
+++        s->buffer = av_fast_realloc(s->buffer, &s->buffer_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
+++        if (!s->buffer)
+++            return AVERROR(ENOMEM);
+++
+++        if ((ret = avpriv_dca_convert_bitstream(avpkt->data, avpkt->size, s->buffer, s->buffer_size)) < 0)
+++            return ret;
+++
+++        input      = s->buffer;
+++        input_size = ret;
+++    }
+++
+++    if ((ret = dcadec_context_parse(s->ctx, input, input_size)) < 0) {
+++        av_log(avctx, AV_LOG_ERROR, "dcadec_context_parse() failed: %d (%s)\n", -ret, dcadec_strerror(ret));
+++        return AVERROR_EXTERNAL;
+++    }
+++    if ((ret = dcadec_context_filter(s->ctx, &samples, &nsamples, &channel_mask,
+++                                     &sample_rate, &bits_per_sample, &profile)) < 0) {
+++        av_log(avctx, AV_LOG_ERROR, "dcadec_context_filter() failed: %d (%s)\n", -ret, dcadec_strerror(ret));
+++        return AVERROR_EXTERNAL;
+++    }
+++
+++    avctx->channels       = av_get_channel_layout_nb_channels(channel_mask);
+++    avctx->channel_layout = channel_mask;
+++    avctx->sample_rate    = sample_rate;
+++
+++    av_assert0(bits_per_sample >= 16 && bits_per_sample <= 24);
+++    if (bits_per_sample == 16)
+++        avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
+++    else
+++        avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
+++
+++    avctx->bits_per_raw_sample = bits_per_sample;
+++
+++    switch (profile) {
+++    case DCADEC_PROFILE_DS:
+++        avctx->profile = FF_PROFILE_DTS;
+++        break;
+++    case DCADEC_PROFILE_DS_96_24:
+++        avctx->profile = FF_PROFILE_DTS_96_24;
+++        break;
+++    case DCADEC_PROFILE_DS_ES:
+++        avctx->profile = FF_PROFILE_DTS_ES;
+++        break;
+++    case DCADEC_PROFILE_HD_HRA:
+++        avctx->profile = FF_PROFILE_DTS_HD_HRA;
+++        break;
+++    case DCADEC_PROFILE_HD_MA:
+++        avctx->profile = FF_PROFILE_DTS_HD_MA;
+++        break;
+++    case DCADEC_PROFILE_EXPRESS:
+++        avctx->profile = FF_PROFILE_DTS_EXPRESS;
+++        break;
+++    case DCADEC_PROFILE_UNKNOWN:
+++    default:
+++        avctx->profile = FF_PROFILE_UNKNOWN;
+++        break;
+++    }
+++
+++    /* bitrate is only meaningful if there are no HD extensions, as they distort the bitrate */
+++    if (profile == DCADEC_PROFILE_DS || profile == DCADEC_PROFILE_DS_96_24 || profile == DCADEC_PROFILE_DS_ES) {
+++        struct dcadec_core_info *info = dcadec_context_get_core_info(s->ctx);
+++        avctx->bit_rate = info->bit_rate;
+++        dcadec_context_free_core_info(info);
+++    } else
+++        avctx->bit_rate = 0;
+++
+++    frame->nb_samples = nsamples;
+++    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+++        return ret;
+++
+++    for (i = 0; i < avctx->channels; i++) {
+++        if (frame->format == AV_SAMPLE_FMT_S16P) {
+++            int16_t *plane = (int16_t *)frame->extended_data[i];
+++            for (k = 0; k < nsamples; k++)
+++                plane[k] = samples[i][k];
+++        } else {
+++            int32_t *plane = (int32_t *)frame->extended_data[i];
+++            int shift = 32 - bits_per_sample;
+++            for (k = 0; k < nsamples; k++)
+++                plane[k] = samples[i][k] << shift;
+++        }
+++    }
+++
+++    *got_frame_ptr = 1;
+++
+++    return avpkt->size;
+++}
+++
+++static av_cold void dcadec_flush(AVCodecContext *avctx)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++    dcadec_context_clear(s->ctx);
+++}
+++
+++static av_cold int dcadec_close(AVCodecContext *avctx)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++
+++    dcadec_context_destroy(s->ctx);
+++    s->ctx = NULL;
+++
+++    av_freep(&s->buffer);
+++
+++    return 0;
+++}
+++
+++static av_cold int dcadec_init(AVCodecContext *avctx)
+++{
+++    DCADecContext *s = avctx->priv_data;
+++
+++    s->ctx = dcadec_context_create(0);
+++    if (!s->ctx)
+++        return AVERROR(ENOMEM);
+++
+++    avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
+++    avctx->bits_per_raw_sample = 24;
+++
+++    return 0;
+++}
+++
+++static const AVProfile profiles[] = {
+++    { FF_PROFILE_DTS,         "DTS"         },
+++    { FF_PROFILE_DTS_ES,      "DTS-ES"      },
+++    { FF_PROFILE_DTS_96_24,   "DTS 96/24"   },
+++    { FF_PROFILE_DTS_HD_HRA,  "DTS-HD HRA"  },
+++    { FF_PROFILE_DTS_HD_MA,   "DTS-HD MA"   },
+++    { FF_PROFILE_DTS_EXPRESS, "DTS Express" },
+++    { FF_PROFILE_UNKNOWN },
+++};
+++
+++AVCodec ff_libdcadec_decoder = {
+++    .name           = "libdcadec",
+++    .long_name      = NULL_IF_CONFIG_SMALL("dcadec DCA decoder"),
+++    .type           = AVMEDIA_TYPE_AUDIO,
+++    .id             = AV_CODEC_ID_DTS,
+++    .priv_data_size = sizeof(DCADecContext),
+++    .init           = dcadec_init,
+++    .decode         = dcadec_decode_frame,
+++    .close          = dcadec_close,
+++    .flush          = dcadec_flush,
+++    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_CHANNEL_CONF,
+++    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_S16P,
+++                                                      AV_SAMPLE_FMT_NONE },
+++    .profiles       = NULL_IF_CONFIG_SMALL(profiles),
+++};
++-- 
++1.9.1
++
+diff --git a/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch b/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch
+new file mode 100644
+index 0000000..b4db15d
+--- /dev/null
++++ b/tools/depends/target/ffmpeg/0002-avcodec-Fix-libdcadec-include-dir.patch
+@@ -0,0 +1,40 @@
++From 4f3c31df3f569c7171ee9e651ddf479690367b9b Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
++Date: Fri, 20 Mar 2015 01:58:25 +0100
++Subject: [PATCH] avcodec: Fix libdcadec include dir
++
++Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
++---
++ configure              | 2 +-
++ libavcodec/libdcadec.c | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/configure b/configure
++index a449bc7..1ef83e3 100755
++--- a/configure
+++++ b/configure
++@@ -4925,7 +4925,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
++                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
++                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
++ enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
++-enabled libdcadec         && require libdcadec dca_context.h dcadec_context_create -ldcadec
+++enabled libdcadec         && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec
++ enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
++ enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
++ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
++diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c
++index d060db5..a28b983 100644
++--- a/libavcodec/libdcadec.c
+++++ b/libavcodec/libdcadec.c
++@@ -19,7 +19,7 @@
++  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++  */
++ 
++-#include <dca_context.h>
+++#include <libdcadec/dca_context.h>
++ 
++ #include "libavutil/avassert.h"
++ #include "libavutil/channel_layout.h"
++-- 
++1.9.1
++
+diff --git a/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch b/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch
+new file mode 100644
+index 0000000..1550538
+--- /dev/null
++++ b/tools/depends/target/ffmpeg/0003-avcodec-add-profile-define-for-DTS-Express.patch
+@@ -0,0 +1,25 @@
++From 11fe56c8bbf39cd0c3edbf0cd404dea400ff7e0c Mon Sep 17 00:00:00 2001
++From: Hendrik Leppkes <h.leppkes@gmail.com>
++Date: Thu, 19 Mar 2015 23:45:39 +0100
++Subject: [PATCH] avcodec: add profile define for DTS Express
++
++Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
++---
++ libavcodec/avcodec.h | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
++index cdc8aa1..48e212f 100644
++--- a/libavcodec/avcodec.h
+++++ b/libavcodec/avcodec.h
++@@ -2851,6 +2851,7 @@ typedef struct AVCodecContext {
++ #define FF_PROFILE_DTS_96_24   40
++ #define FF_PROFILE_DTS_HD_HRA  50
++ #define FF_PROFILE_DTS_HD_MA   60
+++#define FF_PROFILE_DTS_EXPRESS 70
++ 
++ #define FF_PROFILE_MPEG2_422    0
++ #define FF_PROFILE_MPEG2_HIGH   1
++-- 
++1.9.1
++
+diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
+index 711182f..24480b2 100644
+--- a/tools/depends/target/ffmpeg/Makefile
++++ b/tools/depends/target/ffmpeg/Makefile
+@@ -1,6 +1,7 @@
+ include ../../Makefile.include
+ include FFMPEG-VERSION
+-DEPS= ../../Makefile.include FFMPEG-VERSION Makefile
++DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \
++  0001-avcodec-add-libdcadec-decoder.patch  0002-avcodec-Fix-libdcadec-include-dir.patch 0003-avcodec-add-profile-define-for-DTS-Express.patch
+ 
+ # set to "yes" to enable patching
+ # we don't apply patches until we move to a vanilla ffmpeg tarball
+@@ -55,6 +56,7 @@ endif
+ ifeq ($(Configuration), Release)
+   ffmpg_config += --disable-debug
+ endif
++ffmpg_config += --enable-libdcadec --disable-decoder=dca
+ 
+ 
+ CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
+@@ -68,6 +70,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+ 	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ 	cd $(PLATFORM); sed -i".bak" -e "s%pkg_config_default=pkg-config%export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \&\& pkg_config_default=$(NATIVEPREFIX)/bin/pkg-config%" configure
++	cd $(PLATFORM); patch -p1 < ../0001-avcodec-add-libdcadec-decoder.patch
++	cd $(PLATFORM); patch -p1 < ../0002-avcodec-Fix-libdcadec-include-dir.patch
++	cd $(PLATFORM); patch -p1 < ../0003-avcodec-add-profile-define-for-DTS-Express.patch
+ 	cd $(PLATFORM);\
+ 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ 	./configure $(ffmpg_config)
+diff --git a/tools/depends/target/libdcadec/Makefile b/tools/depends/target/libdcadec/Makefile
+new file mode 100644
+index 0000000..e68ec46
+--- /dev/null
++++ b/tools/depends/target/libdcadec/Makefile
+@@ -0,0 +1,38 @@
++include ../../Makefile.include
++DEPS= ../../Makefile.include Makefile
++
++# lib name, version
++LIBNAME=dcadec
++ARCHIVE=master.tar.gz
++BASE_URL=https://github.com/foo86/dcadec/archive
++
++# configuration settings
++
++LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME).a
++
++CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
++
++CFLAGS += -std=gnu99
++
++all: $(LIBDYLIB) .installed-$(PLATFORM)
++
++$(TARBALLS_LOCATION)/$(ARCHIVE):
++	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
++
++$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
++	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
++	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
++
++$(LIBDYLIB): $(PLATFORM)
++	$(MAKE) -C $(PLATFORM) PREFIX=$(PREFIX) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" AR="$(AR)"
++
++.installed-$(PLATFORM): $(LIBDYLIB)
++	$(MAKE) -C $(PLATFORM) PREFIX=$(PREFIX) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" AR="$(AR)" install
++	touch $@
++
++clean:
++	$(MAKE) -C $(PLATFORM) clean
++	rm -f .installed-$(PLATFORM)
++
++distclean::
++	rm -rf $(PLATFORM) .installed-$(PLATFORM)
+
+From bdf128de10eb980a68d8382df8f8621a61e020d1 Mon Sep 17 00:00:00 2001
+From: fritsch <peter.fruehberger@gmail.com>
+Date: Mon, 23 Mar 2015 22:33:04 +0000
+Subject: [PATCH 2/6] [dcadec] Add settings option to enable libdcadec
+
+---
+ addons/resource.language.en_gb/resources/strings.po  | 10 ++++++++++
+ system/settings/imx6.xml                             | 20 ++++++++++++++++++++
+ system/settings/rbp.xml                              |  5 +++++
+ system/settings/rbp2.xml                             |  5 +++++
+ tools/depends/target/ffmpeg/Makefile                 |  2 +-
+ .../DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp          | 14 ++++++++++++--
+ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp  | 15 +++++++++++++++
+ xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp            | 10 ++++++++--
+ 8 files changed, 76 insertions(+), 5 deletions(-)
+
+diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
+index 6a6f0a3..3ab966d 100644
+--- a/addons/resource.language.en_gb/resources/strings.po
++++ b/addons/resource.language.en_gb/resources/strings.po
+@@ -16541,3 +16541,13 @@ msgstr ""
+ msgctxt "#38016"
+ msgid "%d fps"
+ msgstr ""
++
++#: system/settings/rbp.xml system/settings/imx6.xml
++msgctxt "#38120"
++msgid "Support 8 channel DTS-HD audio decoding"
++msgstr ""
++
++#: system/settings/rbp.xml system/settings/imx6.xml
++msgctxt "#38121"
++msgid "Enables decoding of high quality DTS-HD audio streams. Note: This increases CPU load and is only available when DTS and DTS-HD audio passthrough are disabled."
++msgstr ""
+diff --git a/system/settings/imx6.xml b/system/settings/imx6.xml
+index d8b17c3..bdb5eb8 100644
+--- a/system/settings/imx6.xml
++++ b/system/settings/imx6.xml
+@@ -13,6 +13,26 @@
+         </setting>
+       </group>
+     </category>
++    <category id="audiooutput">
++      <group id="1">
++        <setting id="audiooutput.supportdtshdcpudecoding" type="boolean" label="38120" help="38121">
++          <level>2</level>
++          <default>false</default>
++          <control type="toggle" />
++          <dependencies>
++            <dependency type="enable">
++            <or>
++              <condition setting="audiooutput.passthrough" operator="is">false</condition>
++              <and>
++                <condition setting="audiooutput.dtshdpassthrough" operator="is">false</condition>
++                <condition setting="audiooutput.dtspassthrough" operator="is">false</condition>
++              </and>
++            </or>
++            </dependency>
++          </dependencies>
++        </setting>
++      </group>
++    </category>
+   </section>
+   <section id="videos">
+     <category id="videoacceleration">
+diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
+index 50fe36a..52703e9 100644
+--- a/system/settings/rbp.xml
++++ b/system/settings/rbp.xml
+@@ -76,6 +76,11 @@
+         <setting id="audiooutput.processquality">
+           <default>101</default> <!-- AE_QUALITY_GPU -->
+         </setting>
++        <setting id="audiooutput.supportdtshdcpudecoding" type="boolean" label="38120" help="38121">
++          <level>2</level>
++          <default>false</default>
++          <control type="toggle" />
++        </setting>
+       </group>
+       <group id="3">
+         <setting id="audiooutput.ac3transcode" help="37024">
+diff --git a/system/settings/rbp2.xml b/system/settings/rbp2.xml
+index 8cc8f19..b29a428 100644
+--- a/system/settings/rbp2.xml
++++ b/system/settings/rbp2.xml
+@@ -19,6 +19,11 @@
+       </group>
+     </category>
+     <category id="audiooutput">
++      <group id="1">
++        <setting id="audiooutput.supportdtshdcpudecoding">
++          <default>true</default>
++        </setting>
++      </group>
+       <group id="3">
+         <setting id="audiooutput.ac3transcode" help="36429">
+         </setting>
+diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
+index 24480b2..1e20602 100644
+--- a/tools/depends/target/ffmpeg/Makefile
++++ b/tools/depends/target/ffmpeg/Makefile
+@@ -56,7 +56,7 @@ endif
+ ifeq ($(Configuration), Release)
+   ffmpg_config += --disable-debug
+ endif
+-ffmpg_config += --enable-libdcadec --disable-decoder=dca
++ffmpg_config += --enable-libdcadec
+ 
+ 
+ CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
+index 991449b..e6553dd 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
+@@ -33,6 +33,7 @@ extern "C" {
+ #include "settings/Settings.h"
+ #include "cores/AudioEngine/Utils/AEUtil.h"
+ #endif
++#include "settings/Settings.h"
+ 
+ CDVDAudioCodecFFmpeg::CDVDAudioCodecFFmpeg() : CDVDAudioCodec()
+ {
+@@ -54,10 +55,19 @@ CDVDAudioCodecFFmpeg::~CDVDAudioCodecFFmpeg()
+ 
+ bool CDVDAudioCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options)
+ {
+-  AVCodec* pCodec;
++  AVCodec* pCodec = NULL;
+   m_bOpenedCodec = false;
+ 
+-  pCodec = avcodec_find_decoder(hints.codec);
++  bool allow_dtshd_decoding = true;
++#if defined(TARGET_RASPBERRY_PI) || defined(HAS_IMXVPU) || defined(HAS_LIBAMCODEC)
++  allow_dtshd_decoding = CSettings::Get().GetBool("audiooutput.supportdtshdcpudecoding");
++#endif
++  if (hints.codec == AV_CODEC_ID_DTS && allow_dtshd_decoding)
++    pCodec = avcodec_find_decoder_by_name("libdcadec");
++
++  if (!pCodec)
++    pCodec = avcodec_find_decoder(hints.codec);
++
+   if (!pCodec)
+   {
+     CLog::Log(LOGDEBUG,"CDVDAudioCodecFFmpeg::Open() Unable to find codec %d", hints.codec);
+diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+index 74ff31f..6a97135 100644
+--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
++++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+@@ -439,6 +439,21 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein
+ 
+   if (m_streaminfo)
+   {
++#if defined(TARGET_RASPBERRY_PI) || defined(HAS_IMXVPU) || defined(HAS_LIBAMCODEC)
++    if (CSettings::Get().GetBool("audiooutput.supportdtshdcpudecoding"))
++#endif
++    {
++      for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
++      {
++        AVStream *st = m_pFormatContext->streams[i];
++        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == AV_CODEC_ID_DTS)
++        {
++          AVCodec* pCodec = avcodec_find_decoder_by_name("libdcadec");
++          if (pCodec)
++            st->codec->codec = pCodec;
++        }
++      }
++    }
+     /* to speed up dvd switches, only analyse very short */
+     if(m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
+       av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
+diff --git a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
+index 1a920f7..075f728 100644
+--- a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
++++ b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include "cores/AudioEngine/Utils/AEUtil.h"
+ #include "cores/AudioEngine/AEFactory.h"
++#include "settings/Settings.h"
+ 
+ // the size of the audio_render output port buffers
+ #define AUDIO_DECODE_OUTPUT_BUFFER (32*1024)
+@@ -62,10 +63,15 @@ COMXAudioCodecOMX::~COMXAudioCodecOMX()
+ 
+ bool COMXAudioCodecOMX::Open(CDVDStreamInfo &hints)
+ {
+-  AVCodec* pCodec;
++  AVCodec* pCodec = NULL;
+   m_bOpenedCodec = false;
+ 
+-  pCodec = avcodec_find_decoder(hints.codec);
++  if (hints.codec == AV_CODEC_ID_DTS && CSettings::Get().GetBool("audiooutput.supportdtshdcpudecoding"))
++    pCodec = avcodec_find_decoder_by_name("libdcadec");
++
++  if (!pCodec)
++    pCodec = avcodec_find_decoder(hints.codec);
++
+   if (!pCodec)
+   {
+     CLog::Log(LOGDEBUG,"COMXAudioCodecOMX::Open() Unable to find codec %d", hints.codec);
+
+From 61fac1c7999532e4595ef9101c83074937dddabb Mon Sep 17 00:00:00 2001
+From: wsnipex <wsnipex@a1.net>
+Date: Wed, 13 May 2015 20:00:31 +0200
+Subject: [PATCH 3/6] [configure] use pkg-config to detect dcadec
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad9ae6d..600325a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1088,7 +1088,7 @@ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library),
+ AC_CHECK_HEADER([jpeglib.h],,        AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([ogg/ogg.h],,        AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
+-AC_CHECK_HEADER([libdcadec/dca_context.h],, AC_MSG_ERROR($missing_library))
++PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_ERROR([libdcadec not found]))
+ 
+ PKG_CHECK_MODULES([LIBCURL], [libcurl],, AC_MSG_ERROR([libcurl not found]))
+ XB_FIND_SONAME([CURL], [curl])
+
+From 035084e5c09555005aa045f67a282cecceb98900 Mon Sep 17 00:00:00 2001
+From: wsnipex <wsnipex@a1.net>
+Date: Wed, 13 May 2015 20:02:38 +0200
+Subject: [PATCH 4/6] [ffmpeg] enabled dcadec for linux standalone builds
+
+---
+ tools/depends/target/ffmpeg/autobuild.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh
+index 196c347..b9bfd57 100755
+--- a/tools/depends/target/ffmpeg/autobuild.sh
++++ b/tools/depends/target/ffmpeg/autobuild.sh
+@@ -159,6 +159,7 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+ 	--disable-mips32r2 \
+ 	--disable-mipsdspr1 \
+ 	--disable-mipsdspr2 \
++	--enable-libdcadec \
+         ${FLAGS}
+ 
+ make -j ${BUILDTHREADS} 
+
+From d89c29002ab09708540055f214823836e2c74c00 Mon Sep 17 00:00:00 2001
+From: wsnipex <wsnipex@a1.net>
+Date: Wed, 13 May 2015 20:12:31 +0200
+Subject: [PATCH 5/6] [depends] use a tarball from mirrors for dcadec
+
+---
+ tools/depends/target/libdcadec/Makefile | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/tools/depends/target/libdcadec/Makefile b/tools/depends/target/libdcadec/Makefile
+index e68ec46..4c98063 100644
+--- a/tools/depends/target/libdcadec/Makefile
++++ b/tools/depends/target/libdcadec/Makefile
+@@ -2,9 +2,10 @@ include ../../Makefile.include
+ DEPS= ../../Makefile.include Makefile
+ 
+ # lib name, version
+-LIBNAME=dcadec
+-ARCHIVE=master.tar.gz
+-BASE_URL=https://github.com/foo86/dcadec/archive
++LIBNAME=libdcadec
++VERSION=git-396e75652
++SOURCE=$(LIBNAME)-$(VERSION)
++ARCHIVE=$(SOURCE).tar.gz
+ 
+ # configuration settings
+ 
+
+From faceb91945a9064e26c55c83d9944d20f538da0d Mon Sep 17 00:00:00 2001
+From: wsnipex <wsnipex@a1.net>
+Date: Wed, 13 May 2015 20:18:09 +0200
+Subject: [PATCH 6/6] [docs] add dcadec to linux README
+
+---
+ docs/README.linux  | 2 +-
+ docs/README.ubuntu | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/README.linux b/docs/README.linux
+index ee64baf..732d606 100644
+--- a/docs/README.linux
++++ b/docs/README.linux
+@@ -44,7 +44,7 @@ that are used to build Kodi packages on Debian/Ubuntu (with all supported
+ external libraries enabled).
+ 
+ Build-Depends: autoconf, automake, autopoint, autotools-dev, cmake, curl,
+-  debhelper (>= 7.0.50~), default-jre, gawk, gperf, libao-dev, libasound2-dev,
++  dcadec-dev, default-jre, gawk, gperf, libao-dev, libasound2-dev,
+   libass-dev (>= 0.9.8), libavahi-client-dev, libavahi-common-dev, libbluetooth-dev,
+   libbluray-dev, libboost-dev, libboost-thread-dev, libbz2-dev, libcap-dev, libcdio-dev,
+   libcec-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libcwiid-dev,
+diff --git a/docs/README.ubuntu b/docs/README.ubuntu
+index 10f1611..0369f83 100644
+--- a/docs/README.ubuntu
++++ b/docs/README.ubuntu
+@@ -82,7 +82,7 @@ Tip: For those with multiple computers at home is to try out distcc
+ 
+ For Ubuntu (all versions >= 7.04):
+ 
+-    $ sudo apt-get install automake bison build-essential cmake curl cvs default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 libcurl4-gnutls-dev libdbus-1-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libgif-dev libglew-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-dev libmysqlclient-dev libnfs-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev libvorbis-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip yasm zip zlib1g-dev
++    $ sudo apt-get install automake bison build-essential cmake curl cvs dcadec-dev default-jre fp-compiler gawk gdc gettext git-core gperf libasound2-dev libass-dev libboost-dev libboost-thread-dev libbz2-dev libcap-dev libcdio-dev libcurl3 libcurl4-gnutls-dev libdbus-1-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libgif-dev libglew-dev libiso9660-dev libjasper-dev libjpeg-dev liblzo2-dev libmicrohttpd-dev libmodplug-dev libmpeg2-4-dev libmpeg3-dev libmysqlclient-dev libnfs-dev libogg-dev libpcre3-dev libplist-dev libpng-dev libpulse-dev libsdl2-dev libsmbclient-dev libsqlite3-dev libssh-dev libssl-dev libtiff-dev libtinyxml-dev libtool libudev-dev libusb-dev libva-dev libvdpau-dev libvorbis-dev libvorbisenc2 libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxslt1-dev libxt-dev libyajl-dev mesa-utils nasm pmount python-dev python-imaging python-sqlite swig unzip yasm zip zlib1g-dev
+ 
+ For >= 10.10:
+     $ sudo apt-get install autopoint libltdl-dev

packages/mediacenter/kodi/patches/kodi-999.21-configure.ac-dont-break-if-dcadec-is-missing-dcadec-.patch

@@ -0,0 +1,34 @@
+From a3b0b1fd46d726d93303f823dacf69977f34d9ae Mon Sep 17 00:00:00 2001
+From: Stephan Raue <stephan@openelec.tv>
+Date: Sat, 16 May 2015 11:47:58 +0200
+Subject: [PATCH] configure.ac: dont break if dcadec is missing, dcadec is a
+ ffmpeg dep
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 600325a..9daa246 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1088,7 +1088,7 @@ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library),
+ AC_CHECK_HEADER([jpeglib.h],,        AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([ogg/ogg.h],,        AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
+-PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_ERROR([libdcadec not found]))
++PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_WARN([dcadec not found]))
+ 
+ PKG_CHECK_MODULES([LIBCURL], [libcurl],, AC_MSG_ERROR([libcurl not found]))
+ XB_FIND_SONAME([CURL], [curl])
+@@ -1120,7 +1120,6 @@ PKG_CHECK_MODULES([GNUTLS], [gnutls], [have_gnutls=yes];AC_DEFINE([HAVE_GNUTLS],
+ AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
+ AC_CHECK_LIB([tiff],        [main],, AC_MSG_ERROR($missing_library))
+-AC_CHECK_LIB([dcadec],      [main],, AC_MSG_ERROR($missing_library))
+ if echo "$ARCH" | grep -q freebsd; then
+ AC_CHECK_LIB([pthread],     [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([pthread],     [pthread_set_name_np],
+-- 
+1.9.3
+

packages/mediacenter/platform/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="platform"
-PKG_VERSION="1.0.6"
+PKG_VERSION="1.0.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/platform/patches/platform-02-add-PR6.patch

@@ -1,199 +0,0 @@
-From 8ff719d94b664378f3ebb61166454eef7cb20c25 Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Sat, 9 May 2015 17:13:25 +0200
-Subject: [PATCH] readd sockets/cdevsocket.h, needed by IMX6 and TDA995x
-
----
- CMakeLists.txt           |   3 +-
- src/posix/os-socket.h    |  16 +++++++
- src/posix/os-types.h     |   2 +
- src/sockets/cdevsocket.h | 117 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 137 insertions(+), 1 deletion(-)
- create mode 100644 src/sockets/cdevsocket.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8164286..9f577b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,8 @@ ELSE(WIN32)
-                 src/posix/os-types.h
-           DESTINATION include/platform/posix)
- ENDIF(WIN32)
--install(FILES src/sockets/socket.h
-+install(FILES src/sockets/cdevsocket.h
-+              src/sockets/socket.h
-               src/sockets/tcp.h
-         DESTINATION include/platform/sockets)
- install(FILES src/threads/atomics.h
-diff --git a/src/posix/os-socket.h b/src/posix/os-socket.h
-index 60c8507..05888c2 100644
---- a/src/posix/os-socket.h
-+++ b/src/posix/os-socket.h
-@@ -36,6 +36,7 @@
- #include "../util/timeutils.h"
- #include <stdio.h>
- #include <fcntl.h>
-+#include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
-@@ -164,8 +165,23 @@ namespace PLATFORM
- 
-     return iBytesRead;
-   }
-+
-+  inline int SocketIoctl(socket_t socket, int *iError, int request, void* data)
-+  {
-+    if (socket == INVALID_SOCKET_VALUE)
-+    {
-+      *iError = EINVAL;
-+      return -1;
-+    }
-+
-+    int iReturn = ioctl(socket, request, data);
-+    if (iReturn < 0)
-+      *iError = errno;
-+    return iReturn;
-+  }
-   //@}
- 
-+
-   // TCP
-   //@{
-   inline void TcpSocketClose(tcp_socket_t socket)
-diff --git a/src/posix/os-types.h b/src/posix/os-types.h
-index 6134080..b48f330 100644
---- a/src/posix/os-types.h
-+++ b/src/posix/os-types.h
-@@ -61,6 +61,8 @@ typedef socket_t tcp_socket_t;
- #define INVALID_SOCKET_VALUE        (-1)
- typedef socket_t serial_socket_t;
- #define INVALID_SERIAL_SOCKET_VALUE (-1)
-+typedef socket_t chardev_socket_t;
-+#define INVALID_CHARDEV_SOCKET_VALUE (-1)
- 
- typedef long LONG;
- #if !defined(__APPLE__)
-diff --git a/src/sockets/cdevsocket.h b/src/sockets/cdevsocket.h
-new file mode 100644
-index 0000000..a5ac338
---- /dev/null
-+++ b/src/sockets/cdevsocket.h
-@@ -0,0 +1,117 @@
-+#pragma once
-+/*
-+ * This file is part of the libCEC(R) library.
-+ *
-+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
-+ * libCEC(R) is an original work, containing original code.
-+ *
-+ * libCEC(R) is a trademark of Pulse-Eight Limited.
-+ *
-+ * This program is dual-licensed; 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.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ *
-+ * Alternatively, you can license this library under a commercial license,
-+ * please contact Pulse-Eight Licensing for more information.
-+ *
-+ * For more information contact:
-+ * Pulse-Eight Licensing       <license@pulse-eight.com>
-+ *     http://www.pulse-eight.com/
-+ *     http://www.pulse-eight.net/
-+ */
-+
-+#include "../os.h"
-+#include "../util/buffer.h"
-+
-+#include <string>
-+#include <stdint.h>
-+
-+#if !defined(__WINDOWS__)
-+#include <termios.h>
-+#endif
-+
-+#include "socket.h"
-+
-+namespace PLATFORM
-+{
-+  class CCDevSocket : public CCommonSocket<chardev_socket_t>
-+  {
-+    public:
-+      CCDevSocket(const std::string &strName ) :
-+        CCommonSocket<chardev_socket_t>(INVALID_CHARDEV_SOCKET_VALUE, strName)
-+        #ifdef __WINDOWS__
-+        ,m_iCurrentReadTimeout(MAXDWORD)
-+        #endif
-+      {}
-+
-+      virtual ~CCDevSocket(void) 
-+      { 
-+	Close(); 
-+      }
-+
-+      virtual bool Open(uint64_t iTimeoutMs = 0)
-+      {
-+        (void)iTimeoutMs;
-+
-+	if (IsOpen())
-+          return false;
-+
-+        m_socket = open(m_strName.c_str(), O_RDWR );
-+
-+        if (m_socket == INVALID_CHARDEV_SOCKET_VALUE)
-+        {
-+          m_strError = strerror(errno);
-+          return false;
-+        }
-+
-+        return true;
-+      }
-+      
-+      virtual void Close(void)
-+      {
-+        if (IsOpen())
-+        {
-+          SocketClose(m_socket);
-+          m_socket = INVALID_CHARDEV_SOCKET_VALUE;
-+        }
-+      }
-+      
-+      virtual void Shutdown(void)
-+      {
-+        SocketClose(m_socket);
-+      }
-+      
-+      virtual int Ioctl(int request, void* data)
-+      {
-+        return IsOpen() ? SocketIoctl(m_socket, &m_iError, request, data) : -1;
-+      }
-+      
-+      virtual ssize_t Write(void* data, size_t len)
-+      {
-+        return IsOpen() ? SocketWrite(m_socket, &m_iError, data, len) : -1;
-+      }
-+      
-+      virtual ssize_t Read(void* data, size_t len, uint64_t iTimeoutMs = 0)
-+      {
-+        return IsOpen() ? SocketRead(m_socket, &m_iError, data, len, iTimeoutMs) : -1;
-+      }
-+
-+      virtual bool IsOpen(void)
-+      {
-+        return m_socket != INVALID_CHARDEV_SOCKET_VALUE;
-+      }
-+  };
-+
-+};
-+

packages/multimedia/ffmpeg/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="2.6.2"
+PKG_VERSION="2.6.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/multimedia/imx-vpu/package.mk

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

packages/multimedia/imx-vpu/patches/imx-vpu-cflags.patch

@@ -1,21 +0,0 @@
-diff -Naur imx-lib-3.5.7-1.0.0/vpu/Makefile imx-lib-3.5.7-1.0.0.patch/vpu/Makefile
---- imx-lib-3.5.7-1.0.0/vpu/Makefile	2013-06-21 15:22:18.000000000 +0200
-+++ imx-lib-3.5.7-1.0.0.patch/vpu/Makefile	2014-01-13 08:07:56.431868081 +0100
-@@ -1,6 +1,8 @@
- CC=$(CROSS_COMPILE)gcc
- AR=$(CROSS_COMPILE)ar
- 
-+CFLAGS := -Wall -O2
-+
- # list of platforms which want this test case
- INCLUDE_LIST:= IMX27ADS IMX51 IMX53 IMX6Q
- 
-@@ -33,7 +35,7 @@
- endif
- 
- %.o: %.c
--	$(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
-+	$(CC) -D$(PLATFORM) $(CFLAGS) -fPIC -c $^ -o $@
- 
- $(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
- 	$(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ -lpthread

packages/multimedia/libfslvpuwrap/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libfslvpuwrap"
-PKG_VERSION="1.0.46"
+PKG_VERSION="1.0.58"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="other"

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

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

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

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

packages/multimedia/vdr-satip/package.mk

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

packages/network/libssh/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="libssh"
-PKG_VERSION="0.6.4"
+PKG_VERSION="0.7.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.libssh.org/"
-PKG_URL="https://red.libssh.org/attachments/download/107/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://red.libssh.org/attachments/download/140/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib libressl"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"