update to kodirc2 and libcec 2.2.0

3 files changed, 7 insertions, 107 deletions

diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 74a240bd2..08b230cc9 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
-PKG_VERSION:=		14.0alpha4
-PKG_RELEASE:=		5
-PKG_MD5SUM:=		88a68db6e653b2029efddbfa0a855e1c
+PKG_VERSION:=		14.0rc2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f56aeb81db6878fcac6631f6a3e2c702
 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+=		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
@@ -18,7 +18,7 @@ PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
 PKG_DEPENDS+=		libgpg-error libudev python2-mod-sqlite libffmpeg
 PKG_DEPENDS+=		libxslt libvorbisenc alsa-lib glib libglu librt
-PKG_BUILDDEP:=		boost python2 mesalib libglew libass ffmpeg
+PKG_BUILDDEP:=		boost python2 libass ffmpeg
 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 
@@ -61,8 +61,8 @@ 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_RASPBERRY_PI:=	bcm2835-vc libglew mesalib
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc libglew mesalib
 PKG_DEPENDS_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
 PKG_BUILDDEP_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
 PKG_SYSTEM_DEPENDS:=	raspberry-pi solidrun-imx6
diff --git a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in
deleted file mode 100644
index 30804493f..000000000
--- a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in
+++ /dev/null
@@ -1,59 +0,0 @@
---- kodi-14.0alpha4.orig/tools/Linux/xbmc.sh.in	2014-09-05 14:09:59.000000000 +0200
-+++ kodi-14.0alpha4/tools/Linux/xbmc.sh.in	2014-09-08 13:26:02.745294460 +0200
-@@ -58,7 +58,7 @@ single_stacktrace()
- 
- print_crash_report()
- {
--  FILE="$CRASHLOG_DIR/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
-+  FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
-   echo "############## XBMC CRASH LOG ###############" >> $FILE
-   echo >> $FILE
-   echo "################ SYSTEM INFO ################" >> $FILE
-@@ -70,15 +70,6 @@ print_crash_report()
-   echo -n " Kernel: " >> $FILE
-   uname -rvs >> $FILE
-   echo -n " Release: " >> $FILE
--  if [ -f /etc/os-release ]; then
--	  . /etc/os-release
--	  echo $NAME $VERSION >> $FILE
--  elif command_exists lsb_release; then
--    echo >> $FILE
--    lsb_release -a 2> /dev/null | sed -e 's/^/    /' >> $FILE
--  else
--    echo "lsb_release not available" >> $FILE
--  fi
-   echo "############## END SYSTEM INFO ##############" >> $FILE
-   echo >> $FILE
-   echo "############### STACK TRACE #################" >> $FILE
-@@ -100,31 +91,8 @@ print_crash_report()
-     echo "gdb not installed, can't get stack trace." >> $FILE
-   fi
-   echo "############# END STACK TRACE ###############" >> $FILE
--  echo >> $FILE
--  echo "################# LOG FILE ##################" >> $FILE
--  echo >> $FILE
--  if [ -f ~/.xbmc/temp/xbmc.log ]
--  then
--    cat ~/.xbmc/temp/xbmc.log >> $FILE
--    echo >> $FILE
--  else
--    echo "Logfile not found in the usual place." >> $FILE
--    echo "Please attach it seperately." >> $FILE
--    echo "Use pastebin.com or similar for forums or IRC." >> $FILE
--  fi
--  echo >> $FILE
--  echo "############### END LOG FILE ################" >> $FILE
--  echo >> $FILE
--  echo "############ END XBMC CRASH LOG #############" >> $FILE
--  echo "Crash report available at $FILE"
- }
- 
--python @datadir@/xbmc/FEH.py $SAVED_ARGS
--RET=$?
--if [ $RET -ne 0 ]; then
--  exit $RET
--fi
--
- if command_exists gdb; then
-   # Output warning in case ulimit is unsupported by shell
-   eval ulimit -c unlimited
diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp
deleted file mode 100644
index a90c36f89..000000000
--- a/package/kodi/patches/patch-xbmc_Application_cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- kodi-14.0alpha4.orig/xbmc/Application.cpp	2014-10-06 11:34:37.000000000 -0500
-+++ kodi-14.0alpha4/xbmc/Application.cpp	2014-10-08 01:25:47.880436000 -0500
-@@ -642,7 +642,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;
-   }
-@@ -1064,10 +1064,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");
-@@ -1099,11 +1102,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);