[SCM] kodi/master: Fix starting kodi on arm64

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Tue Dec 26 01:12:55 UTC 2017


The following commit has been merged in the master branch:
commit 8d57cfc4b8c934f8d008c58d1e18ed600fd3b6e9
Author: Balint Reczey <balint.reczey at canonical.com>
Date:   Tue Dec 26 00:32:24 2017 +0100

    Fix starting kodi on arm64
    
    Closes: #876876

diff --git a/debian/patches/20-dont-cast-visualid.patch b/debian/patches/20-dont-cast-visualid.patch
new file mode 100644
index 0000000..f87140e
--- /dev/null
+++ b/debian/patches/20-dont-cast-visualid.patch
@@ -0,0 +1,19 @@
+Description: Fix setting VisualID by avoiding cast.
+Author: Balint Reczey <rbalint at ubuntu.com>
+Forwarded: not-needed
+
+--- a/xbmc/windowing/X11/GLContextEGL.cpp
++++ b/xbmc/windowing/X11/GLContextEGL.cpp
+@@ -409,9 +409,11 @@
+     m_eglConfig=eglConfig;
+ 
+     XVisualInfo x11_visual_info_template;
+-    if (!eglGetConfigAttrib(m_eglDisplay, m_eglConfig, EGL_NATIVE_VISUAL_ID, (EGLint*)&x11_visual_info_template.visualid)) {
++    EGLint visualID;
++    if (!eglGetConfigAttrib(m_eglDisplay, m_eglConfig, EGL_NATIVE_VISUAL_ID, &visualID)) {
+       CLog::Log(LOGERROR, "Failed to query native visual id\n");
+     }
++    x11_visual_info_template.visualid = visualID;
+     int num_visuals;
+     return XGetVisualInfo(m_dpy,
+                         VisualIDMask,
diff --git a/debian/patches/series b/debian/patches/series
index 1999427..a70acea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,7 @@
 17-add-test-for-CVE-2017-8314-with-autotools-build.patch
 18-support-omitting-addons-service.patch
 19-fix-audio-with-latest-ffmpeg.patch
+20-dont-cast-visualid.patch
 libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch
 libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
 libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list