[kodi/f28] Fix crash on startup (RFBZ#4863)

commit 3d144a887392ca7da5881ba01f47196b235e2516 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Mon Apr 23 11:16:57 2018 -0500 Fix crash on startup (RFBZ#4863) kodi-17.6-array-segfault.patch | 18 ++++++++++++++++++ kodi.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) --- diff --git a/kodi-17.6-array-segfault.patch b/kodi-17.6-array-segfault.patch new file mode 100644 index 0000000..508d08a --- /dev/null +++ b/kodi-17.6-array-segfault.patch @@ -0,0 +1,18 @@ +--- a/xbmc/guilib/GUIFontTTFGL.cpp ++++ b/xbmc/guilib/GUIFontTTFGL.cpp +@@ -147,9 +147,12 @@ void CGUIFontTTFGL::LastEnd() + #ifdef HAS_GL + glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT); + +- glColorPointer (4, GL_UNSIGNED_BYTE, sizeof(SVertex), (char*)&m_vertex[0] + offsetof(SVertex, r)); +- glVertexPointer (3, GL_FLOAT , sizeof(SVertex), (char*)&m_vertex[0] + offsetof(SVertex, x)); +- glTexCoordPointer(2, GL_FLOAT , sizeof(SVertex), (char*)&m_vertex[0] + offsetof(SVertex, u)); ++ if (!m_vertex.empty()) ++ { ++ glColorPointer (4, GL_UNSIGNED_BYTE, sizeof(SVertex), (char*)&m_vertex[0] + offsetof(SVertex, r)); ++ glVertexPointer (3, GL_FLOAT , sizeof(SVertex), (char*)&m_vertex[0] + offsetof(SVertex, x)); ++ glTexCoordPointer(2, GL_FLOAT , sizeof(SVertex), (char*)&m_vertex[0] + offsetof(SVertex, u)); ++ } + glEnableClientState(GL_COLOR_ARRAY); + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); diff --git a/kodi.spec b/kodi.spec index d614678..acf5872 100644 --- a/kodi.spec +++ b/kodi.spec @@ -14,7 +14,7 @@ Name: kodi Version: 17.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -51,6 +51,9 @@ Patch2: kodi-17a2-libdvd.patch # FFmpeg 3.5 support Patch3: kodi-17.6-ffmpeg-3.5.patch +# https://trac.kodi.tv/ticket/17850 +Patch4: kodi-17.6-array-segfault.patch + # Optional deps (not in EPEL) %if 0%{?fedora} # (libbluray in EPEL 6 is too old.) @@ -277,6 +280,7 @@ cp -p %{SOURCE4} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz %patch2 -p1 -b.libdvd %endif %patch3 -p1 -b.ffmpeg-3.5 +%patch4 -p1 -b.array-segfault %build @@ -423,6 +427,9 @@ fi %changelog +* Mon Apr 23 2018 Michael Cronenworth <mike(a)cchtml.com&gt; - 17.6-8 +- Add patch for crash on startup (RFBZ#4863) + * Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 17.6-7 - Rebuilt for new ffmpeg snapshot