[kodi] Add patch to fix black bar corruption

commit 9579e6fd0f07fcb684898a8ff2927d9f12e138dc Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Tue Nov 20 09:25:01 2018 -0600 Add patch to fix black bar corruption kodi-18-blackbars.patch | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ kodi.spec | 16 ++++++++-- 2 files changed, 96 insertions(+), 3 deletions(-) --- diff --git a/kodi-18-blackbars.patch b/kodi-18-blackbars.patch new file mode 100644 index 0000000..fc38d1a --- /dev/null +++ b/kodi-18-blackbars.patch @@ -0,0 +1,83 @@ +From b7cccfb5477586cf1f94872cd48f1486ee81438b Mon Sep 17 00:00:00 2001 +From: fritsch <Peter.Fruehberger(a)gmail.com&gt; +Date: Sun, 11 Nov 2018 14:40:17 +0100 +Subject: [PATCH] LinuxRenderGL: Properly draw black quads on entire GL window + +--- + .../VideoRenderers/LinuxRendererGL.cpp | 23 +++++++++++-------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp +index 7750b5164463..acb8728ac3c4 100644 +--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp +@@ -558,6 +558,9 @@ void CLinuxRendererGL::DrawBlackBars() + + glUniform4f(uniCol, m_clearColour / 255.0f, m_clearColour / 255.0f, m_clearColour / 255.0f, 1.0f); + ++ int osWindowWidth = CServiceBroker::GetWinSystem()->GetGfxContext().GetWidth(); ++ int osWindowHeight = CServiceBroker::GetWinSystem()->GetGfxContext().GetHeight(); ++ + //top quad + if (m_destRect.y1 > 0.0) + { +@@ -565,10 +568,10 @@ void CLinuxRendererGL::DrawBlackBars() + vertices[quad].x = 0.0; + vertices[quad].y = 0.0; + vertices[quad].z = 0; +- vertices[quad+1].x = m_viewRect.Width(); ++ vertices[quad+1].x = osWindowWidth; + vertices[quad+1].y = 0; + vertices[quad+1].z = 0; +- vertices[quad+2].x = m_viewRect.Width(); ++ vertices[quad+2].x = osWindowWidth; + vertices[quad+2].y = m_destRect.y1; + vertices[quad+2].z = 0; + vertices[quad+3] = vertices[quad+2]; +@@ -580,21 +583,21 @@ void CLinuxRendererGL::DrawBlackBars() + } + + // bottom quad +- if (m_destRect.y2 < m_viewRect.Height()) ++ if (m_destRect.y2 < osWindowHeight) + { + GLubyte quad = count; + vertices[quad].x = 0.0; + vertices[quad].y = m_destRect.y2; + vertices[quad].z = 0; +- vertices[quad+1].x = m_viewRect.Width(); ++ vertices[quad+1].x = osWindowWidth; + vertices[quad+1].y = m_destRect.y2; + vertices[quad+1].z = 0; +- vertices[quad+2].x = m_viewRect.Width(); +- vertices[quad+2].y = m_viewRect.Height(); ++ vertices[quad+2].x = osWindowWidth; ++ vertices[quad+2].y = osWindowHeight; + vertices[quad+2].z = 0; + vertices[quad+3] = vertices[quad+2]; + vertices[quad+4].x = 0; +- vertices[quad+4].y = m_viewRect.Height(); ++ vertices[quad+4].y = osWindowHeight; + vertices[quad+4].z = 0; + vertices[quad+5] = vertices[quad]; + count += 6; +@@ -622,16 +625,16 @@ void CLinuxRendererGL::DrawBlackBars() + } + + // right quad +- if (m_destRect.x2 < m_viewRect.Width()) ++ if (m_destRect.x2 < osWindowWidth) + { + GLubyte quad = count; + vertices[quad].x = m_destRect.x2; + vertices[quad].y = m_destRect.y1; + vertices[quad].z = 0; +- vertices[quad+1].x = m_viewRect.Width(); ++ vertices[quad+1].x = osWindowWidth; + vertices[quad+1].y = m_destRect.y1; + vertices[quad+1].z = 0; +- vertices[quad+2].x = m_viewRect.Width(); ++ vertices[quad+2].x = osWindowWidth; + vertices[quad+2].y = m_destRect.y2; + vertices[quad+2].z = 0; + vertices[quad+3] = vertices[quad+2]; diff --git a/kodi.spec b/kodi.spec index 09018f3..9f63fc9 100644 --- a/kodi.spec +++ b/kodi.spec @@ -30,7 +30,7 @@ Name: kodi Version: 18.0 -Release: 0.16.b5%{?dist} +Release: 0.17.b5%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -57,8 +57,8 @@ Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz %endif %if ! 0%{?_with_external_ffmpeg} -# wget -O ffmpeg-4.0.2-Leia-Alpha3.tar.gz https://github.com/xbmc/FFmpeg/archive/4.0.2-Leia-Alpha3.tar.gz -Source5: ffmpeg-4.0.2-Leia-Alpha3.tar.gz +# wget -O ffmpeg-4.0.3-Leia-Beta5.tar.gz https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-Beta5.tar.gz +Source5: ffmpeg-4.0.3-Leia-Beta5.tar.gz %endif # Set program version parameters @@ -67,6 +67,10 @@ Patch1: kodi-18.0-versioning.patch # Prevent trousers from being linked, which breaks Samba Patch2: kodi-18-trousers.patch +# Fix black bar area corruption +# https://github.com/xbmc/xbmc/pull/14852 +Patch3: kodi-18-blackbars.patch + %ifarch x86_64 i686 %global _with_crystalhd 1 %endif @@ -96,6 +100,8 @@ BuildRequires: faad2-devel BuildRequires: firewalld-filesystem %if 0%{?_with_external_ffmpeg} BuildRequires: ffmpeg-devel +%else +BuildRequires: trousers-devel %endif BuildRequires: flac-devel BuildRequires: flatbuffers-devel @@ -332,6 +338,7 @@ This package contains the Kodi binary for X11 servers. %setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 -b.versioning %patch2 -p1 -b.trousers +%patch3 -p1 -b.blackbars # Fix up Python shebangs pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \ tools/EventClients/lib/python/zeroconf.py \ @@ -479,6 +486,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %changelog +* Mon Nov 19 2018 Michael Cronenworth <mike(a)cchtml.com&gt; - 18.0-0.17.b5 +- Add patch to fix video calibration + * Sun Nov 04 2018 Michael Cronenworth <mike(a)cchtml.com&gt; - 18.0-0.16.b5 - Kodi 18.0 beta 5