Merge lp://staging/~cameronnemo/pantheon-greeter/optional-gl into lp://staging/~elementary-pantheon/pantheon-greeter/trunk
Proposed by
Cameron Norman
| Status: | Rejected |
|---|---|
| Rejected by: | Zisu Andrei |
| Proposed branch: | lp://staging/~cameronnemo/pantheon-greeter/optional-gl |
| Merge into: | lp://staging/~elementary-pantheon/pantheon-greeter/trunk |
| Diff against target: |
168 lines (+66/-34) 4 files modified
CMakeLists.txt (+41/-17) src/Wallpaper.vala (+8/-0) vapi-gl/gl.vapi (+17/-0) vapi/gl.vapi (+0/-17) |
| To merge this branch: | bzr merge lp://staging/~cameronnemo/pantheon-greeter/optional-gl |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zisu Andrei (community) | Disapprove | ||
| kay van der Zander (community) | Needs Fixing | ||
| Corentin Noël | Pending | ||
|
Review via email:
|
|||
Description of the change
This leaves out GL specific code if GL is not available.
This is Raphael Isemann's branch, just rebased on current trunk (I had to fix a merge conflict). There is a bounty on the bug, but I think that if Raphael is assigned to the bug he will get the bounty so it is probably no problem.
The original merge request was rejected because it did not compile when GL was found (I do not think it was reviewed for without GL), but I tested this branch and it does compile locally.
To post a comment you must log in.
Revision history for this message
| kay van der Zander (kay20) wrote | # |
Unmerged revisions
- 277. By Cameron Norman
-
Raphael Isemann: make GL usage optional
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
crop the packages and options in a cmake variable like sources. this makes the if smaller and removes duplicate of vala_precompile.