Merge branch 'master' of git+ssh://openadk.org/git/openadk

17 files changed, 0 insertions, 476 deletions

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
-