Skip to content

Feature/qt4 qt5 cleanup2 #276

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

Open
pierrewillenbrockdfki wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature/qt4 qt5 cleanup2 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08d3e68
add libqglviewer5 for debian
annaborn Sep 22, 2022
8052e4f
Update osdeps for ubuntu 22.04
planthaber May 15, 2024
7559ffd
Disable planning/ompl demos
planthaber May 15, 2024
0bbfa3e
don't build test of control/urdfdom
planthaber May 15, 2024
1de8357
Merge branch 'master' into feature/qt4-qt5-cleanup2
chhtz Sep 16, 2025
978528a
Merge remote-tracking branch 'autobuild/master' into feature/qt4-qt5-…
pierrewillenbrockdfki Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion libs.autobuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ in_flavor 'master', 'stable' do
# this will prevent the ompl-CMakeLists from spawning a browser to
# register...
pkg.define("OMPL_REGISTRATION","Off")
pkg.define("OMPL_BUILD_DEMOS", "Off")
end
metapackage 'external/ompl', 'planning/ompl'
cmake_package 'external/aruco' do |pkg|
Expand Down Expand Up @@ -332,7 +333,9 @@ in_flavor 'master', 'stable' do
metapackage 'external/freenect', 'drivers/freenect'


cmake_package 'control/urdfdom'
cmake_package 'control/urdfdom' do |pkg|
pkg.define "BUILD_TESTING", "OFF"
end
Comment on lines +336 to +338
Copy link
Member

@chhtz chhtz Aug 25, 2025

Choose a reason for hiding this comment

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

N.B.: Ubuntu does provide liburdfdom-dev (and liburdfdom-headers-dev), which could make this actually obsolete.
However, on Ubuntu 20.04 it seems to be only version 1.0.4, Ubuntu 22.04 has version 3.0.1, Ubuntu 24.04 has 4.0.0 (not sure what version is required).

Copy link
Member

@planthaber planthaber Aug 26, 2025

Choose a reason for hiding this comment

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

It is still not obsolete, as someone could add an osdep override....

cmake_package 'tools/ignition-math2'
cmake_package 'control/sdformat'
cmake_package 'control/urdfdom_headers'
Expand Down
5 changes: 4 additions & 1 deletion rock.osdeps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ control/sdformat:
ubuntu:
'14.04,14.10,15.04,15.10': nonexistent
'16.04,16.10,17.04,17.10': libsdformat4-dev
default: libsdformat6-dev
'18.04,20.04': libsdformat6-dev
default: libsdformat-dev
Copy link
Member

@chhtz chhtz Aug 25, 2025

Choose a reason for hiding this comment

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

default will unfortunately only work for 22.04. In 24.04 it was removed from the ubuntu packages and requires an extra osrepo (e.g., http://packages.osrfoundation.org/gazebo/ubuntu-stable)

Copy link
Member

@planthaber planthaber Aug 26, 2025

Choose a reason for hiding this comment

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

There is a source definition:

https://github.com/rock-core/rock-package_set/blob/master/source.yml#L88-L92

That might be switched to github repo though...

https://github.com/gazebosim/sdformat

I currently don't know a way to tell autoproj to use source in the osdep file, only in the overrides.rb.

debian:
jessie,wheezy,squeeze: nonexistent
stretch: libsdformat4-dev
Expand Down Expand Up @@ -399,6 +400,8 @@ libqglviewer:
libqglviewer5:
ubuntu:
default: libqglviewer-dev-qt5
debian:
'bullseye': libqglviewer-dev-qt5

libturbojpeg:
debian:
Expand Down