From 8f04057d1c3d84ba72eaf92e50c432e8fde5f9e9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Sep 2014 12:15:15 +0200
Subject: add information where the tarballs are from

---
 target/config/Config.in.toolchain | 4 ++--
 toolchain/binutils/Makefile.inc   | 2 ++
 toolchain/gcc/Makefile.inc        | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 3ead8955a..23b348ecc 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -23,8 +23,8 @@ config ADK_TOOLCHAIN_GCC_4_5_4
 	boolean
 	depends on ADK_LINUX_BFIN
 
-config ADK_TOOLCHAIN_GCC_4_8_3_ARC
-	prompt "4.8.3-arc"
+config ADK_TOOLCHAIN_GCC_4_8_0_ARC
+	prompt "4.8.0-arc"
 	boolean
 	depends on ADK_LINUX_ARC
 
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 75819f916..464f959cb 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -10,6 +10,8 @@ PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_23_ARC),y)
+# git commit afcd0783a37c73e09439737a11e0b3183746a652
+# https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/tree/arc-2.23-tls
 PKG_VERSION:=		2.23
 PKG_MD5SUM:=		a5dd5dd2d212a282cc1d4a84633e0d88
 PKG_RELEASE:=		1
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 7849939cf..86d03b58a 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -18,9 +18,11 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		19
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_4_8_3_ARC),y)
-PKG_VERSION:=		4.8.3
-PKG_MD5SUM:=		e2c60f5ef918be2db08df96c7d97d0c4
+ifeq ($(ADK_TOOLCHAIN_GCC_4_8_0_ARC),y)
+# git commit e9dbcfdba0f42639b3aa9e3b06fe781599eb98fe
+# from https://github.com/foss-for-synopsys-dwc-arc-processors/gcc/tree/arc-4.8-tls
+PKG_VERSION:=		4.8.0
+PKG_MD5SUM:=		91db62ad4f9bb9217f135b20a098ee03
 PKG_SITES:=		http://www.openadk.org/distfiles/
 PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-arc.tar.xz
-- 
cgit v1.2.3


From 694051a3249bf8fbb3019fdea8c018359148b355 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 9 Sep 2014 21:50:46 +0200
Subject: add cflags patch

---
 toolchain/gcc/patches/4.8.0/cflags.patch | 231 +++++++++++++++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 toolchain/gcc/patches/4.8.0/cflags.patch

