Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cmake/windowing] fix dependencies X11/XRandR/OpenGLES #11805

Merged
merged 1 commit into from Mar 4, 2017

Conversation

mac-l1
Copy link
Contributor

@mac-l1 mac-l1 commented Mar 4, 2017

Description

This change originates from another pull request https://github.com/xbmc/xbmc/pull/11772 and @FernetMenta 's advise. It relates to kodi linux build for X11 platform that only uses OpenGLES and not OpenGL.

  1. [cmake] in case of OpenGLES not only use X module but also XRandR, just as is done in case of OpenGL
  2. [windowing] dont rely on implicit inclusion of <X11/Xutil.h> in <EGL/egl.h>/<EGL/eglplatform.h> but include it explicitly
  3. [windowing/egl] remove native egl platform dependency when X11 platform is used in combination with OpenGLES

Motivation and Context

Change is needed in order to fix building for kodi linux builds for X11 platform that only uses OpenGLES and not OpenGL. This is for instance the case with arm based linux systems that use the arm mali graphical processor (GPU), like the latest rockchip linux systems (rk3288 and rk3399).

How Has This Been Tested?

The change (just a working kodi build) has been tested on latest debian linux distribution (stretch) with X11 desktop and kernel (4.4) that is open sourced and provided by rockchip. It has been tested on firefly and miqi rk3288 devices.
Tests consisted of basic kodi browsing the menus, playing h264-videos and some youtube videos using the add-on.

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed

@mac-l1
Copy link
Contributor Author

mac-l1 commented Mar 4, 2017

@FernetMenta as discussed before, just added a new PR. can you please review?

@FernetMenta
Copy link
Contributor

thanks!
jenkins build this please

@FernetMenta
Copy link
Contributor

@wsnipex @hudokkow @fetzerch ok with you?

@wsnipex
Copy link
Member

wsnipex commented Mar 4, 2017

looks good

@FernetMenta FernetMenta merged commit 2bbf02d into xbmc:master Mar 4, 2017
@Rechi Rechi added this to the L 18.0-alpha1 milestone Mar 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants