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

Support for jammy #8

Merged
merged 2 commits into from
Mar 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions jammy/debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ignition-rendering6 (6.2.1+osrf-1~jammy) jammy; urgency=medium

* First release for jammy

-- Jose Luis Rivero <[email protected]> Fri, 04 Mar 2022 20:35:24 +0100
1 change: 1 addition & 0 deletions jammy/debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13
1 change: 1 addition & 0 deletions jammy/debian/control
1 change: 1 addition & 0 deletions jammy/debian/copyright
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-core-dev.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-dev.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-ogre1-dev.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-ogre1.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-ogre2-dev.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-ogre2.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6-ogre2.install.install
1 change: 1 addition & 0 deletions jammy/debian/libignition-rendering6.install
68 changes: 68 additions & 0 deletions jammy/debian/patches/0003-use-ogre-next-debian.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 668aa49..bebd089 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,12 +92,8 @@ endif()

#--------------------------------------
# Find OGRE2
-ign_find_package(IgnOGRE2 VERSION 2.2.0
- COMPONENTS HlmsPbs HlmsUnlit Overlay
- REQUIRED_BY ogre2
- PRIVATE_FOR ogre2)
-
-if (OGRE2_FOUND)
+find_package(OGRE-Next REQUIRED)
+if (OGRE-Next_FOUND)
set(HAVE_OGRE2 TRUE)
endif()

diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt
index bd3975c..f03a562 100644
--- a/ogre2/src/CMakeLists.txt
+++ b/ogre2/src/CMakeLists.txt
@@ -28,8 +28,12 @@ set_property(
)

target_include_directories(${ogre2_target}
+ PUBLIC
+ ${OGRE-Next_INCLUDE_DIRS}
+ ${OGRE-Next_HlmsUnlit_INCLUDE_DIRS}
+ ${OGRE-Next_HlmsPbs_INCLUDE_DIRS}/../Common
PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
)

target_link_libraries(${ogre2_target}
@@ -39,7 +43,7 @@ target_link_libraries(${ogre2_target}
ignition-plugin${IGN_PLUGIN_VER}::register
${OPENGL_LIBRARIES}
terra
- IgnOGRE2::IgnOGRE2)
+ ${OGRE-Next_LIBRARIES})

