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

renderdoc: 1.4 -> 1.5 (backport) #71961

Closed
wants to merge 1 commit into from

Conversation

Ralith
Copy link
Contributor

@Ralith Ralith commented Oct 25, 2019

Backport of #71057, as current build crashes on startup.

@Ralith Ralith changed the title renderdoc: fix build for new qt infrastructure renderdoc: fix build for new qt infrastructure (in release) Oct 25, 2019
@ofborg ofborg bot requested a review from jansol October 25, 2019 02:55
@jansol
Copy link
Contributor

jansol commented Oct 25, 2019

Does 19.09 require the addOpenGLRunpath dance yet? If so, it might make sense to just backport #71057

@Ralith
Copy link
Contributor Author

Ralith commented Oct 26, 2019

Does 19.09 require the addOpenGLRunpath dance yet?

In principle I believe so, although LD_LIBRARY_PATH is still getting set in my 19.09 environment and hence this PR is sufficient (and necessary) to get it working.

it might make sense to just backport #71057

I'm on board with this.

@Ralith Ralith changed the title renderdoc: fix build for new qt infrastructure (in release) renderdoc: 1.4 -> 1.5 (backport) Oct 26, 2019
@Ralith
Copy link
Contributor Author

Ralith commented Oct 26, 2019

Updated to a backport of 1.5.

Copy link
Contributor

@jansol jansol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I am quite confident with my own commit that has already passed review in its original PR 😛

@ofborg ofborg bot requested a review from jansol October 26, 2019 17:08
c0bw3b pushed a commit that referenced this pull request Nov 14, 2019
Backport of #71057
Close #71961

(cherry picked from commit 392b36c)
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 14, 2019

Backport in 872b6a2

@c0bw3b c0bw3b closed this Nov 14, 2019
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 14, 2019

@Ralith you should use git cherry-pick -x when backporting, that way you retain the reference of the original commit to master

@Ralith
Copy link
Contributor Author

Ralith commented Nov 14, 2019 via email

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

3 participants