diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk index 3e5b69e1bd..9626e63835 100644 --- a/packages/mediacenter/kodi-theme-Confluence/package.mk +++ b/packages/mediacenter/kodi-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi-theme-Confluence" -PKG_VERSION="14-4465fbf" +PKG_VERSION="14-73b8a0f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index fba49d720b..50329d428d 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="14-4465fbf" +PKG_VERSION="14-73b8a0f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch b/packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch index 01a65ca6d1..61b6f44c47 100644 --- a/packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch +++ b/packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch @@ -1221,40 +1221,3 @@ index f9ca9ae..89a7585 100644 } -From 667a16d052988936935b49a4e8b4458a6a224eb8 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Mon, 24 Nov 2014 07:49:12 +0100 -Subject: [PATCH 10/10] dvdplayer: demux ffmpeg - fix seeking behind eof - ---- - xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 4218bfc..4147a57 100644 ---- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -897,6 +897,12 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) - CSingleLock lock(m_critSection); - ret = av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0); - -+ // demuxer will return failure, if you seek behind eof -+ if (ret < 0 && m_pFormatContext->duration && seek_pts >= (m_pFormatContext->duration + m_pFormatContext->start_time)) -+ ret = 0; -+ else if (ret < 0 && m_pInput->IsEOF()) -+ ret = 0; -+ - if(ret >= 0) - UpdateCurrentPTS(); - } -@@ -910,10 +916,6 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) - if(startpts) - *startpts = DVD_MSEC_TO_TIME(time); - -- // demuxer will return failure, if you seek to eof -- if (m_pInput->IsEOF() && ret <= 0) -- return true; -- - return (ret >= 0); - } - diff --git a/packages/mediacenter/kodi/patches/kodi-999.95-PR5817.patch b/packages/mediacenter/kodi/patches/kodi-999.95-PR5817.patch deleted file mode 100644 index 9b313d821e..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-999.95-PR5817.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fda83f7aa4a82b8494e0b4e4a6a254d5784b5919 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Tue, 25 Nov 2014 20:33:18 +0100 -Subject: [PATCH] Revert "smb: eliminate unused while loop in OpenDir" - -This reverts commit aeebd22d2e88fd14f1b0624d0bdbc6f791a75892. ---- - xbmc/filesystem/SMBDirectory.cpp | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/xbmc/filesystem/SMBDirectory.cpp b/xbmc/filesystem/SMBDirectory.cpp -index 1fa00e6..026bd02 100644 ---- a/xbmc/filesystem/SMBDirectory.cpp -+++ b/xbmc/filesystem/SMBDirectory.cpp -@@ -253,7 +253,7 @@ int CSMBDirectory::OpenDir(const CURL& url, std::string& strAuth) - fd = smbc_opendir(s.c_str()); - } - -- if (fd < 0) /* only to avoid goto in following code */ -+ while (fd < 0) /* only to avoid goto in following code */ - { - std::string cError; - -@@ -261,15 +261,21 @@ int CSMBDirectory::OpenDir(const CURL& url, std::string& strAuth) - { - if (m_flags & DIR_FLAG_ALLOW_PROMPT) - RequireAuthentication(urlIn); -+ break; - } -- else if (errno == ENODEV || errno == ENOENT) -+ -+ if (errno == ENODEV || errno == ENOENT) - cError = StringUtils::Format(g_localizeStrings.Get(770).c_str(),errno); - else - cError = strerror(errno); - - if (m_flags & DIR_FLAG_ALLOW_PROMPT) - SetErrorDialog(257, cError.c_str()); -+ break; -+ } - -+ if (fd < 0) -+ { - // write error to logfile - CLog::Log(LOGERROR, "SMBDirectory->GetDirectory: Unable to open directory : '%s'\nunix_err:'%x' error : '%s'", CURL::GetRedacted(strAuth).c_str(), errno, strerror(errno)); - }