g2o: build g2o_viewer, libqglviewer: 2.6.3 -> 2.7.1 #61655
Merged
Conversation
This file contains 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
This transitions from Qt4 to Qt5.
|
@GrahamcOfBorg build libqglviewer |
|
@c0bw3b the package is now It turns out that I actually need the Qt4 version of libqglviewer as well, so I am considering adding the older version again. |
c0bw3b
reviewed
May 18, 2019
|
@GrahamcOfBorg build libsForQt5.libqglviewer |
|
I enabled It turns out that I don't really need the Qt4 version of libqglviewer, so I think this PR is ready to be merged if it looks good to others. |
|
Can this be merged? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
I recently added a basic derivation for
g2oin #61344, but this package was missing support for the graph viewer application (g2o_viewer). It also performed impure CPU feature (SSE) detection.g2o_viewerrequireslibqglviewer, but the version currently in nixpkgs is too old, so this package was updated. This moved it from using Qt4 to using Qt5.Things done
Updated
libqglviewerto the latest version. It now uses Qt5 so it was moved tolibsForQt5. There were no users of this package within nixpkgs. I did not add an alias because this change would almost certainly break any out of tree usage anyway due to the Qt upgrade.I am not able to test the Darwin build, so it would be helpful if someone could ask ofborg to build it.
I added the
libqglviewerdependency tog2oin order to buildg2o_viewer. I also added a patch that removes an unnecessary reference to the compiler that was just used in a debug message. Lastly, I added CPU feature tables as done in #59148. This prevents the build from impurely detecting SSE support on the build machine and potentially generating code that cannot run on all supported machines.sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)