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.

Sign up for GitHub

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

Jump to bottom

Opencv4 upgrade #781

Merged
merged 49 commits into from
May 28, 2024
Merged

Opencv4 upgrade #781

merged 49 commits into from
May 28, 2024

Conversation

marinagmoreira
Copy link
Member

@marinagmoreira marinagmoreira commented Apr 26, 2024 •
edited
Loading

build working

todo:

  • make opencv only the necessary packages

ana-GT and others added 19 commits February 7, 2023 10:56
@ana-GT
Starting to update the marker tracking
d5f2345
@ana-GT
Compiles with OpenCV4
173dde0
@ana-GT
Now Astrobee works
cbc43bb
@ana-GT
Clean up references to old OpenCV find cmake path
38f247a
@ana-GT
Cleaned up
058dcde
@ana-GT
Merge branch 'develop' into opencv4
9ac9fde
@ana-GT
Set 4.2.0 version
000f58a
@ana-GT
Set opencv back on list of thirdparty, now installed in /usr
948c173
@ana-GT
Merge remote-tracking branch 'upstream/develop' into opencv4
cb3c8e1
@ana-GT
Merge remote-tracking branch 'upstream/develop' into opencv4
26dfc66
@ana-GT
Fixed gazebo parameter passing bug in xacro and allowed using ns bsha…
e071dc9 
…rp by deleting hard-coded assumption of bsharp in astrobee_gazebo
@marinagmoreira
install newer ar_track_alvar instead of alvar
6f3b59c
@marinagmoreira
Merge branch 'opencv4' of https://github.com/ana-GT/astrobee into ope…
8fc5f69 
…ncv4_upgrade
@marinagmoreira
compiling in ubuntu 20.04 with full opencv
e29403b
@marinagmoreira
reverting sim changes
f06a989
@marinagmoreira
fixing ar-track-alvar install
bf77177
@marinagmoreira
add new alvar libs to gitignore
907c752
@marinagmoreira
patch fixes cmake error
70ae1c2
@marinagmoreira
reverting sim changes not related to this PR
0a193c1
@marinagmoreira marinagmoreira linked an issue Apr 26, 2024 that may be closed by this pull request
Upgrade to OpenCV 4 #662
Closed
@marinagmoreira marinagmoreira marked this pull request as ready for review April 30, 2024 00:21
@marinagmoreira
Copy link
Member Author

marinagmoreira commented Apr 30, 2024 •
edited
Loading

Things to do:

  • Make new robot debians
  • Update platform

marinagmoreira and others added 6 commits May 3, 2024 10:40
@marinagmoreira
fixing astrobee dependencies
da292d7
Add debian build configuration for ar-track-alvar-msgs
9d4abc6
Remove postinst and postrm files from alvar-msgs
29dfff7 
These files won't work when installing on the robots
Add debian build configuration files for ar-track-alvar
1e10130
Remove postinst and postrm from alvar
1f0ae0e 
These files won't work on the robots
Remove use of bloom-generate
0377c59 
Pretty cool tool but not the best option in the context of the
robots and compilation for armhf
Ruben Garcia and others added 15 commits May 3, 2024 13:49
Remove .dirs files since dh_install is enough
2193ab6
Update opencv install files
edb452b 
Using arch-specific files since there is no expansion support
in compat 9. Also I don't want to make the install file an
executable.
Remove old alvar script
0f3fb8a
Update opencv not-installed to include files from any architecture
14476b3
Update openmvg debian control files
4f61a0d 
* Changelog now reflects new patch
* Removing unnecessary dependency to save space on the robots
Upgrade dbow2 to OpenCV 4
8730eef
Increase version to reflect opencv4 upgrade
8cca8b3
@marinagmoreira
Merge branch 'develop' of https://github.com/nasa/astrobee into openc…
8f80e75 
…v4_upgrade
@marinagmoreira
Merge branch 'develop' of https://github.com/nasa/astrobee into openc…
cdc92af 
…v4_upgrade
Add our custom CMake modules
ecc3301 
This may be a temporal thing if we decide to put back this change
into the nodes that require it
Merge remote-tracking branch 'marina/opencv4_upgrade' into opencv4_up…
73f6abd 
…grade
@marinagmoreira
fix gen hugin script for ubuntu 20
c9be424
@marinagmoreira
Merge branch 'opencv4_upgrade' of https://github.com/marinagmoreira/a…
6d7c6f7 
…strobee into opencv4_upgrade
@marinagmoreira
remove ros-pcl dependency
6977bb4
Update remove_pcl patch
7331dd8
@marinagmoreira marinagmoreira requested a review from bcoltin May 22, 2024 17:37
bcoltin
bcoltin requested changes May 22, 2024
View reviewed changes
@marinagmoreira
changing cmake name to make it clearer; didn't want to add an extra l…
f7ca38f 
…ine to the cmake on all the opencv4 dependencies
@marinagmoreira marinagmoreira requested a review from bcoltin May 24, 2024 00:43
bcoltin
bcoltin approved these changes May 24, 2024
View reviewed changes
Copy link
Member

@bcoltin bcoltin left a comment

Choose a reason for hiding this comment

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

Make sure you fix the continuous integration and then looks good

@marinagmoreira marinagmoreira merged commit 9964356 into nasa:develop May 28, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bcoltin bcoltin bcoltin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade to OpenCV 4
3 participants
@marinagmoreira @bcoltin @ana-GT