diff options
Diffstat (limited to 'package/kodi')
| -rw-r--r-- | package/kodi/Makefile | 37 | ||||
| -rw-r--r-- | package/kodi/files/kodi.init | 5 | ||||
| -rw-r--r-- | package/kodi/patches/patch-configure_in | 6 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_Linux_kodi_sh_in | 39 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_Linux_xbmc_sh_in | 59 | ||||
| -rw-r--r-- | package/kodi/patches/patch-xbmc_Application_cpp | 49 | ||||
| -rw-r--r-- | package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp | 8 | ||||
| -rw-r--r-- | package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp | 52 |
8 files changed, 131 insertions, 124 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 87d487894..c0e1866a9 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.0rc3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ab161aa0dee4ca77b977d3ca2f4ebdd5 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 @@ -105,9 +105,10 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --disable-wayland \ --disable-pulse \ --disable-mid \ + --disable-debug \ --enable-alsa \ --enable-libvorbisenc \ - --disable-debug \ + --enable-texturepacker \ --enable-udev \ --with-ffmpeg=shared @@ -173,23 +174,25 @@ CONFIGURE_ARGS+= --disable-x11 \ endif pre-configure: - (cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh) + (cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh) pre-build: - PATH=$(HOST_PATH) \ + PATH='$(HOST_PATH)' \ 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/* \ - $(IDIR_KODI)/usr/lib/xbmc - $(INSTALL_DIR) $(IDIR_KODI)/usr/share/xbmc - $(CP) $(WRKINST)/usr/share/xbmc/* \ - $(IDIR_KODI)/usr/share/xbmc + $(INSTALL_DIR) $(IDIR_KODI)/usr/lib/kodi/addons + $(CP) $(WRKINST)/usr/lib/kodi/* \ + $(IDIR_KODI)/usr/lib/kodi + $(INSTALL_DIR) $(IDIR_KODI)/usr/share/kodi + $(CP) $(WRKINST)/usr/share/kodi/* \ + $(IDIR_KODI)/usr/share/kodi $(INSTALL_DIR) $(IDIR_KODI)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/xbmc \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/kodi-standalone \ + $(IDIR_KODI)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/kodi \ $(IDIR_KODI)/usr/bin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index b15b1d6d4..6dddfd421 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -12,11 +12,10 @@ autostart) exec sh $0 start ;; start) - export LD_LIBRARY_PATH=/opt/vc/lib - xbmc & + kodi & ;; stop) - kill $(pgrep -f /usr/lib/xbmc/xbmc.bin) + kill $(pgrep -f /usr/lib/kodi/kodi.bin) ;; restart) sh $0 stop diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in index 3db5985c7..aab2c5057 100644 --- a/package/kodi/patches/patch-configure_in +++ b/package/kodi/patches/patch-configure_in @@ -1,6 +1,6 @@ ---- kodi-14.0alpha4.orig/configure.in 2014-10-06 11:34:24.000000000 -0500 -+++ kodi-14.0alpha4/configure.in 2014-10-08 01:40:53.444436000 -0500 -@@ -1011,7 +1011,7 @@ if test "$use_gles" = "yes"; then +--- kodi-14.0rc2.orig/configure.in 2014-12-05 19:38:42.000000000 -0600 ++++ kodi-14.0rc2/configure.in 2014-12-07 03:43:25.212418001 -0600 +@@ -1008,7 +1008,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.) diff --git a/package/kodi/patches/patch-tools_Linux_kodi_sh_in b/package/kodi/patches/patch-tools_Linux_kodi_sh_in new file mode 100644 index 000000000..2d0e188d1 --- /dev/null +++ b/package/kodi/patches/patch-tools_Linux_kodi_sh_in @@ -0,0 +1,39 @@ +--- kodi-14.0rc2.orig/tools/Linux/kodi.sh.in 2014-12-05 19:38:43.000000000 -0600 ++++ kodi-14.0rc2/tools/Linux/kodi.sh.in 2014-12-07 08:33:01.128418001 -0600 +@@ -86,15 +86,7 @@ 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 OpenADK >> $FILE + echo "############## END SYSTEM INFO ##############" >> $FILE + echo >> $FILE + echo "############### STACK TRACE #################" >> $FILE +@@ -138,19 +130,6 @@ print_crash_report() + } + + migrate_home +-python @datadir@/${bin_name}/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 +- if [ ! $? = "0" ]; then +- echo "${bin_name}: ulimit is unsupported by this shell" 1>&2 +- fi +-fi + + LOOP=1 + while [ $(( $LOOP )) = "1" ] 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 index a90c36f89..2235d9f8b 100644 --- a/package/kodi/patches/patch-xbmc_Application_cpp +++ b/package/kodi/patches/patch-xbmc_Application_cpp @@ -1,41 +1,14 @@ ---- 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( +--- kodi-14.0rc2.orig/xbmc/Application.cpp 2014-12-05 19:38:44.000000000 -0600 ++++ kodi-14.0rc2/xbmc/Application.cpp 2014-12-07 10:16:27.900418001 -0600 +@@ -1076,10 +1076,7 @@ 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"); + std::string userHome; +- if (getenv("HOME")) +- userHome = getenv("HOME"); +- else +- userHome = "/root"; ++ userHome = "/data/kodi"; -- 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); + std::string appBinPath, appPath; + std::string appName = CCompileInfo::GetAppName(); diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp index 0be4452a8..1660c5a36 100644 --- a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp +++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp @@ -1,6 +1,6 @@ ---- 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() +--- kodi-14.0rc2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-05 19:38:44.000000000 -0600 ++++ kodi-14.0rc2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-12-07 03:43:25.308418001 -0600 +@@ -520,8 +520,8 @@ void CDVDDemuxFFmpeg::Reset() void CDVDDemuxFFmpeg::Flush() { // naughty usage of an internal ffmpeg function @@ -9,5 +9,5 @@ + //if (m_pFormatContext) + // av_read_frame_flush(m_pFormatContext); - m_iCurrentPts = DVD_NOPTS_VALUE; + m_currentPts = DVD_NOPTS_VALUE; diff --git a/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp b/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp new file mode 100644 index 000000000..1fddf255f --- /dev/null +++ b/package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp @@ -0,0 +1,52 @@ +--- kodi-14.0rc2.orig/xbmc/utils/SystemInfo.cpp 2014-12-05 19:38:44.000000000 -0600 ++++ kodi-14.0rc2/xbmc/utils/SystemInfo.cpp 2014-12-07 23:48:19.332418001 -0600 +@@ -615,16 +615,11 @@ std::string CSysInfo::GetOsName(bool emp + osName = "iOS"; + #elif defined(TARGET_DARWIN_OSX) + osName = "OS X"; +-#elif defined (TARGET_ANDROID) ++#elif defined(TARGET_ANDROID) + osName = "Android"; + #elif defined(TARGET_LINUX) +- osName = getValueFromOs_release("NAME"); +- if (osName.empty()) +- osName = getValueFromLsb_release(lsb_rel_distributor); +- if (osName.empty()) +- osName = getValueFromOs_release("ID"); +-#endif // defined(TARGET_LINUX) +- ++ osName = "OpenADK"; ++#endif + if (osName.empty()) + osName = "Unknown OS"; + } +@@ -665,7 +660,7 @@ std::string CSysInfo::GetOsVersion(void) + #elif defined(TARGET_LINUX) + osVersion = getValueFromOs_release("VERSION_ID"); + if (osVersion.empty()) +- osVersion = getValueFromLsb_release(lsb_rel_release); ++ osVersion = "1.0"; + #endif // defined(TARGET_LINUX) + + if (osVersion.empty()) +@@ -737,19 +732,7 @@ std::string CSysInfo::GetOsPrettyNameWit + #elif defined(TARGET_ANDROID) + osNameVer = GetOsName() + " " + GetOsVersion() + " API level " + StringUtils::Format("%d", CJNIBuild::SDK_INT); + #elif defined(TARGET_LINUX) +- osNameVer = getValueFromOs_release("PRETTY_NAME"); +- if (osNameVer.empty()) +- { +- osNameVer = getValueFromLsb_release(lsb_rel_description); +- std::string osName(GetOsName(true)); +- if (!osName.empty() && osNameVer.find(osName) == std::string::npos) +- osNameVer = osName + osNameVer; +- if (osNameVer.empty()) +- osNameVer = "Unknown Linux Distribution"; +- } +- +- if (osNameVer.find(GetOsVersion()) == std::string::npos) +- osNameVer += " " + GetOsVersion(); ++ osNameVer = GetOsName() + " " + GetOsVersion(); + #endif // defined(TARGET_LINUX) + + if (osNameVer.empty()) |