This repository was archived by the owner on Apr 15, 2020. It is now read-only.
Update drm, xcb, xcb-proto and xshmfence#1524
Merged
ruslo merged 5 commits intoruslo:masterfrom Aug 27, 2018
dan-42:update_drm_xcb_xshmfence
Merged
Update drm, xcb, xcb-proto and xshmfence#1524ruslo merged 5 commits intoruslo:masterfrom dan-42:update_drm_xcb_xshmfence
ruslo merged 5 commits intoruslo:masterfrom
dan-42:update_drm_xcb_xshmfence
Conversation
ruslo
suggested changes
Aug 26, 2018
| ) | ||
|
|
||
| set(_xcb_text_files "") | ||
| foreach(_x composite damage dpms dri2 dri3 glx present randr record render res screensaver shape shm sync xevie xf86dri xfixes xinerama xkb xprint xtest xv xvmc) |
Owner
There was a problem hiding this comment.
This configuration should work for both 1.11 and 1.13, hence list should be formed based on analysis of HUNTER_xcb_VERSION variable.
Contributor
Author
|
This Ok? Otherwise is there a nicer way to make is less(<) compare with the version-string? and use it? |
ruslo
suggested changes
Aug 26, 2018
cmake/projects/xcb/hunter.cmake
Outdated
| 98199b6054750a06cddd4e77baa4354af547ce6f | ||
| ) | ||
|
|
||
| list(APPEND _xcb_text_file_tpl composite damage dpms dri2 dri3 glx present randr record render res screensaver shape shm sync xf86dri xfixes xinerama xkb xtest xv xvmc) |
Owner
There was a problem hiding this comment.
This file can be loaded few times, please use set(_xcb_text_file_tpl composite damage dpms ...) instead.
cmake/projects/xcb/hunter.cmake
Outdated
| list(APPEND _xcb_text_file_tpl composite damage dpms dri2 dri3 glx present randr record render res screensaver shape shm sync xf86dri xfixes xinerama xkb xtest xv xvmc) | ||
|
|
||
| # xcb 1.8.* or 1.11.* | ||
| if(HUNTER_xcb_VERSION MATCHES "^1\\.11\\." OR HUNTER_xcb_VERSION MATCHES "^1\\.8\\.") |
Owner
There was a problem hiding this comment.
if(HUNTER_xcb_VERSION VERSION_LESS "1.13")?
ruslo
approved these changes
Aug 27, 2018
Owner
Owner
Owner
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hey this updates the packages
drm, xcb, xcb-proto and xshmfence
They run with out a problem on my system, but I have not got travis or appveyer working.
I'll update the PR when I have.
Note to xcb
the files
libxcb-xevie.*and libxcb-xprint.* ``` are no longer provided. This might break an old toolchain?I want to get qt 5.11 to run, so beside otherstuff I still need to figure out,
these packages must be updated to compile qt 5.11 with gcc 8.1 on ArchLinux.