make kodi usable

4 files changed, 70 insertions, 17 deletions

diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 7d2335cab..4ffffbc18 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
-PKG_VERSION:=		14.0alpha3
+PKG_VERSION:=		14.0alpha4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		76951db1b343b118e6b2a4e7411fabd9
+PKG_MD5SUM:=		5bd39942150249d9eccf792d77b92554
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
@@ -63,11 +63,7 @@ PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
 PKG_DEPENDS_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
 PKG_BUILDDEP_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
-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_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40 vbox-x86 solidrun-imx6
+PKG_SYSTEM_DEPENDS:=	raspberry-pi solidrun-imx6
 
 DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
 			aclocal.m4 config.h.in
@@ -97,7 +93,6 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-mysql \
 			--disable-rsxs \
 			--disable-projectm \
-			--disable-crystalhd \
 			--disable-mdnsembedded \
 			--disable-libusb \
 			--disable-libcap \
@@ -110,11 +105,8 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-pulse \
 			--disable-mid \
 			--enable-alsa \
-			--enable-libmp3lame \
 			--enable-libvorbisenc \
-			--enable-udev \
-			--with-ffmpeg \
-			--enable-external-libraries
+			--enable-udev
 
 ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),)
 CONFIGURE_ARGS+=	--enable-libbluray
@@ -184,6 +176,11 @@ endif
 pre-configure:
 	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
 
+pre-build:
+	make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
+		CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+		 -C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder
+
 kodi-install:
 	$(INSTALL_DIR) $(IDIR_KODI)/usr/lib/xbmc/addons
 	$(CP) $(WRKINST)/usr/lib/xbmc/* \
diff --git a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in
new file mode 100644
index 000000000..1420f2c1b
--- /dev/null
+++ b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in
@@ -0,0 +1,43 @@
+--- 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-05 18:56:32.792578871 +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
+@@ -100,31 +100,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
index 906ba1222..b8a942c03 100644
--- a/package/kodi/patches/patch-xbmc_Application_cpp
+++ b/package/kodi/patches/patch-xbmc_Application_cpp
@@ -1,6 +1,6 @@
---- xbmc-13.1.orig/xbmc/Application.cpp	2014-06-08 08:40:26.000000000 +0200
-+++ xbmc-13.1/xbmc/Application.cpp	2014-06-08 09:42:40.232780377 +0200
-@@ -682,7 +682,7 @@ bool CApplication::Create()
+--- kodi-14.0alpha4.orig/xbmc/Application.cpp	2014-09-05 14:09:59.000000000 +0200
++++ kodi-14.0alpha4/xbmc/Application.cpp	2014-09-05 15:48:59.475115902 +0200
+@@ -679,7 +679,7 @@ bool CApplication::Create()
  
    if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()))
    {
@@ -9,7 +9,7 @@
        CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str());
      return false;
    }
-@@ -1085,10 +1085,13 @@ bool CApplication::InitDirectoriesLinux(
+@@ -1090,10 +1090,13 @@ bool CApplication::InitDirectoriesLinux(
      userName = "root";
  
    CStdString userHome;
@@ -23,7 +23,7 @@
  
    CStdString xbmcBinPath, xbmcPath;
    CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
-@@ -1120,11 +1123,11 @@ bool CApplication::InitDirectoriesLinux(
+@@ -1125,11 +1128,11 @@ bool CApplication::InitDirectoriesLinux(
      // map our special drives
      CSpecialProtocol::SetXBMCBinPath(xbmcBinPath);
      CSpecialProtocol::SetXBMCPath(xbmcPath);
diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
new file mode 100644
index 000000000..0be4452a8
--- /dev/null
+++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp
@@ -0,0 +1,13 @@
+--- kodi-14.0alpha4.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-09-05 14:09:59.000000000 +0200
++++ kodi-14.0alpha4/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-09-05 15:53:47.432904545 +0200
+@@ -490,8 +490,8 @@ void CDVDDemuxFFmpeg::Reset()
+ void CDVDDemuxFFmpeg::Flush()
+ {
+   // naughty usage of an internal ffmpeg function
+-  if (m_pFormatContext)
+-    av_read_frame_flush(m_pFormatContext);
++  //if (m_pFormatContext)
++   // av_read_frame_flush(m_pFormatContext);
+ 
+   m_iCurrentPts = DVD_NOPTS_VALUE;
+