diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index a40d1e3ee2..80c7cbbb88 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13-2372235" +PKG_VERSION="13-60bd97b" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 4098179f80..12db738947 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13-2372235" +PKG_VERSION="13-60bd97b" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch index 9e26417037..99199f8169 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch @@ -1920,7 +1920,7 @@ index 083d1e9..40b8403 100644 if(!SetFullScreen(fullScreen, res, false)) return false; -- CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon.png"); +- CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon256x256.png"); - - if (iconTexture) - SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture->GetPixels(), iconTexture->GetWidth(), iconTexture->GetHeight(), 32, iconTexture->GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL); @@ -2520,7 +2520,7 @@ index 40b8403..858ea5e 100644 + bRatio = vis->blue_mask / 255.0; + + CTexture iconTexture; -+ iconTexture.LoadFromFile("special://xbmc/media/icon.png"); ++ iconTexture.LoadFromFile("special://xbmc/media/icon256x256.png"); + buf = iconTexture.GetPixels(); + + numBufBytes = iconTexture.GetWidth() * iconTexture.GetHeight() * 4; @@ -5314,9 +5314,9 @@ index 869baa8..bfe3797 100644 bRatio = vis->blue_mask / 255.0; - CTexture iconTexture; -- iconTexture.LoadFromFile("special://xbmc/media/icon.png"); +- iconTexture.LoadFromFile("special://xbmc/media/icon256x256.png"); - buf = iconTexture.GetPixels(); -+ CBaseTexture *iconTexture = CBaseTexture::LoadFromFile("special://xbmc/media/icon.png"); ++ CBaseTexture *iconTexture = CBaseTexture::LoadFromFile("special://xbmc/media/icon256x256.png"); + + if (!iconTexture) + return false; @@ -9104,46 +9104,6 @@ index 8525ede..c94f2e3 100644 1.9.1 -From bd0d10452531941af72d9de8c920574312108608 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Mon, 18 Nov 2013 17:44:31 +0100 -Subject: [PATCH 79/96] ActiveAE: correct time of buffered samples by resample - ratio - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 +- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 6c5acfb..3ed310a 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -102,7 +102,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) - if (delay < 0) - delay = 0.0; - -- delay += stream->m_bufferedTime; -+ delay += stream->m_bufferedTime / stream->m_streamResampleRatio; - return delay; - } - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -index 99989b3..0287e73 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp -@@ -58,6 +58,7 @@ CActiveAEStream::CActiveAEStream(AEAudioFormat *format) - m_forceResampler = false; - m_remapper = NULL; - m_remapBuffer = NULL; -+ m_streamResampleRatio = 1.0; - } - - CActiveAEStream::~CActiveAEStream() --- -1.9.1 - - From 2ec9169c90eb33866d139a09b38ff04018cae905 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.02-PR4624.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.02-PR4624.patch deleted file mode 100644 index 2c23e9e047..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.02-PR4624.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3fae42dcad347a3a3b6d1a2ed0ba8c0d7f172de0 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Wed, 30 Apr 2014 15:29:51 +0200 -Subject: [PATCH] paplayer: dvdplayercodec - check if seek is possible before - trying to seek - ---- - xbmc/cores/paplayer/DVDPlayerCodec.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp -index c60abc8..89e9dbe 100644 ---- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp -+++ b/xbmc/cores/paplayer/DVDPlayerCodec.cpp -@@ -202,8 +202,11 @@ bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache) - } - else - { -- m_pInputStream->Seek(0, SEEK_SET); -- m_pDemuxer->Reset(); -+ if (m_pInputStream->Seek(0, SEEK_POSSIBLE)) -+ { -+ m_pInputStream->Seek(0, SEEK_SET); -+ m_pDemuxer->Reset(); -+ } - m_bCanSeek = false; - } - --- -1.9.1 -