diff --git a/toolchain/gcc/patches/4.8.0/cflags.patch b/toolchain/gcc/patches/4.8.0/cflags.patch
new file mode 100644
index 000000000..4f9de8069
--- /dev/null
+++ b/toolchain/gcc/patches/4.8.0/cflags.patch
@@ -0,0 +1,231 @@
+diff -Nur gcc-4.8.2.orig/gcc/c-family/c.opt gcc-4.8.2/gcc/c-family/c.opt
+--- gcc-4.8.2.orig/gcc/c-family/c.opt	2013-01-19 06:25:25.000000000 +0100
++++ gcc-4.8.2/gcc/c-family/c.opt	2014-02-23 20:22:48.000000000 +0100
+@@ -379,6 +379,10 @@
+ C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
+ This switch is deprecated; use -Werror=implicit-function-declaration instead
+ 
++Werror-maybe-reset
++C ObjC C++ ObjC++
++; Documented in common.opt
++
+ Wfloat-equal
+ C ObjC C++ ObjC++ Var(warn_float_equal) Warning
+ Warn if testing floating point numbers for equality
+@@ -949,6 +953,9 @@
+ fhonor-std
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
+ 
++fhonour-copts
++C ObjC C++ ObjC++ RejectNegative
++
+ fhosted
+ C ObjC
+ Assume normal C execution environment
+diff -Nur gcc-4.8.2.orig/gcc/c-family/c-opts.c gcc-4.8.2/gcc/c-family/c-opts.c
+--- gcc-4.8.2.orig/gcc/c-family/c-opts.c	2013-02-18 20:42:56.000000000 +0100
++++ gcc-4.8.2/gcc/c-family/c-opts.c	2014-02-23 20:22:48.000000000 +0100
+@@ -104,6 +104,9 @@
+ /* Whether any standard preincluded header has been preincluded.  */
+ static bool done_preinclude;
+ 
++/* Check if a port honours COPTS.  */
++static int honour_copts = 0;
++
+ static void handle_OPT_d (const char *);
+ static void set_std_cxx98 (int);
+ static void set_std_cxx11 (int);
+@@ -491,6 +494,12 @@
+       flag_no_builtin = !value;
+       break;
+ 
++    case OPT_fhonour_copts:
++      if (c_language == clk_c) {
++        honour_copts++;
++      }
++      break;
++
+     case OPT_fconstant_string_class_:
+       constant_string_class_name = arg;
+       break;
+@@ -1027,6 +1036,47 @@
+       return false;
+     }
+ 
++  if (c_language == clk_c) {
++    char *ev = getenv ("GCC_HONOUR_COPTS");
++    int evv;
++    if (ev == NULL)
++      evv = -1;
++    else if ((*ev == '0') || (*ev == '\0'))
++      evv = 0;
++    else if (*ev == '1')
++      evv = 1;
++    else if (*ev == '2')
++      evv = 2;
++    else if (*ev == 's')
++      evv = -1;
++    else {
++      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
++      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
++    }
++    if (evv == 1) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in lenient mode");
++        return false;
++      } else if (honour_copts != 1) {
++        warning (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++      }
++    } else if (evv == 2) {
++      if (honour_copts == 0) {
++        error ("someone does not honour COPTS at all in strict mode");
++        return false;
++      } else if (honour_copts != 1) {
++        error ("someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++        return false;
++      }
++    } else if (evv == 0) {
++      if (honour_copts != 1)
++        inform (0, "someone does not honour COPTS correctly, passed %d times",
++         honour_copts);
++    }
++  }
++
+   return true;
+ }
+ 
+diff -Nur gcc-4.8.2.orig/gcc/common.opt gcc-4.8.2/gcc/common.opt
+--- gcc-4.8.2.orig/gcc/common.opt	2013-03-14 10:13:36.000000000 +0100
++++ gcc-4.8.2/gcc/common.opt	2014-02-23 20:22:48.000000000 +0100
+@@ -541,6 +541,10 @@
+ Common Joined
+ Treat specified warning as error
+ 
++Werror-maybe-reset
++Common
++If environment variable GCC_NO_WERROR is set, act as -Wno-error
++
+ Wextra
+ Common Var(extra_warnings) Warning
+ Print extra (possibly unwanted) warnings
+@@ -1242,6 +1246,9 @@
+ Common Report Var(flag_guess_branch_prob) Optimization
+ Enable guessing of branch probabilities
+ 
++fhonour-copts
++Common RejectNegative
++
+ ; Nonzero means ignore `#ident' directives.  0 means handle them.
+ ; Generate position-independent code for executables if possible
+ ; On SVR4 targets, it also controls whether or not to emit a
+diff -Nur gcc-4.8.2.orig/gcc/doc/cppopts.texi gcc-4.8.2/gcc/doc/cppopts.texi
+--- gcc-4.8.2.orig/gcc/doc/cppopts.texi	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.2/gcc/doc/cppopts.texi	2014-02-23 20:22:48.000000000 +0100
+@@ -163,6 +163,11 @@
+ Make all warnings into hard errors.  Source code which triggers warnings
+ will be rejected.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
+ @item -Wsystem-headers
+ @opindex Wsystem-headers
+ Issue warnings for code in system headers.  These are normally unhelpful
+diff -Nur gcc-4.8.2.orig/gcc/doc/invoke.texi gcc-4.8.2/gcc/doc/invoke.texi
+--- gcc-4.8.2.orig/gcc/doc/invoke.texi	2013-06-19 21:55:50.000000000 +0200
++++ gcc-4.8.2/gcc/doc/invoke.texi	2014-02-23 20:22:48.000000000 +0100
+@@ -240,7 +240,7 @@
+ -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
+ -Wno-deprecated-declarations -Wdisabled-optimization  @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
+--Wno-endif-labels -Werror  -Werror=* @gol
++-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
+ -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
+ -Wformat-security  -Wformat-y2k @gol
+@@ -4807,6 +4807,22 @@
+ @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
+ @option{-Wno-pointer-sign}.
+ 
++ at item -Werror-maybe-reset
++ at opindex Werror-maybe-reset
++Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
++variable is set to anything other than 0 or empty.
++
++ at item -fhonour-copts
++ at opindex fhonour-copts
++If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
++given at least once, and warn if it is given more than once.
++If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
++given exactly once.
++If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
++is not given exactly once.
++The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
++This flag and environment variable only affect the C language.
++
+ @item -Wstack-protector
+ @opindex Wstack-protector
+ @opindex Wno-stack-protector
+@@ -6918,7 +6934,7 @@
+ second branch or a point immediately following it, depending on whether
+ the condition is known to be true or false.
+ 
+-Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
++Enabled at levels @option{-O3}.
+ 
+ @item -fsplit-wide-types
+ @opindex fsplit-wide-types
+diff -Nur gcc-4.8.2.orig/gcc/java/jvspec.c gcc-4.8.2/gcc/java/jvspec.c
+--- gcc-4.8.2.orig/gcc/java/jvspec.c	2013-01-10 21:38:27.000000000 +0100
++++ gcc-4.8.2/gcc/java/jvspec.c	2014-02-23 20:22:48.000000000 +0100
+@@ -626,6 +626,7 @@
+      class name.  Append dummy `.c' that can be stripped by set_input so %b
+      is correct.  */ 
+   set_input (concat (main_class_name, "main.c", NULL));
++  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
+   err = do_spec (jvgenmain_spec);
+   if (err == 0)
+     {
+diff -Nur gcc-4.8.2.orig/gcc/opts.c gcc-4.8.2/gcc/opts.c
+--- gcc-4.8.2.orig/gcc/opts.c	2013-03-05 07:01:13.000000000 +0100
++++ gcc-4.8.2/gcc/opts.c	2014-02-23 20:22:48.000000000 +0100
+@@ -468,8 +468,6 @@
+     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
+ #endif
+     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
+@@ -488,6 +486,8 @@
+     { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, NULL, 1 },
+ 
+     /* -O3 optimizations.  */
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
+     /* Inlining of functions reducing size is a good idea with -Os
+@@ -1423,6 +1423,17 @@
+ 			       opts, opts_set, loc, dc);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++        char *ev = getenv ("GCC_NO_WERROR");
++        if ((ev != NULL) && (*ev != '0'))
++          warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wlarger_than_:
+       opts->x_larger_than_size = value;
+       opts->x_warn_larger_than = value != -1;
-- 
cgit v1.2.3


From 314ad3b0d1a52da5ac6d8e4a0f932507c13bd626 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 10 Sep 2014 17:30:56 +0200
Subject: use CXXFLAGS_FOR_TARGET instead of --enable-cxx-flags

---
 toolchain/gcc/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 68f64e2ff..a2f73ff5b 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -30,6 +30,7 @@ GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 			--disable-libstdcxx-pch \
 			--disable-ppl-version-check \
 			--disable-cloog-version-check \
+			--disable-target-optspace \
 			--with-system-zlib \
 			--without-ppl \
 			--without-cloog \
@@ -44,10 +45,6 @@ else
 GCC_CONFOPTS+=         --disable-tls --disable-threads --disable-libatomic
 endif
 
-ifneq ($(ADK_LINUX_AARCH64)$(ADK_LINUX_ALPHA)$(ADK_LINUX_ARC)$(ADK_LINUX_AVR32)$(ADK_LINUX_BFIN)$(ADK_LINUX_XTENSA)$(ADK_LINUX_M68K),y)
-GCC_FINAL_CONFOPTS+=	--enable-cxx-flags='$(TARGET_CXXFLAGS)'
-endif
-
 ifeq ($(ADK_TARGET_UCLINUX)$(ADK_TARGET_USE_STATIC_LIBS),y)
 GCC_FINAL_CONFOPTS+=	--disable-shared
 else
@@ -236,6 +233,8 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 	mkdir -p $(GCC_BUILD_DIR_FINAL)
 	cd $(GCC_BUILD_DIR_FINAL); \
 		PATH='$(TARGET_PATH)' \
+		CFLAGS_FOR_TARGET='$(TARGET_CFLAGS)' \
+		CXXFLAGS_FOR_TARGET='$(TARGET_CXXFLAGS)' \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			${GCC_FINAL_CONFOPTS} \
-- 
cgit v1.2.3


From 6af2dcb9b8b068b2adbb2289ecfa1d9ea8b1f12f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 10 Sep 2014 17:38:11 +0200
Subject: enable gles again

---
 package/kodi/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 7a0a14640..321c0e4e1 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
 PKG_VERSION:=		14.0alpha4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5bd39942150249d9eccf792d77b92554
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
@@ -76,7 +76,7 @@ HOST_CXXFLAGS+=		$(HOST_CPPFLAGS)
 XAKE_FLAGS+=		V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s
 TARGET_CPPFLAGS+=	-I. -I./utils \
 			-I$(STAGING_TARGET_DIR)/usr/include/afpfs-ng \
-			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DLINUX
+			-DTIXML_USE_STL=1 -DLINUX
 
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/opt/vc/include \
@@ -98,7 +98,6 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-libcap \
 			--disable-joystick \
 			--disable-dvdcss \
-			--disable-debug \
 			--disable-gtest \
 			--disable-ccache \
 			--disable-wayland \
@@ -106,6 +105,7 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-mid \
 			--enable-alsa \
 			--enable-libvorbisenc \
+			--enable-debug \
 			--enable-udev
 
 ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),)
@@ -164,7 +164,7 @@ else
 ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 CONFIGURE_ARGS+=	--disable-x11 \
 			--disable-sdl \
-			--disable-gles \
+			--enable-gles \
 			--enable-neon \
 			--enable-codec=imxvpu
 else
-- 
cgit v1.2.3


From d2ea402f13338451f04d0eea313890e2d1b2f7cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 10 Sep 2014 22:46:17 +0200
Subject: do not enable bluetooth driver for non-sdio capable devices

---
 target/linux/config/Config.in.bluetooth | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 537e0c741..64226aba6 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -116,8 +116,6 @@ config ADK_KERNEL_BT_MRVL
 	prompt "Marvell driver"
 	tristate
 	select ADK_KERNEL_BT
-	select ADK_PACKAGE_BRCM_BLUETOOTH
-	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
 	help
 	  Bluetooth Marvell driver.
@@ -125,8 +123,9 @@ config ADK_KERNEL_BT_MRVL
 config ADK_KERNEL_BT_MRVL_SDIO
 	prompt "Marvell SDIO driver"
 	tristate
-	depends on ADK_KERNEL_BT_MRVL
-	depends on ADK_KERNEL_BT_HCIBTSDIO
+	select ADK_PACKAGE_BRCM_BLUETOOTH
+	select ADK_KERNEL_BT_MRVL
+	select ADK_KERNEL_BT_HCIBTSDIO
 	depends on ADK_TARGET_WITH_SDIO
 	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
-- 
cgit v1.2.3


From 6472be12a035f99e08fbd133fe257b85ddb2ffd0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 11 Sep 2014 08:45:29 +0200
Subject: only use kodi, remove xbmc

---
 package/kodi/Makefile                              |    26 +-
 .../powermanagement/linux/LinuxPowerSyscall.cpp    |    56 -
 .../xbmc/powermanagement/linux/LinuxPowerSyscall.h |    45 -
 package/xbmc-imx6/Makefile                         |   173 -
 package/xbmc-imx6/files/xbmc.init                  |    30 -
 package/xbmc-imx6/files/xbmc.postinst              |     3 -
 .../xbmc-imx6/patches/patch-Makefile_include_in    |    10 -
 package/xbmc-imx6/patches/patch-configure_in       |    11 -
 .../xbmc-imx6/patches/patch-lib_cpluff_Makefile_am |    11 -
 .../xbmc-imx6/patches/patch-lib_cpluff_autogen_sh  |    10 -
 .../patches/patch-lib_cpluff_configure_ac          |    11 -
 .../patches/patch-lib_cpluff_libcpluff_Makefile_am |    11 -
 .../xbmc-imx6/patches/patch-m4_ax_python_devel_m4  |    11 -
 .../xbmc-imx6/patches/patch-xbmc_Application_cpp   |    41 -
 .../patch-xbmc_cores_dvdplayer_DVDAudio_cpp        |    11 -
 .../patches/patch-xbmc_cores_dvdplayer_DVDAudio_h  |    11 -
 ...tch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h |    20 -
 .../patch-xbmc_cores_dvdplayer_DVDStreamInfo_h     |    11 -
 .../powermanagement/linux/LinuxPowerSyscall.cpp    |    56 -
 .../xbmc/powermanagement/linux/LinuxPowerSyscall.h |    45 -
 package/xbmc/Makefile                              |   198 -
 package/xbmc/files/xbmc.init                       |    30 -
 package/xbmc/files/xbmc.postinst                   |     3 -
 package/xbmc/patches/patch-Makefile_in             |    92 -
 package/xbmc/patches/patch-Makefile_include_in     |    10 -
 package/xbmc/patches/patch-configure_in            |    76 -
 package/xbmc/patches/patch-lib_cpluff_Makefile_am  |    11 -
 package/xbmc/patches/patch-lib_cpluff_autogen_sh   |    10 -
 package/xbmc/patches/patch-lib_cpluff_configure_ac |    11 -
 .../patches/patch-lib_cpluff_libcpluff_Makefile_am |    11 -
 package/xbmc/patches/patch-m4_ax_python_devel_m4   |    11 -
 package/xbmc/patches/patch-tools_Linux_xbmc_sh_in  |    82 -
 package/xbmc/patches/patch-xbmc_Application_cpp    |    41 -
 .../xbmc/patches/xbmc-gotham_rbp_backports.patch   | 20665 -------------------
 .../powermanagement/linux/LinuxPowerSyscall.cpp    |    56 -
 .../xbmc/powermanagement/linux/LinuxPowerSyscall.h |    45 -
 target/collections/kodibox                         |    38 +
 target/collections/xbmcbox                         |    34 -
 38 files changed, 50 insertions(+), 21977 deletions(-)
 delete mode 100644 package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
 delete mode 100644 package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
 delete mode 100644 package/xbmc-imx6/Makefile
 delete mode 100644 package/xbmc-imx6/files/xbmc.init
 delete mode 100644 package/xbmc-imx6/files/xbmc.postinst
 delete mode 100644 package/xbmc-imx6/patches/patch-Makefile_include_in
 delete mode 100644 package/xbmc-imx6/patches/patch-configure_in
 delete mode 100644 package/xbmc-imx6/patches/patch-lib_cpluff_Makefile_am
 delete mode 100644 package/xbmc-imx6/patches/patch-lib_cpluff_autogen_sh
 delete mode 100644 package/xbmc-imx6/patches/patch-lib_cpluff_configure_ac
 delete mode 100644 package/xbmc-imx6/patches/patch-lib_cpluff_libcpluff_Makefile_am
 delete mode 100644 package/xbmc-imx6/patches/patch-m4_ax_python_devel_m4
 delete mode 100644 package/xbmc-imx6/patches/patch-xbmc_Application_cpp
 delete mode 100644 package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp
 delete mode 100644 package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h
 delete mode 100644 package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h
 delete mode 100644 package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h
 delete mode 100644 package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
 delete mode 100644 package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
 delete mode 100644 package/xbmc/Makefile
 delete mode 100644 package/xbmc/files/xbmc.init
 delete mode 100644 package/xbmc/files/xbmc.postinst
 delete mode 100644 package/xbmc/patches/patch-Makefile_in
 delete mode 100644 package/xbmc/patches/patch-Makefile_include_in
 delete mode 100644 package/xbmc/patches/patch-configure_in
 delete mode 100644 package/xbmc/patches/patch-lib_cpluff_Makefile_am
 delete mode 100644 package/xbmc/patches/patch-lib_cpluff_autogen_sh
 delete mode 100644 package/xbmc/patches/patch-lib_cpluff_configure_ac
 delete mode 100644 package/xbmc/patches/patch-lib_cpluff_libcpluff_Makefile_am
 delete mode 100644 package/xbmc/patches/patch-m4_ax_python_devel_m4
 delete mode 100644 package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
 delete mode 100644 package/xbmc/patches/patch-xbmc_Application_cpp
 delete mode 100644 package/xbmc/patches/xbmc-gotham_rbp_backports.patch
 delete mode 100644 package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
 delete mode 100644 package/xbmc/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
 create mode 100644 target/collections/kodibox
 delete mode 100644 target/collections/xbmcbox

diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 321c0e4e1..989421db0 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -59,6 +59,8 @@ PKGFB_WITH_BLURAY:=	libbluray
 PKGFS_WITH_BLURAY:=	libbluray
 PKGFD_WITH_WEBSERVER:=	enable internal webserver support
 
+PKG_LIBC_DEPENDS:=	glibc
+
 PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
 PKG_DEPENDS_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
@@ -108,47 +110,47 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-debug \
 			--enable-udev
 
-ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_BLURAY),)
 CONFIGURE_ARGS+=	--enable-libbluray
 else
 CONFIGURE_ARGS+=	--disable-libbluray
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_AFP),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_AFP),)
 CONFIGURE_ARGS+=	--enable-afpclient
 else
 CONFIGURE_ARGS+=	--disable-afpclient
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_SMB),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_SMB),)
 CONFIGURE_ARGS+=	--enable-samba
 else
 CONFIGURE_ARGS+=	--disable-samba
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_SSH),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_SSH),)
 CONFIGURE_ARGS+=	--enable-ssh
 else
 CONFIGURE_ARGS+=	--disable-ssh
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_NFS),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_NFS),)
 CONFIGURE_ARGS+=	--enable-nfs
 else
 CONFIGURE_ARGS+=	--disable-nfs
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_CEC),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_CEC),)
 CONFIGURE_ARGS+=	--enable-libcec
 else
 CONFIGURE_ARGS+=	--disable-libcec
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_RTMP),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_RTMP),)
 CONFIGURE_ARGS+=	--enable-rtmp
 else
 CONFIGURE_ARGS+=	--disable-rtmp
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_AVAHI),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_AVAHI),)
 CONFIGURE_ARGS+=	--enable-avahi
 else
 CONFIGURE_ARGS+=	--disable-avahi
 endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_WEBSERVER),)
+ifneq ($(ADK_PACKAGE_KODI_WITH_WEBSERVER),)
 CONFIGURE_ARGS+=	--enable-webserver
 else
 CONFIGURE_ARGS+=	--disable-webserver
@@ -160,17 +162,13 @@ CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
 			--enable-gles \
 			--disable-sdl \
 			--disable-x11
-else
+endif
 ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 CONFIGURE_ARGS+=	--disable-x11 \
 			--disable-sdl \
 			--enable-gles \
 			--enable-neon \
 			--enable-codec=imxvpu
-else
-CONFIGURE_ARGS+=	--enable-x11 \
-			--enable-sdl
-endif
 endif
 
 pre-configure:
diff --git a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp b/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
deleted file mode 100644
index 4b8b25efb..000000000
--- a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *      Copyright (C) 2014 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
- 
-#if defined (_LINUX)
-
-#include <stdlib.h>
-#include "LinuxPowerSyscall.h"
-#include "utils/log.h"
-
-CLinuxPowerSyscall::CLinuxPowerSyscall()
-{ 
-      CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
-}
-
-CLinuxPowerSyscall::~CLinuxPowerSyscall()
-{ }
-
-bool CLinuxPowerSyscall::Powerdown()
-{
-  system("/sbin/poweroff -F");
-  return 0;
-}
-
-bool CLinuxPowerSyscall::Reboot()
-{
-  system("/sbin/reboot -F");
-  return 0;
-}
-
-int CLinuxPowerSyscall::BatteryLevel(void)
-{ }
-
-bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
-{    
-  return true;
-}
-
-#endif
-
diff --git a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h b/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
deleted file mode 100644
index 959a8119b..000000000
--- a/package/kodi/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2014 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#if defined (_LINUX)
-#include "powermanagement/IPowerSyscall.h"
-
-class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
-{
-public:
-  CLinuxPowerSyscall();
-  ~CLinuxPowerSyscall();
-
-  virtual bool Powerdown();
-  virtual bool Suspend(void) { return false; }
-  virtual bool Hibernate(void) { return false; }
-  virtual bool Reboot();
-
-  virtual bool CanPowerdown(void) { return true; }
-  virtual bool CanSuspend(void) { return false; }
-  virtual bool CanHibernate(void) { return false; }
-  virtual bool CanReboot(void) { return true; }
-  virtual int  BatteryLevel(void);
-
-  virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
-};
-#endif
-
diff --git a/package/xbmc-imx6/Makefile b/package/xbmc-imx6/Makefile
deleted file mode 100644
index 27162332f..000000000
--- a/package/xbmc-imx6/Makefile
+++ /dev/null
@@ -1,173 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		xbmc-imx6
-PKG_VERSION:=		13.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		1998e1c767e358e4df8b6a578f54a8d2
-PKG_DESCR:=		software media player (imx6 flavour)
-PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
-PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad libdbus
-PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
-PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
-PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng libncurses
-PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
-PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		libgpg-error libudev python2-mod-sqlite ffmpeg
-PKG_DEPENDS+=		libxslt libvorbisenc alsa-lib glib libglu librt
-PKG_BUILDDEP:=		boost python2 mesalib libglew libass
-PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis
-PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
-PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
-PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug
-PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis
-PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
-PKG_BUILDDEP+=		zip-host unzip-host ffmpeg
-PKG_DEPENDS+=		libfslvpuwrap gpu-viv-bin-mx6q
-PKG_BUILDDEP+=		libfslvpuwrap gpu-viv-bin-mx6q
-PKG_URL:=		http://xbmc.org/
-PKG_SITES:=		http://www.openadk.org/distfiles/
-
-PKG_FLAVOURS_XBMC_IMX6:=	WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
-PKG_FLAVOURS_XBMC_IMX6+=	WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY
-
-PKGFD_WITH_SMB:=	enable samba support
-PKGFB_WITH_SMB:=	samba
-PKGFS_WITH_SMB:=	samba-lib
-PKGFD_WITH_NFS:=	enable nfs support
-PKGFB_WITH_NFS:=	libnfs
-PKGFS_WITH_NFS:=	libnfs
-PKGFD_WITH_SSH:=	enable ssh support
-PKGFB_WITH_SSH:=	libssh
-PKGFS_WITH_SSH:=	libssh
-PKGFD_WITH_AVAHI:=	enable avahi support
-PKGFB_WITH_AVAHI:=	avahi
-PKGFS_WITH_AVAHI:=	libavahi
-PKGFD_WITH_CEC:=	enable cec support
-PKGFB_WITH_CEC:=	libcec
-PKGFS_WITH_CEC:=	libcec
-PKGFD_WITH_AFP:=	enable afp support
-PKGFB_WITH_AFP:=	afpfs-ng
-PKGFS_WITH_AFP:=	libafpclient
-PKGFD_WITH_RTMP:=	enable rtmp support
-PKGFB_WITH_RTMP:=	rtmpdump
-PKGFS_WITH_RTMP:=	librtmp
-PKGFD_WITH_BLURAY:=	enable bluray support
-PKGFB_WITH_BLURAY:=	libbluray
-PKGFS_WITH_BLURAY:=	libbluray
-PKGFD_WITH_WEBSERVER:=	enable internal webserver support
-
-PKG_SYSTEM_DEPENDS:=	solidrun-imx6
-
-DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
-			aclocal.m4 config.h.in
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,XBMC_IMX6,xbmc-imx6,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-HOST_CXXFLAGS+=		$(HOST_CPPFLAGS)
-XAKE_FLAGS+=		V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I. -I./utils \
-			-I$(STAGING_TARGET_DIR)/usr/include/afpfs-ng \
-			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DLINUX
-
-AUTOTOOL_STYLE:=	autoreconf
-CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
-			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
-CONFIGURE_ARGS+=	--disable-optical-drive \
-			--disable-optimizations \
-			--disable-mysql \
-			--disable-rsxs \
-			--disable-projectm \
-			--disable-crystalhd \
-			--disable-mdnsembedded \
-			--disable-libusb \
-			--disable-libcap \
-			--disable-joystick \
-			--disable-dvdcss \
-			--disable-debug \
-			--disable-gtest \
-			--disable-ccache \
-			--disable-wayland \
-			--disable-pulse \
-			--disable-mid \
-			--enable-alsa \
-			--enable-libmp3lame \
-			--enable-libvorbisenc \
-			--enable-udev \
-			--enable-external-libraries
-
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_BLURAY),)
-CONFIGURE_ARGS+=	--enable-libbluray
-else
-CONFIGURE_ARGS+=	--disable-libbluray
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_AFP),)
-CONFIGURE_ARGS+=	--enable-afpclient
-else
-CONFIGURE_ARGS+=	--disable-afpclient
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_SMB),)
-CONFIGURE_ARGS+=	--enable-samba
-else
-CONFIGURE_ARGS+=	--disable-samba
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_SSH),)
-CONFIGURE_ARGS+=	--enable-ssh
-else
-CONFIGURE_ARGS+=	--disable-ssh
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_NFS),)
-CONFIGURE_ARGS+=	--enable-nfs
-else
-CONFIGURE_ARGS+=	--disable-nfs
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_CEC),)
-CONFIGURE_ARGS+=	--enable-libcec
-else
-CONFIGURE_ARGS+=	--disable-libcec
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_RTMP),)
-CONFIGURE_ARGS+=	--enable-rtmp
-else
-CONFIGURE_ARGS+=	--disable-rtmp
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_AVAHI),)
-CONFIGURE_ARGS+=	--enable-avahi
-else
-CONFIGURE_ARGS+=	--disable-avahi
-endif
-ifneq ($(ADK_PACKAGE_XBMC_IMX6_WITH_WEBSERVER),)
-CONFIGURE_ARGS+=	--enable-webserver
-else
-CONFIGURE_ARGS+=	--disable-webserver
-endif
-
-CONFIGURE_ARGS+=	--disable-x11 \
-			--disable-sdl \
-			--disable-external-ffmpeg \
-			--enable-debug \
-			--enable-gles \
-			--enable-neon \
-			--enable-codec=imxvpu
-
-pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
-
-xbmc-imx6-install:
-	$(INSTALL_DIR) $(IDIR_XBMC_IMX6)/usr/lib/xbmc/addons
-	$(CP) $(WRKINST)/usr/lib/xbmc/* \
-		$(IDIR_XBMC_IMX6)/usr/lib/xbmc
-	$(INSTALL_DIR) $(IDIR_XBMC_IMX6)/usr/share/xbmc
-	$(CP) $(WRKINST)/usr/share/xbmc/* \
-		$(IDIR_XBMC_IMX6)/usr/share/xbmc
-	$(INSTALL_DIR) $(IDIR_XBMC_IMX6)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/xbmc \
-		$(IDIR_XBMC_IMX6)/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xbmc-imx6/files/xbmc.init b/package/xbmc-imx6/files/xbmc.init
deleted file mode 100644
index bbe65c1c2..000000000
--- a/package/xbmc-imx6/files/xbmc.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#PKG xbmc 
-#INIT 95
-
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${xbmc:-NO}" = x"NO" && exit 0
-	test x"$xbmc" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-	exec sh $0 start
-	;;
-start)
-	export LD_LIBRARY_PATH=/opt/vc/lib
-	xbmc &
-	;;
-stop)
-	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?
diff --git a/package/xbmc-imx6/files/xbmc.postinst b/package/xbmc-imx6/files/xbmc.postinst
deleted file mode 100644
index 45274da68..000000000
--- a/package/xbmc-imx6/files/xbmc.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf xbmc NO
diff --git a/package/xbmc-imx6/patches/patch-Makefile_include_in b/package/xbmc-imx6/patches/patch-Makefile_include_in
deleted file mode 100644
index e73d0b4c7..000000000
--- a/package/xbmc-imx6/patches/patch-Makefile_include_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc-imx6-13.2.orig/Makefile.include.in	2014-09-02 13:26:10.000000000 +0200
-+++ xbmc-imx6-13.2/Makefile.include.in	2014-09-02 20:41:40.075316050 +0200
-@@ -32,6 +32,7 @@ CC=@CC@
- CXXFLAGS+=@CXXFLAGS@
- CFLAGS+=@CFLAGS@
- LDFLAGS+=@LDFLAGS@
-+INCLUDES+=@CPPFLAGS@
- INCLUDES+=-I@abs_top_srcdir@/lib
- INCLUDES+=-I@abs_top_srcdir@/xbmc
- INCLUDES+=$(sort @INCLUDES@)
diff --git a/package/xbmc-imx6/patches/patch-configure_in b/package/xbmc-imx6/patches/patch-configure_in
deleted file mode 100644
index 1360492e4..000000000
--- a/package/xbmc-imx6/patches/patch-configure_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-imx6-13.2.orig/configure.in	2014-09-02 13:26:12.000000000 +0200
-+++ xbmc-imx6-13.2/configure.in	2014-09-04 16:22:35.671588472 +0200
-@@ -553,7 +553,7 @@ OBJDUMP="${OBJDUMP:-objdump}"
- # so we have to use our own var here
- # defaults to the build side target_os
- # and should be overridden for cross below (see android)
--ffmpeg_target_os=$(tolower $(uname -s))
-+ffmpeg_target_os=linux
- 
- # host detection and setup
- case $host in
diff --git a/package/xbmc-imx6/patches/patch-lib_cpluff_Makefile_am b/package/xbmc-imx6/patches/patch-lib_cpluff_Makefile_am
deleted file mode 100644
index fb70c6993..000000000
--- a/package/xbmc-imx6/patches/patch-lib_cpluff_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/Makefile.am	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/Makefile.am	2014-05-05 13:03:15.329450196 +0200
-@@ -6,7 +6,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = libcpluff loader console po test docsrc doc
-+SUBDIRS = libcpluff loader console test docsrc doc
- DIST_SUBDIRS = $(SUBDIRS) examples
- 
- EXTRA_DIST = COPYRIGHT.txt INSTALL.txt ChangeLog.txt Roadmap.txt autogen.sh plugin.xsd
diff --git a/package/xbmc-imx6/patches/patch-lib_cpluff_autogen_sh b/package/xbmc-imx6/patches/patch-lib_cpluff_autogen_sh
deleted file mode 100644
index 24a84ea38..000000000
--- a/package/xbmc-imx6/patches/patch-lib_cpluff_autogen_sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/autogen.sh	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/autogen.sh	2014-05-05 12:15:29.307227206 +0200
-@@ -15,7 +15,6 @@ fi
- 
- # Generate files in top level directory
- cd "$basedir"
--autopoint
- rm -f ABOUT-NLS
- test -d auxliary || mkdir auxliary
- libtoolize --automake -f
diff --git a/package/xbmc-imx6/patches/patch-lib_cpluff_configure_ac b/package/xbmc-imx6/patches/patch-lib_cpluff_configure_ac
deleted file mode 100644
index d38754bfd..000000000
--- a/package/xbmc-imx6/patches/patch-lib_cpluff_configure_ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/configure.ac	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/configure.ac	2014-05-05 13:03:32.437577723 +0200
-@@ -46,8 +46,6 @@ AC_SUBST([CP_CXX_LIB_VERSION])
- # -----------------------
- AM_INIT_AUTOMAKE([foreign])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.16.1])
- 
- # C/C++ compiler settings
- # -------------------
diff --git a/package/xbmc-imx6/patches/patch-lib_cpluff_libcpluff_Makefile_am b/package/xbmc-imx6/patches/patch-lib_cpluff_libcpluff_Makefile_am
deleted file mode 100644
index ffa9a1529..000000000
--- a/package/xbmc-imx6/patches/patch-lib_cpluff_libcpluff_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/libcpluff/Makefile.am	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/libcpluff/Makefile.am	2014-05-05 13:53:11.766461900 +0200
-@@ -6,7 +6,7 @@
- 
- SUBDIRS = docsrc
- 
--LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@ @LIBS@
-+LIBS = @LIBS_LIBCPLUFF@ @LIBS@
- 
- CPPFLAGS = @CPPFLAGS@
- CPPFLAGS += -I. -DCP_C_API=CP_EXPORT -DCP_HOST="\"$(host)\"" -DCP_DATADIR="\"$(datadir)\""
diff --git a/package/xbmc-imx6/patches/patch-m4_ax_python_devel_m4 b/package/xbmc-imx6/patches/patch-m4_ax_python_devel_m4
deleted file mode 100644
index ded81dbd5..000000000
--- a/package/xbmc-imx6/patches/patch-m4_ax_python_devel_m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/m4/ax_python_devel.m4	2014-04-30 15:43:58.000000000 +0200
-+++ xbmc-13.0rc1/m4/ax_python_devel.m4	2014-05-02 08:03:10.000000000 +0200
-@@ -298,7 +298,7 @@ EOD`
- 	# save current global flags
- 	ac_save_LIBS="$LIBS"
- 	ac_save_CPPFLAGS="$CPPFLAGS"
--	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
-+	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
- 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
- 	AC_LANG_PUSH([C])
- 	AC_LINK_IFELSE([
diff --git a/package/xbmc-imx6/patches/patch-xbmc_Application_cpp b/package/xbmc-imx6/patches/patch-xbmc_Application_cpp
deleted file mode 100644
index 6e89843c4..000000000
--- a/package/xbmc-imx6/patches/patch-xbmc_Application_cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- xbmc-imx6-13.2.orig/xbmc/Application.cpp	2014-09-02 13:26:21.000000000 +0200
-+++ xbmc-imx6-13.2/xbmc/Application.cpp	2014-09-02 20:38:02.102270928 +0200
-@@ -656,7 +656,7 @@ bool CApplication::Create()
- 
-   if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()))
-   {
--    fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n",
-+    fprintf(stderr,"Could not init logging classes. Permission errors on %s\n",
-       CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str());
-     return false;
-   }
-@@ -1023,10 +1023,13 @@ bool CApplication::InitDirectoriesLinux(
-     userName = "root";
- 
-   CStdString userHome;
-+  userHome = "/data/xbmc";
-+/*
-   if (getenv("HOME"))
-     userHome = getenv("HOME");
-   else
-     userHome = "/root";
-+*/
- 
-   CStdString xbmcBinPath, xbmcPath;
-   CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
-@@ -1058,11 +1061,11 @@ bool CApplication::InitDirectoriesLinux(
-     // map our special drives
-     CSpecialProtocol::SetXBMCBinPath(xbmcBinPath);
-     CSpecialProtocol::SetXBMCPath(xbmcPath);
--    CSpecialProtocol::SetHomePath(userHome + "/.xbmc");
--    CSpecialProtocol::SetMasterProfilePath(userHome + "/.xbmc/userdata");
-+    CSpecialProtocol::SetHomePath(userHome);
-+    CSpecialProtocol::SetMasterProfilePath(userHome + "/userdata");
- 
--    CStdString strTempPath = userHome;
--    strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp");
-+    CStdString strTempPath = "/tmp";
-+    strTempPath = URIUtils::AddFileToFolder(strTempPath, "/xbmc");
-     if (getenv("XBMC_TEMP"))
-       strTempPath = getenv("XBMC_TEMP");
-     CSpecialProtocol::SetTempPath(strTempPath);
diff --git a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp b/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp
deleted file mode 100644
index 38b8da9db..000000000
--- a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-imx6-13.2.orig/xbmc/cores/dvdplayer/DVDAudio.cpp	2014-09-02 13:26:21.000000000 +0200
-+++ xbmc-imx6-13.2/xbmc/cores/dvdplayer/DVDAudio.cpp	2014-09-04 15:11:42.682094168 +0200
-@@ -117,7 +117,7 @@ CDVDAudio::~CDVDAudio()
-   free(m_pBuffer);
- }
- 
--bool CDVDAudio::Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler)
-+bool CDVDAudio::Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler)
- {
-   CLog::Log(LOGNOTICE,
-     "Creating audio stream (codec id: %i, channels: %i, sample rate: %i, %s)",
diff --git a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h b/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h
deleted file mode 100644
index a6a9db69a..000000000
--- a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDAudio_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-imx6-13.2.orig/xbmc/cores/dvdplayer/DVDAudio.h	2014-09-02 13:26:21.000000000 +0200
-+++ xbmc-imx6-13.2/xbmc/cores/dvdplayer/DVDAudio.h	2014-09-04 15:10:58.865853789 +0200
-@@ -76,7 +76,7 @@ public:
-   float GetCurrentAttenuation();
-   void Pause();
-   void Resume();
--  bool Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler);
-+  bool Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler);
-   bool IsValidFormat(const DVDAudioFrame &audioframe);
-   void Destroy();
-   DWORD AddPackets(const DVDAudioFrame &audioframe);
diff --git a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h b/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h
deleted file mode 100644
index f9e6d0a87..000000000
--- a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemux_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- xbmc-imx6-13.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2014-09-02 13:26:21.000000000 +0200
-+++ xbmc-imx6-13.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2014-09-04 15:09:09.261253674 +0200
-@@ -88,7 +88,7 @@ public:
-   {
-     iId = 0;
-     iPhysicalId = 0;
--    codec = (CodecID)0; // CODEC_ID_NONE
-+    codec = (AVCodecID)0; // CODEC_ID_NONE
-     codec_fourcc = 0;
-     profile = FF_PROFILE_UNKNOWN;
-     level = 0;
-@@ -118,7 +118,7 @@ public:
- 
-   int iId;         // most of the time starting from 0
-   int iPhysicalId; // id
--  CodecID codec;
-+  AVCodecID codec;
-   unsigned int codec_fourcc; // if available
-   int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders.
-   int level;   // encoder level of the stream reported by the decoder. used to qualify hw decoders.
diff --git a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h b/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h
deleted file mode 100644
index 6df572da3..000000000
--- a/package/xbmc-imx6/patches/patch-xbmc_cores_dvdplayer_DVDStreamInfo_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-imx6-13.2.orig/xbmc/cores/dvdplayer/DVDStreamInfo.h	2014-09-02 13:26:21.000000000 +0200
-+++ xbmc-imx6-13.2/xbmc/cores/dvdplayer/DVDStreamInfo.h	2014-09-04 15:11:27.778012372 +0200
-@@ -55,7 +55,7 @@ public:
-   void Assign(const CDVDStreamInfo &right, bool withextradata);
-   void Assign(const CDemuxStream &right, bool withextradata);
- 
--  CodecID codec;
-+  AVCodecID codec;
-   StreamType type;
-   bool software;  //force software decoding
- 
diff --git a/package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp b/package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
deleted file mode 100644
index 4b8b25efb..000000000
--- a/package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *      Copyright (C) 2014 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
- 
-#if defined (_LINUX)
-
-#include <stdlib.h>
-#include "LinuxPowerSyscall.h"
-#include "utils/log.h"
-
-CLinuxPowerSyscall::CLinuxPowerSyscall()
-{ 
-      CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
-}
-
-CLinuxPowerSyscall::~CLinuxPowerSyscall()
-{ }
-
-bool CLinuxPowerSyscall::Powerdown()
-{
-  system("/sbin/poweroff -F");
-  return 0;
-}
-
-bool CLinuxPowerSyscall::Reboot()
-{
-  system("/sbin/reboot -F");
-  return 0;
-}
-
-int CLinuxPowerSyscall::BatteryLevel(void)
-{ }
-
-bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
-{    
-  return true;
-}
-
-#endif
-
diff --git a/package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h b/package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
deleted file mode 100644
index 959a8119b..000000000
--- a/package/xbmc-imx6/src/xbmc/powermanagement/linux/LinuxPowerSyscall.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2014 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#if defined (_LINUX)
-#include "powermanagement/IPowerSyscall.h"
-
-class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
-{
-public:
-  CLinuxPowerSyscall();
-  ~CLinuxPowerSyscall();
-
-  virtual bool Powerdown();
-  virtual bool Suspend(void) { return false; }
-  virtual bool Hibernate(void) { return false; }
-  virtual bool Reboot();
-
-  virtual bool CanPowerdown(void) { return true; }
-  virtual bool CanSuspend(void) { return false; }
-  virtual bool CanHibernate(void) { return false; }
-  virtual bool CanReboot(void) { return true; }
-  virtual int  BatteryLevel(void);
-
-  virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
-};
-#endif
-
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
deleted file mode 100644
index 25c82297a..000000000
--- a/package/xbmc/Makefile
+++ /dev/null
@@ -1,198 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		xbmc
-PKG_VERSION:=		13.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		d80153b2cc78b88966458ab136e9494f
-PKG_DESCR:=		software media player
-PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
-PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad libdbus
-PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
-PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
-PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng libncurses
-PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
-PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		libgpg-error libudev python2-mod-sqlite
-PKG_DEPENDS+=		libxslt libvorbisenc alsa-lib glib libglu librt
-PKG_BUILDDEP:=		boost python2 mesalib libglew libass
-PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis
-PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
-PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
-PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug
-PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis
-PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
-PKG_BUILDDEP+=		zip-host unzip-host
-PKG_URL:=		http://xbmc.org/
-PKG_SITES:=		https://github.com/xbmc/xbmc/archive/
-
-DISTFILES:=		${PKG_VERSION}-Gotham.tar.gz
-WRKDIST=		$(WRKDIR)/$(PKG_NAME)-${PKG_VERSION}-Gotham
-
-PKG_FLAVOURS_XBMC:=	WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
-PKG_FLAVOURS_XBMC+=	WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY
-
-PKGFD_WITH_SMB:=	enable samba support
-PKGFB_WITH_SMB:=	samba
-PKGFS_WITH_SMB:=	samba-lib
-PKGFD_WITH_NFS:=	enable nfs support
-PKGFB_WITH_NFS:=	libnfs
-PKGFS_WITH_NFS:=	libnfs
-PKGFD_WITH_SSH:=	enable ssh support
-PKGFB_WITH_SSH:=	libssh
-PKGFS_WITH_SSH:=	libssh
-PKGFD_WITH_AVAHI:=	enable avahi support
-PKGFB_WITH_AVAHI:=	avahi
-PKGFS_WITH_AVAHI:=	libavahi
-PKGFD_WITH_CEC:=	enable cec support
-PKGFB_WITH_CEC:=	libcec
-PKGFS_WITH_CEC:=	libcec
-PKGFD_WITH_AFP:=	enable afp support
-PKGFB_WITH_AFP:=	afpfs-ng
-PKGFS_WITH_AFP:=	libafpclient
-PKGFD_WITH_RTMP:=	enable rtmp support
-PKGFB_WITH_RTMP:=	rtmpdump
-PKGFS_WITH_RTMP:=	librtmp
-PKGFD_WITH_BLURAY:=	enable bluray support
-PKGFB_WITH_BLURAY:=	libbluray
-PKGFS_WITH_BLURAY:=	libbluray
-PKGFD_WITH_WEBSERVER:=	enable internal webserver support
-
-PKG_DEPENDS_IBM_X40:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice
-PKG_DEPENDS_VBOX_X86:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice
-PKG_BUILDDEP_IBM_X40:=	nasm-host sdl sdl-image
-PKG_BUILDDEP_VBOX_X86:=	nasm-host sdl sdl-image
-PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
-PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
-PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40 vbox-x86
-
-DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
-			aclocal.m4 config.h.in
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-HOST_CXXFLAGS+=		$(HOST_CPPFLAGS)
-XAKE_FLAGS+=		V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I. -I./utils \
-			-I$(STAGING_TARGET_DIR)/usr/include/afpfs-ng \
-			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DLINUX
-
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/opt/vc/include \
-			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \
-			-I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/opt/vc/lib -lkhrn_static
-endif
-
-AUTOTOOL_STYLE:=	autoreconf
-CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
-			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
-CONFIGURE_ARGS+=	--disable-optical-drive \
-			--disable-optimizations \
-			--disable-mysql \
-			--disable-rsxs \
-			--disable-projectm \
-			--disable-crystalhd \
-			--disable-mdnsembedded \
-			--disable-libusb \
-			--disable-libcap \
-			--disable-joystick \
-			--disable-dvdcss \
-			--disable-debug \
-			--disable-gtest \
-			--disable-ccache \
-			--disable-wayland \
-			--disable-pulse \
-			--disable-mid \
-			--enable-alsa \
-			--enable-libmp3lame \
-			--enable-libvorbisenc \
-			--enable-udev \
-			--enable-external-libraries
-
-ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),)
-CONFIGURE_ARGS+=	--enable-libbluray
-else
-CONFIGURE_ARGS+=	--disable-libbluray
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_AFP),)
-CONFIGURE_ARGS+=	--enable-afpclient
-else
-CONFIGURE_ARGS+=	--disable-afpclient
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_SMB),)
-CONFIGURE_ARGS+=	--enable-samba
-else
-CONFIGURE_ARGS+=	--disable-samba
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_SSH),)
-CONFIGURE_ARGS+=	--enable-ssh
-else
-CONFIGURE_ARGS+=	--disable-ssh
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_NFS),)
-CONFIGURE_ARGS+=	--enable-nfs
-else
-CONFIGURE_ARGS+=	--disable-nfs
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_CEC),)
-CONFIGURE_ARGS+=	--enable-libcec
-else
-CONFIGURE_ARGS+=	--disable-libcec
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_RTMP),)
-CONFIGURE_ARGS+=	--enable-rtmp
-else
-CONFIGURE_ARGS+=	--disable-rtmp
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_AVAHI),)
-CONFIGURE_ARGS+=	--enable-avahi
-else
-CONFIGURE_ARGS+=	--disable-avahi
-endif
-ifneq ($(ADK_PACKAGE_XBMC_WITH_WEBSERVER),)
-CONFIGURE_ARGS+=	--enable-webserver
-else
-CONFIGURE_ARGS+=	--disable-webserver
-endif
-
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
-			--enable-player=omxplayer \
-			--enable-gles \
-			--disable-sdl \
-			--disable-x11
-else
-ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
-CONFIGURE_ARGS+=	--disable-x11 \
-			--disable-sdl \
-			--disable-gles \
-			--enable-neon \
-			--enable-codec=imxvpu
-else
-CONFIGURE_ARGS+=	--enable-x11 \
-			--enable-sdl
-endif
-endif
-
-pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
-
-xbmc-install:
-	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc/addons
-	$(CP) $(WRKINST)/usr/lib/xbmc/* \
-		$(IDIR_XBMC)/usr/lib/xbmc
-	$(INSTALL_DIR) $(IDIR_XBMC)/usr/share/xbmc
-	$(CP) $(WRKINST)/usr/share/xbmc/* \
-		$(IDIR_XBMC)/usr/share/xbmc
-	$(INSTALL_DIR) $(IDIR_XBMC)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/xbmc \
-		$(IDIR_XBMC)/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xbmc/files/xbmc.init b/package/xbmc/files/xbmc.init
deleted file mode 100644
index bbe65c1c2..000000000
--- a/package/xbmc/files/xbmc.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#PKG xbmc 
-#INIT 95
-
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${xbmc:-NO}" = x"NO" && exit 0
-	test x"$xbmc" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-	exec sh $0 start
-	;;
-start)
-	export LD_LIBRARY_PATH=/opt/vc/lib
-	xbmc &
-	;;
-stop)
-	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?
diff --git a/package/xbmc/files/xbmc.postinst b/package/xbmc/files/xbmc.postinst
deleted file mode 100644
index 45274da68..000000000
--- a/package/xbmc/files/xbmc.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf xbmc NO
diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in
deleted file mode 100644
index e2c85f7a2..000000000
--- a/package/xbmc/patches/patch-Makefile_in
+++ /dev/null
@@ -1,92 +0,0 @@
---- xbmc-13.1.orig/Makefile.in	2014-06-12 10:26:27.000000000 +0200
-+++ xbmc-13.1/Makefile.in	2014-06-26 15:18:53.463409058 +0200
-@@ -191,13 +191,7 @@ ifeq (@USE_LIBAV_HACKS@,1)
- DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a
- endif
- 
--PAPCODECS_DIRS= \
--	lib/nosefart \
--	lib/timidity \
--	lib/libsidplay2 \
--	lib/stsound/StSoundLibrary \
--	lib/snesapu/SNES/SNESAPU \
--	lib/vgmstream
-+PAPCODECS_DIRS=
- 
- ifeq (@USE_ASAP_CODEC@,1)
- PAPCODECS_DIRS+= \
-@@ -419,21 +413,11 @@ libhdhomerun: dllloader
- 	$(MAKE) -C lib/libhdhomerun
- papcodecs: dllloader dvdpcodecs
- 	test -d system/players/paplayer || mkdir system/players/paplayer
--	$(MAKE) -C lib/vgmstream
--	$(MAKE) -C lib/timidity
--	$(MAKE) -C lib/nosefart
--ifneq ($(findstring arm-osx,@ARCH@), arm-osx)
--	$(MAKE) -C lib/libsidplay2
--endif
- ifeq (@USE_ASAP_CODEC@,1)
-   ifneq ($(findstring osx,@ARCH@), osx)
- 	$(MAKE) -C lib/asap asap-xbmc
-   endif
- endif
--	$(MAKE) -C lib/stsound/StSoundLibrary
--ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),)
--	$(MAKE) -C lib/snesapu/SNES/SNESAPU
--endif
- imagelib: dllloader
- 	$(MAKE) -C lib/cximage-6.0
- 
-@@ -586,25 +570,7 @@ install-arch:
- ifeq (@USE_PVR_ADDONS@,1)
- 	$(MAKE) -C pvr-addons install
- endif
--ifeq ($(findstring freebsd,@ARCH@), freebsd)
--	@find -E system addons -type f -not -iregex ".*svn.*" \
--		-iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
--		-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
--		-and \
--		-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
--		-exec printf " -- %-75.75s\r" "{}" \;
--else
--ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
--	@find -E system addons -type f -not -iregex ".*svn.*" \
--		-iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
--		-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
--		-and \
--		-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
--		-exec printf " -- %-75.75s\r" "{}" \;
--else
- 	@find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
--endif
--endif
- 
- install-scripts:
- 	@install -d $(DESTDIR)$(bindir)
-@@ -624,26 +590,7 @@ install-datas: install-scripts
- 	@echo "Done!"
- 	@echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc"
- 	@install -d $(DESTDIR)$(datarootdir)/xbmc
--	@# Arch independent files
--ifeq ($(findstring bsd,@ARCH@), bsd)
--	@find -E addons language media sounds userdata system -type f \
--		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
--		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
--		-and \
--		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
--		-exec printf " -- %-75.75s\r" "{}" \;
--else
--ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
--	@find -E addons language media sounds userdata system -type f \
--		-not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" \
--		-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
--		-and \
--		-exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \
--		-exec printf " -- %-75.75s\r" "{}" \;
--else
- 	@find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
--endif
--endif
- 	@# Icons and links
- 	@install -d $(DESTDIR)$(datarootdir)/applications
- 	@install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
diff --git a/package/xbmc/patches/patch-Makefile_include_in b/package/xbmc/patches/patch-Makefile_include_in
deleted file mode 100644
index d73f62de2..000000000
--- a/package/xbmc/patches/patch-Makefile_include_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc-13.1.orig/Makefile.include.in	2014-06-08 08:40:24.000000000 +0200
-+++ xbmc-13.1/Makefile.include.in	2014-06-11 13:17:49.354722974 +0200
-@@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@
- CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
- LDFLAGS+=@LDFLAGS@
- LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
-+INCLUDES+=@CPPFLAGS@
- INCLUDES+=-I@abs_top_srcdir@/lib
- INCLUDES+=-I@abs_top_srcdir@/xbmc
- INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in
deleted file mode 100644
index ed9d8fa83..000000000
--- a/package/xbmc/patches/patch-configure_in
+++ /dev/null
@@ -1,76 +0,0 @@
---- xbmc-13.1.orig/configure.in	2014-06-12 10:25:21.000000000 +0200
-+++ xbmc-13.1/configure.in	2014-06-26 20:29:26.343281621 +0200
-@@ -601,7 +601,7 @@ MAKE="${MAKE:-make}"
- OBJDUMP="${OBJDUMP:-objdump}"
- 
- use_external_ffmpeg=no
--use_static_ffmpeg=no
-+use_static_ffmpeg=yes
- 
- # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
- # there is no autoconf variable which will give
-@@ -609,7 +609,7 @@ use_static_ffmpeg=no
- # so we have to use our own var here
- # defaults to the build side target_os
- # and should be overridden for cross below (see android)
--ffmpeg_target_os=$(tolower $(uname -s))
-+ffmpeg_target_os=linux
- 
- # host detection and setup
- case $host in
-@@ -626,7 +626,7 @@ case $host in
-      use_x11=no
-      build_shared_lib=yes    
-      ;;
--  i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
-+  i*86*-linux-*)
-      ARCH="i486-linux"
-      if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
-         use_arch="x86"
-@@ -634,7 +634,7 @@ case $host in
-      fi
-      use_static_ffmpeg=yes
-      ;;
--  x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
-+  x86_64-*-linux-*)
-      ARCH="x86_64-linux"
-      if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
-         use_arch="x86_64"
-@@ -680,13 +680,13 @@ case $host in
-      ARCH="powerpc-osx"
-      use_arch="ppc"
-      ;;
--  powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
-+  powerpc-*-linux-*)
-      ARCH="powerpc-linux"
-      ;;
--  powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
-+  powerpc64-*-linux-*)
-      ARCH="powerpc64-linux"
-      ;;
--  arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
-+  arm*-*-linux-*)
-      ARCH="arm"
-      use_arch="arm"
-      ffmpeg_target_os=linux
-@@ -1048,7 +1048,7 @@ if test "$use_gles" = "yes"; then
-       AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
-       AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
-       AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
--      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
-+      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm"
-     else
-       AC_CHECK_LIB([EGL],   [main],, AC_MSG_ERROR($missing_library))
-       AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
-@@ -2532,11 +2532,8 @@ OUTPUT_FILES="Makefile \
-     xbmc/cores/AudioEngine/Makefile \
-     xbmc/cores/paplayer/Makefile \
-     xbmc/cores/omxplayer/Makefile \
--    lib/timidity/Makefile \
-     lib/asap/Makefile \
--    lib/nosefart/Makefile \
-     lib/libsidplay2/Makefile \
--    lib/vgmstream/Makefile \
-     lib/snesapu/SNES/SNESAPU/Makefile \
-     lib/stsound/StSoundLibrary/Makefile \
-     xbmc/cores/playercorefactory/Makefile \
diff --git a/package/xbmc/patches/patch-lib_cpluff_Makefile_am b/package/xbmc/patches/patch-lib_cpluff_Makefile_am
deleted file mode 100644
index fb70c6993..000000000
--- a/package/xbmc/patches/patch-lib_cpluff_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/Makefile.am	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/Makefile.am	2014-05-05 13:03:15.329450196 +0200
-@@ -6,7 +6,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = libcpluff loader console po test docsrc doc
-+SUBDIRS = libcpluff loader console test docsrc doc
- DIST_SUBDIRS = $(SUBDIRS) examples
- 
- EXTRA_DIST = COPYRIGHT.txt INSTALL.txt ChangeLog.txt Roadmap.txt autogen.sh plugin.xsd
diff --git a/package/xbmc/patches/patch-lib_cpluff_autogen_sh b/package/xbmc/patches/patch-lib_cpluff_autogen_sh
deleted file mode 100644
index 24a84ea38..000000000
--- a/package/xbmc/patches/patch-lib_cpluff_autogen_sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/autogen.sh	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/autogen.sh	2014-05-05 12:15:29.307227206 +0200
-@@ -15,7 +15,6 @@ fi
- 
- # Generate files in top level directory
- cd "$basedir"
--autopoint
- rm -f ABOUT-NLS
- test -d auxliary || mkdir auxliary
- libtoolize --automake -f
diff --git a/package/xbmc/patches/patch-lib_cpluff_configure_ac b/package/xbmc/patches/patch-lib_cpluff_configure_ac
deleted file mode 100644
index d38754bfd..000000000
--- a/package/xbmc/patches/patch-lib_cpluff_configure_ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/configure.ac	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/configure.ac	2014-05-05 13:03:32.437577723 +0200
-@@ -46,8 +46,6 @@ AC_SUBST([CP_CXX_LIB_VERSION])
- # -----------------------
- AM_INIT_AUTOMAKE([foreign])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.16.1])
- 
- # C/C++ compiler settings
- # -------------------
diff --git a/package/xbmc/patches/patch-lib_cpluff_libcpluff_Makefile_am b/package/xbmc/patches/patch-lib_cpluff_libcpluff_Makefile_am
deleted file mode 100644
index ffa9a1529..000000000
--- a/package/xbmc/patches/patch-lib_cpluff_libcpluff_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-13.0rc1.orig/lib/cpluff/libcpluff/Makefile.am	2014-04-30 15:43:53.000000000 +0200
-+++ xbmc-13.0rc1/lib/cpluff/libcpluff/Makefile.am	2014-05-05 13:53:11.766461900 +0200
-@@ -6,7 +6,7 @@
- 
- SUBDIRS = docsrc
- 
--LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@