set (versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
set (unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt
index 83c9ac9..5c8e5ad 100644
--- a/ogre2/src/terrain/Terra/CMakeLists.txt
+++ b/ogre2/src/terrain/Terra/CMakeLists.txt
@@ -32,10 +32,14 @@ target_include_directories(${PROJECT_NAME}
PRIVATE
# Hlms files inside Hlms/Pbs do not have #include <Hlms/Pbs/...> thus
# we must add this one manually for this to build correctly
- ${OGRE2_INCLUDE}/Hlms/Pbs
- ${OGRE2_INCLUDE}/Hlms/Common
+ ${OGRE-Next_INCLUDE_DIRS}
+ ${OGRE-Next_INCLUDE_DIRS}/OGRE-Next/PlanarReflections
+ ${OGRE-Next_HlmsPbs_INCLUDE_DIRS}
+ ${OGRE-Next_HlmsPbs_INCLUDE_DIRS}/..
+ ${OGRE-Next_HlmsPbs_INCLUDE_DIRS}/../Common
PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include
)

-target_link_libraries(${PROJECT_NAME} PRIVATE IgnOGRE2::IgnOGRE2)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${OGRE-Next_LIBRARIES}
+)
1 change: 1 addition & 0 deletions jammy/debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0003-use-ogre-next-debian.patch
1 change: 1 addition & 0 deletions jammy/debian/rules
1 change: 1 addition & 0 deletions jammy/debian/source
1 change: 1 addition & 0 deletions jammy/debian/watch
106 changes: 66 additions & 40 deletions ubuntu/debian/control
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
Source: ignition-rendering6
Standards-Version: 3.9.8
Maintainer: Jose Luis Rivero <[email protected]>
Section: science
Priority: optional
Build-Depends: cmake,
doxygen,
pkg-config,
debhelper (>= 9),
debhelper (>= 11),
freeglut3-dev,
libglew-dev,
libfreeimage-dev,
Expand All @@ -17,22 +16,27 @@ Build-Depends: cmake,
libignition-math6-eigen3-dev (>= 6.6.0),
libignition-plugin-dev,
libogre-1.9-dev,
libogre-2.2-dev
Vcs-Browser: https://github.com/ignition-release/ign-rendering6-release
libogre-2.2-dev | libogre-next-dev
Vcs-Browser: https://github.com/ignitionrobotics/ignition-rendering
Vcs-Git: https://github.com/ignition-release/ign-rendering6-release
Standards-Version: 4.5.1
Homepage: http://ignitionrobotics.org/

Package: libignition-rendering6
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libignition-rendering6-6 (>= 6.1.0+ds-1)
Replaces: libignition-rendering6-6 (>= 6.1.0+ds-1)
Multi-Arch: same
Description: Ignition rendering3 classes and functions for robot apps - Shared library
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Main shared library
Description: Ignition rendering classes and functions for robot apps - Shared library
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
.
Main shared library

# Only for the examples:
#
Expand All @@ -51,11 +55,13 @@ Depends: libignition-cmake2-dev (>= 2.3.0),
libignition-rendering6 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Ignition rendering3 classes and functions - Core development files
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Core development files
Description: Ignition rendering classes and functions - Core development files
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
.
Core development files

Package: libignition-rendering6-ogre1-dev
Architecture: any
Expand All @@ -70,22 +76,28 @@ Depends: libignition-cmake2-dev (>= 2.3.0),
libignition-rendering6-ogre1 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Ignition rendering3 classes and functions for robot apps - Development files
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Ogre1 component development files
Description: Ignition rendering classes and functions for robot apps - Development files
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
.
Ogre1 component development files

Package: libignition-rendering6-ogre1
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libignition-rendering6-ogre1-6 (>= 6.1.0+ds-1)
Replaces: libignition-rendering6-ogre1-6 (>= 6.1.0+ds-1)
Multi-Arch: same
Description: Ignition rendering3 classes and functions for robot apps - Development files
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Ogre1 component shared library
Description: Ignition rendering classes and functions for robot apps - Development files
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
.
Ogre1 component shared library

Package: libignition-rendering6-ogre2-dev
Architecture: any
Expand All @@ -95,27 +107,37 @@ Depends: libignition-cmake2-dev (>= 2.3.0),
libignition-common4-graphics-dev,
libignition-math6-dev (>= 6.6.0),
libignition-math6-eigen3-dev (>= 6.6.0),
libogre-2.2-dev,
libogre-2.2-dev | libogre-next-dev,
libignition-rendering6-core-dev (= ${binary:Version}),
libignition-rendering6-ogre2 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Ignition rendering3 classes and functions for robot apps - Development files
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Ogre2 component development files
Description: Ignition rendering classes and functions for robot apps - Development files
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
Ignition rendering is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Ogre2 component development files

Package: libignition-rendering6-ogre2
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libignition-rendering6-ogre2-6 (>= 6.1.0+ds-1)
Replaces: libignition-rendering6-ogre2-6 (>= 6.1.0+ds-1)
Multi-Arch: same
Description: Ignition rendering3 classes and functions for robot apps - Development files
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Ogre2 component shared library
Description: Ignition rendering classes and functions for robot apps - Development files
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
Ignition rendering is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Ogre2 component shared library

Package: libignition-rendering6-dev
Architecture: any
Expand All @@ -126,8 +148,12 @@ Depends: libignition-rendering6-core-dev (= ${binary:Version}),
libignition-rendering6 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Ignition rendering3 classes and functions for robot apps - Metapackage
Ignition rendering3 is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Metapackage for development files
Description: Ignition rendering classes and functions for robot apps - Metapackage
Ignition Rendering is a C++ library designed to provide an abstraction for
different rendering engines. It offers unified APIs for creating 3D graphics
applications. Ignition rendering is a component in the ignition framework, a
set of libraries designed to rapidly develop robot applications.
Ignition rendering is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
.
Metapackage for development files
Loading