From b43f864758972de7f263d13585df22ecb9c6191d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 3 May 2015 13:34:59 +0200 Subject: [PATCH] kodi: update to kodi-15.0-beta1-d1a2c33 Signed-off-by: Stephan Raue --- .../kodi-theme-Confluence/package.mk | 2 +- packages/mediacenter/kodi/package.mk | 2 +- .../kodi-001-isengard-rpb-backports.patch | 31 ------------------- .../kodi-001-isengard-rpb-backports.patch | 31 ------------------- 4 files changed, 2 insertions(+), 64 deletions(-) diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk index 11765719d4..841422e493 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="15.0-beta1-7dacc6e" +PKG_VERSION="15.0-beta1-d1a2c33" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 5b3c38b73d..141c8cae04 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="15.0-beta1-7dacc6e" +PKG_VERSION="15.0-beta1-d1a2c33" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/projects/RPi/patches/kodi/kodi-001-isengard-rpb-backports.patch b/projects/RPi/patches/kodi/kodi-001-isengard-rpb-backports.patch index 879938df5e..7c6476703d 100644 --- a/projects/RPi/patches/kodi/kodi-001-isengard-rpb-backports.patch +++ b/projects/RPi/patches/kodi/kodi-001-isengard-rpb-backports.patch @@ -5895,37 +5895,6 @@ index a694182..6474c1b 100644 MMAL_PORT_T *m_vout_input; MMAL_POOL_T *m_vout_input_pool; -From 307e0afce416a01e4623692dcb3ee501faab60f3 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 19 Apr 2015 16:17:25 +0100 -Subject: [PATCH 55/56] [mmalcodec] Fix initialisation of m_format in init_vout - ---- - xbmc/cores/VideoRenderers/MMALRenderer.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp -index 270036d..e73feed 100644 ---- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp -+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp -@@ -129,7 +129,7 @@ bool CMMALRenderer::init_vout(ERenderFormat format) - if (m_bMMALConfigured) - return true; - -- m_format = RENDER_FMT_MMAL; -+ m_format = format; - if (m_format != RENDER_FMT_MMAL && m_format != RENDER_FMT_YUV420P) - return true; - -@@ -550,6 +550,7 @@ void CMMALRenderer::UnInitMMAL() - m_video_stereo_mode = RENDER_STEREO_MODE_OFF; - m_display_stereo_mode = RENDER_STEREO_MODE_OFF; - m_StereoInvert = false; -+ m_format = RENDER_FMT_NONE; - - m_bConfigured = false; - m_bMMALConfigured = false; - From 055a522a3a5298ad53f3d0bad491d43d7f562ac8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 21 Apr 2015 14:32:07 +0100 diff --git a/projects/RPi2/patches/kodi/kodi-001-isengard-rpb-backports.patch b/projects/RPi2/patches/kodi/kodi-001-isengard-rpb-backports.patch index 879938df5e..7c6476703d 100644 --- a/projects/RPi2/patches/kodi/kodi-001-isengard-rpb-backports.patch +++ b/projects/RPi2/patches/kodi/kodi-001-isengard-rpb-backports.patch @@ -5895,37 +5895,6 @@ index a694182..6474c1b 100644 MMAL_PORT_T *m_vout_input; MMAL_POOL_T *m_vout_input_pool; -From 307e0afce416a01e4623692dcb3ee501faab60f3 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sun, 19 Apr 2015 16:17:25 +0100 -Subject: [PATCH 55/56] [mmalcodec] Fix initialisation of m_format in init_vout - ---- - xbmc/cores/VideoRenderers/MMALRenderer.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp -index 270036d..e73feed 100644 ---- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp -+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp -@@ -129,7 +129,7 @@ bool CMMALRenderer::init_vout(ERenderFormat format) - if (m_bMMALConfigured) - return true; - -- m_format = RENDER_FMT_MMAL; -+ m_format = format; - if (m_format != RENDER_FMT_MMAL && m_format != RENDER_FMT_YUV420P) - return true; - -@@ -550,6 +550,7 @@ void CMMALRenderer::UnInitMMAL() - m_video_stereo_mode = RENDER_STEREO_MODE_OFF; - m_display_stereo_mode = RENDER_STEREO_MODE_OFF; - m_StereoInvert = false; -+ m_format = RENDER_FMT_NONE; - - m_bConfigured = false; - m_bMMALConfigured = false; - From 055a522a3a5298ad53f3d0bad491d43d7f562ac8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 21 Apr 2015 14:32:07 +0100