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

Fix compilation against Ogre 1.10.12 #390

Merged
merged 4 commits into from
Oct 11, 2021

Conversation

traversaro
Copy link
Contributor

@traversaro traversaro commented Aug 27, 2021

🦟 Bug fix

Fixes #374

Summary

Port the patch from conda-forge/libignition-rendering4-feedstock@a5a4537 . To be honest I did not tested compilation against other 1.10.* releases, but for sure this fixes compilation against 1.10.12 .

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

@traversaro traversaro requested a review from iche033 as a code owner August 27, 2021 15:54
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Aug 27, 2021
Signed-off-by: GitHub <noreply@github.com>
@traversaro
Copy link
Contributor Author

Not 100% sure, but I guess the CI failure is not related to this PR, as it appears also in #389 .

@chapulina chapulina requested a review from j-rivero August 30, 2021 17:52
@codecov
Copy link

codecov bot commented Aug 30, 2021

Codecov Report

Merging #390 (76618f1) into ign-rendering3 (19e1843) will increase coverage by 0.00%.
The diff coverage is n/a.

❗ Current head 76618f1 differs from pull request most recent head 6c3e64d. Consider uploading reports for the commit 6c3e64d to get more accurate results
Impacted file tree graph

@@               Coverage Diff               @@
##           ign-rendering3     #390   +/-   ##
===============================================
  Coverage           53.34%   53.35%           
===============================================
  Files                 131      131           
  Lines               12035    12035           
===============================================
+ Hits                 6420     6421    +1     
+ Misses               5615     5614    -1     
Impacted Files Coverage Δ
ogre/src/OgreGaussianNoisePass.cc 1.81% <ø> (ø)
ogre/src/OgreGpuRays.cc 0.00% <ø> (ø)
ogre/src/OgreMaterial.cc 37.18% <ø> (ø)
ogre/src/OgreMaterialSwitcher.cc 0.00% <ø> (ø)
ogre/src/OgreRTShaderSystem.cc 42.00% <ø> (ø)
ogre/src/OgreRenderEngine.cc 68.38% <ø> (ø)
ogre/src/OgreScene.cc 27.69% <ø> (ø)
ogre/src/OgreText.cc 0.00% <ø> (ø)
ogre/src/OgreThermalCamera.cc 0.00% <ø> (ø)
...e/ignition/rendering/base/BaseGaussianNoisePass.hh 100.00% <0.00%> (+3.33%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 19e1843...6c3e64d. Read the comment docs.

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

CI is not able to find Ogre https://build.osrfoundation.org/job/ignition_rendering-ci-pr_any-ubuntu_auto-amd64/1745/console . @j-rivero do you mind to take a quick look ?

Otherwise LGTM

Copy link
Contributor

@j-rivero j-rivero left a comment

Choose a reason for hiding this comment

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

Single test failure has nothing to do with this PR. Ready to go.

@chapulina chapulina merged commit 43f53aa into gazebosim:ign-rendering3 Oct 11, 2021
j-rivero added a commit to j-rivero/ign-rendering that referenced this pull request Oct 12, 2021
Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
iche033 added a commit that referenced this pull request Oct 19, 2021
* ogre: Do not assume that ogre plugins have lib prefix on macOS (#454)

Signed-off-by: Silvio <silvio@traversaro.it>

* Fix compilation against Ogre 1.10.12 (#390)

Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Avoid symbol redefition to fix armel builds (#457)

* Avoid symbol redefiniition on armel builds

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Fix logic on warning for ogre versions different than 1.9.x (#465)

* Fix logic on warning for ogre versions different than 1.9.x

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Fix context attributes of glXCreateContextAttribsARB. (#460)

Signed-off-by: Hill Ma <hillma@google.com>

Co-authored-by: Silvio Traversaro <silvio@traversaro.it>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Co-authored-by: Hill Ma <mahiuchun@users.noreply.github.com>
srmainwaring pushed a commit to srmainwaring/gz-rendering that referenced this pull request Oct 21, 2021
Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
WilliamLewww pushed a commit to WilliamLewww/ign-rendering that referenced this pull request Dec 7, 2021
Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
@osrf-triage
Copy link

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-01-10/1228/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants