From 82204caf46d1617bbafa668b3752e570669c99e2 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 7 Mar 2022 18:50:49 +0100 Subject: [PATCH 1/2] Support for jammy --- jammy/debian/changelog | 5 + jammy/debian/compat | 1 + jammy/debian/control | 1 + jammy/debian/copyright | 1 + .../libignition-rendering6-core-dev.install | 1 + .../debian/libignition-rendering6-dev.install | 1 + .../libignition-rendering6-ogre1-dev.install | 1 + .../libignition-rendering6-ogre1.install | 1 + .../libignition-rendering6-ogre2-dev.install | 1 + .../libignition-rendering6-ogre2.install | 1 + ...bignition-rendering6-ogre2.install.install | 1 + jammy/debian/libignition-rendering6.install | 1 + .../patches/0003-use-ogre-next-debian.patch | 68 ++ jammy/debian/patches/series | 1 + jammy/debian/rules | 1 + jammy/debian/source | 1 + jammy/debian/watch | 1 + ubuntu/debian/control | 106 ++-- ubuntu/debian/debian_copyright_2022 | 580 ++++++++++++++++++ ubuntu/debian/rules | 9 +- ubuntu/debian/watch | 5 + 21 files changed, 741 insertions(+), 47 deletions(-) create mode 100644 jammy/debian/changelog create mode 100644 jammy/debian/compat create mode 120000 jammy/debian/control create mode 120000 jammy/debian/copyright create mode 120000 jammy/debian/libignition-rendering6-core-dev.install create mode 120000 jammy/debian/libignition-rendering6-dev.install create mode 120000 jammy/debian/libignition-rendering6-ogre1-dev.install create mode 120000 jammy/debian/libignition-rendering6-ogre1.install create mode 120000 jammy/debian/libignition-rendering6-ogre2-dev.install create mode 120000 jammy/debian/libignition-rendering6-ogre2.install create mode 120000 jammy/debian/libignition-rendering6-ogre2.install.install create mode 120000 jammy/debian/libignition-rendering6.install create mode 100644 jammy/debian/patches/0003-use-ogre-next-debian.patch create mode 100644 jammy/debian/patches/series create mode 120000 jammy/debian/rules create mode 120000 jammy/debian/source create mode 120000 jammy/debian/watch create mode 100644 ubuntu/debian/debian_copyright_2022 create mode 100644 ubuntu/debian/watch diff --git a/jammy/debian/changelog b/jammy/debian/changelog new file mode 100644 index 0000000..b1eef6b --- /dev/null +++ b/jammy/debian/changelog @@ -0,0 +1,5 @@ +ignition-rendering6 (6.2.1-1~jammy) jammy; urgency=medium + + * First release for jammy + + -- Jose Luis Rivero Fri, 04 Mar 2022 20:35:24 +0100 diff --git a/jammy/debian/compat b/jammy/debian/compat new file mode 100644 index 0000000..b1bd38b --- /dev/null +++ b/jammy/debian/compat @@ -0,0 +1 @@ +13 diff --git a/jammy/debian/control b/jammy/debian/control new file mode 120000 index 0000000..5f3fb7f --- /dev/null +++ b/jammy/debian/control @@ -0,0 +1 @@ +../../ubuntu/debian/control \ No newline at end of file diff --git a/jammy/debian/copyright b/jammy/debian/copyright new file mode 120000 index 0000000..8266515 --- /dev/null +++ b/jammy/debian/copyright @@ -0,0 +1 @@ +../../ubuntu/debian/copyright \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-core-dev.install b/jammy/debian/libignition-rendering6-core-dev.install new file mode 120000 index 0000000..0a16a31 --- /dev/null +++ b/jammy/debian/libignition-rendering6-core-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-core-dev.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-dev.install b/jammy/debian/libignition-rendering6-dev.install new file mode 120000 index 0000000..cd7408f --- /dev/null +++ b/jammy/debian/libignition-rendering6-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-dev.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-ogre1-dev.install b/jammy/debian/libignition-rendering6-ogre1-dev.install new file mode 120000 index 0000000..019ff79 --- /dev/null +++ b/jammy/debian/libignition-rendering6-ogre1-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-ogre1-dev.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-ogre1.install b/jammy/debian/libignition-rendering6-ogre1.install new file mode 120000 index 0000000..7e3fdd6 --- /dev/null +++ b/jammy/debian/libignition-rendering6-ogre1.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-ogre1.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-ogre2-dev.install b/jammy/debian/libignition-rendering6-ogre2-dev.install new file mode 120000 index 0000000..f98597e --- /dev/null +++ b/jammy/debian/libignition-rendering6-ogre2-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-ogre2-dev.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-ogre2.install b/jammy/debian/libignition-rendering6-ogre2.install new file mode 120000 index 0000000..5af120e --- /dev/null +++ b/jammy/debian/libignition-rendering6-ogre2.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-ogre2.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6-ogre2.install.install b/jammy/debian/libignition-rendering6-ogre2.install.install new file mode 120000 index 0000000..1b85c20 --- /dev/null +++ b/jammy/debian/libignition-rendering6-ogre2.install.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering-ogre2.install.install \ No newline at end of file diff --git a/jammy/debian/libignition-rendering6.install b/jammy/debian/libignition-rendering6.install new file mode 120000 index 0000000..9839f65 --- /dev/null +++ b/jammy/debian/libignition-rendering6.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-rendering.install \ No newline at end of file diff --git a/jammy/debian/patches/0003-use-ogre-next-debian.patch b/jammy/debian/patches/0003-use-ogre-next-debian.patch new file mode 100644 index 0000000..6ddac21 --- /dev/null +++ b/jammy/debian/patches/0003-use-ogre-next-debian.patch @@ -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 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} ++) diff --git a/jammy/debian/patches/series b/jammy/debian/patches/series new file mode 100644 index 0000000..3edad83 --- /dev/null +++ b/jammy/debian/patches/series @@ -0,0 +1 @@ +0003-use-ogre-next-debian.patch diff --git a/jammy/debian/rules b/jammy/debian/rules new file mode 120000 index 0000000..c234c18 --- /dev/null +++ b/jammy/debian/rules @@ -0,0 +1 @@ +../../ubuntu/debian/rules \ No newline at end of file diff --git a/jammy/debian/source b/jammy/debian/source new file mode 120000 index 0000000..8fb4c09 --- /dev/null +++ b/jammy/debian/source @@ -0,0 +1 @@ +../../ubuntu/debian/source \ No newline at end of file diff --git a/jammy/debian/watch b/jammy/debian/watch new file mode 120000 index 0000000..40c9b2c --- /dev/null +++ b/jammy/debian/watch @@ -0,0 +1 @@ +../../ubuntu/debian/watch \ No newline at end of file diff --git a/ubuntu/debian/control b/ubuntu/debian/control index 60a41ff..037275f 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -1,12 +1,11 @@ Source: ignition-rendering6 -Standards-Version: 3.9.8 Maintainer: Jose Luis Rivero Section: science Priority: optional Build-Depends: cmake, doxygen, pkg-config, - debhelper (>= 9), + debhelper (>= 11), freeglut3-dev, libglew-dev, libfreeimage-dev, @@ -17,9 +16,10 @@ 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 @@ -27,12 +27,16 @@ 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: # @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/ubuntu/debian/debian_copyright_2022 b/ubuntu/debian/debian_copyright_2022 new file mode 100644 index 0000000..d27f139 --- /dev/null +++ b/ubuntu/debian/debian_copyright_2022 @@ -0,0 +1,580 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ignition-rendering +Upstream-Contact: https://github.com/ignitionrobotics/ign-rendering/issues +Source: https://github.com/ignitionrobotics/ign-rendering +Files-Excluded: .github + NEWS + ogre/src/media/fonts/liberation-sans + optix + test/gtest + +Files: * +Copyright: 2012-2021, Open Source Robotics Foundation +License: Apache-2 + +Files: debian/* +Copyright: 2012-2022, Jose Luis Rivero +License: Apache-2 + +Files: api.md.in + tutorials.md.in +Copyright: 2012-2021, Open Source Robotics Foundation +License: CC-BY-4 + +Files: examples/depth_camera/media/duck.dae + examples/ogre2_demo/media/duck.dae + examples/mesh_viewer/media/duck.dae + examples/segmentation_camera/media/duck.dae + examples/thermal_camera/media/duck.dae + examples/particles_demo/media/duck.dae +Copyright: 2006, Sony Computer Entertainment Inc +License: SCEA-SSL-1.0 + +Files: examples/simple_demo_qml/ThreadRenderer.cpp + examples/simple_demo_qml/ThreadRenderer.h +Copyright: 2021, Rhys Mainwaring + 2017, The Qt Company Ltd +License: Apache-2 and BSD-3-clause + +Files: examples/simple_demo_qml/* +Copyright: 2021, Rhys Mainwaring +License: Apache-2 + +Files: ogre/src/media/rtshaderlib150/* + ogre2/src/media/materials/programs/GLSL/skybox_fs.glsl + ogre2/src/media/materials/programs/GLSL/skybox_vs.glsl + ogre2/src/media/materials/scripts/skybox.material + ogre2/src/terrain/Terra/include/* + ogre2/src/terrain/Terra/src/* +Copyright: 2000-2021, Torus Knot Software Ltd +License: Expat + +Files: ogre2/src/media/Hlms/Pbs/Any/AreaLights_LTC_piece_ps.any +Copyright: 2017, Eric Heitz, Jonathan Dupuy, Stephen Hill and David Neubelt +License: Expat2 + +License: Apache-2 + See '/usr/share/common-licenses/Apache-2.0'. + +License: BSD-3-clause + Software License Agreement (BSD License) + . + Copyright (c) 2008, Willow Garage, Inc. + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of the Willow Garage nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +License: Expat + Copyright (c) 2000-2013 Torus Knot Software Ltd + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License: Expat2 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * If you use (or adapt) the source code in your own work, please include a + reference to the paper: + . + Real-Time Polygonal-Light Shading with Linearly Transformed Cosines. + Eric Heitz, Jonathan Dupuy, Stephen Hill and David Neubelt. + ACM Transactions on Graphics (Proceedings of ACM SIGGRAPH 2016) 35(4), 2016. + Project page: https://eheitzresearch.wordpress.com/415-2/ + . + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: CC-BY-4 + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution 4.0 International Public License ("Public License"). To the + extent this Public License may be interpreted as a contract, You are + granted the Licensed Rights in consideration of Your acceptance of + these terms and conditions, and the Licensor grants You such rights in + consideration of benefits the Licensor receives from making the + Licensed Material available under these terms and conditions. + . + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + . + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + . + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +License: SCEA-SSL-1.0 + Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this + file except in compliance with the License. You may obtain a copy of the License at: + http://research.scea.com/scea_shared_source_license.html + . + Unless required by applicable law or agreed to in writing, software distributed under the License + is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions and limitations under the + License. + . + Terms and Conditions: + 1. Definitions: + . + "Software" shall mean the software and related documentation, whether in Source or Object Form, + made available under this SCEA Shared Source license ("License"), that is indicated by a copyright + notice file included in the source files or attached or accompanying the source files. + . + "Licensor" shall mean Sony Computer Entertainment America, Inc. (herein "SCEA") + . + "Object Code" or "Object Form" shall mean any form that results from translation or transformation + of Source Code, including but not limited to compiled object code or conversions to other forms + intended for machine execution. + . + "Source Code" or "Source Form" shall have the plain meaning generally accepted in the software + industry, including but not limited to software source code, documentation source, header and + configuration files. + . + "You" or "Your" shall mean you as an individual or as a company, or whichever form under which you + are exercising rights under this License. + . + 2. License Grant. + . + Licensor hereby grants to You, free of charge subject to the terms and conditions of this License, + an irrevocable, non-exclusive, worldwide, perpetual, and royalty-free license to use, modify, + reproduce, distribute, publicly perform or display the Software in Object or Source Form . + . + 3. No Right to File for Patent. + . + In exchange for the rights that are granted to You free of charge under this License, You agree + that You will not file for any patent application, seek copyright protection or take any other + action that might otherwise impair the ownership rights in and to the Software that may belong to + SCEA or any of the other contributors/authors of the Software. + . + 4. Contributions. + . + SCEA welcomes contributions in form of modifications, optimizations, tools or documentation + designed to improve or expand the performance and scope of the Software (collectively + "Contributions"). Per the terms of this License You are free to modify the Software and those + modifications would belong to You. You may however wish to donate Your Contributions to SCEA for + consideration for inclusion into the Software. For the avoidance of doubt, if You elect to send + Your Contributions to SCEA, You are doing so voluntarily and are giving the Contributions to SCEA + and its parent company Sony Computer Entertainment, Inc., free of charge, to use, modify or + distribute in any form or in any manner. SCEA acknowledges that if You make a donation of Your + Contributions to SCEA, such Contributions shall not exclusively belong to SCEA or its parent + company and such donation shall not be to Your exclusion. SCEA, in its sole discretion, shall + determine whether or not to include Your donated Contributions into the Software, in whole, in + part, or as modified by SCEA. Should SCEA elect to include any such Contributions into the + Software, it shall do so at its own risk and may elect to give credit or special thanks to any such + contributors in the attached copyright notice. However, if any of Your contributions are included + into the Software, they will become part of the Software and will be distributed under the terms + and conditions of this License. Further, if Your donated Contributions are integrated into the + Software then Sony Computer Entertainment, Inc. shall become the copyright owner of the Software + now containing Your contributions and SCEA would be the Licensor. + . + 5. Redistribution in Source Form + . + You may redistribute copies of the Software, modifications or derivatives thereof in Source Code + Form, provided that You: + . + a. Include a copy of this License and any copyright notices with source + . + b. Identify modifications if any were made to the Software + . + c. Include a copy of all documentation accompanying the Software and modifications made by You + . + 6. Redistribution in Object Form + . + If You redistribute copies of the Software, modifications or derivatives thereof in Object Form + only (as incorporated into finished goods, i.e. end user applications) then You will not have a + duty to include any copies of the code, this License, copyright notices, other attributions or + documentation. + . + 7. No Warranty + . + THE SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT ANY REPRESENTATIONS OR WARRANTIES OF ANY + KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OF TITLE, + NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. YOU ARE SOLELY RESPONSIBLE + FOR DETERMINING THE APPROPRIATENESS OF USING, MODIFYING OR REDISTRIBUTING THE SOFTWARE AND ASSUME + ANY RISKS ASSOCIATED WITH YOUR EXERCISE OF PERMISSIONS UNDER THIS LICENSE. + . + 8. Limitation of Liability + . + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY WILL EITHER PARTY BE LIABLE TO THE OTHER PARTY OR + ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, SPECIAL, INCIDENTAL, OR EXEMPLARY DAMAGES + WITH RESPECT TO ANY INJURY, LOSS, OR DAMAGE, ARISING UNDER OR IN CONNECTION WITH THIS LETTER + AGREEMENT, WHETHER FORESEEABLE OR UNFORESEEABLE, EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH INJURY, LOSS, OR DAMAGE. THE LIMITATIONS OF LIABILITY SET FORTH IN THIS SECTION + SHALL APPLY TO THE FULLEST EXTENT PERMISSIBLE AT LAW OR ANY GOVERMENTAL REGULATIONS. + . + 9. Governing Law and Consent to Jurisdiction + . + This Agreement shall be governed by and interpreted in accordance with the laws of the State of + California, excluding that body of law related to choice of laws, and of the United States of + America. Any action or proceeding brought to enforce the terms of this Agreement or to adjudicate + any dispute arising hereunder shall be brought in the Superior Court of the County of San Mateo, + State of California or the United States District Court for the Northern District of + California. Each of the parties hereby submits itself to the exclusive jurisdiction and venue of + such courts for purposes of any such action. In addition, each party hereby waives the right to a + jury trial in any action or proceeding related to this Agreement. + . + 10. Copyright Notice for Redistribution of Source Code + . + Copyright 2005 Sony Computer Entertainment Inc. + . + Licensed under the SCEA Shared Source License, Version 1.0 (the "License"); you may not use this + file except in compliance with the License. You may obtain a copy of the License at: + http://research.scea.com/scea_shared_source_license.html + . + Unless required by applicable law or agreed to in writing, software distributed under the License + is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions and limitations under the + License. diff --git a/ubuntu/debian/rules b/ubuntu/debian/rules index a34402a..44fbe5b 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -1,9 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) - EXTRA_CMAKE_FLAGS = ifneq (,$(filter $(DEB_HOST_ARCH_CPU), arm64 arm)) EXTRA_CMAKE_FLAGS = -DIGN_ADD_fPIC_TO_LIBRARIES=True @@ -14,7 +11,7 @@ endif override_dh_auto_test %: - dh $@ --parallel + dh $@ override_dh_auto_configure: dh_auto_configure -- \ @@ -27,10 +24,8 @@ override_dh_install: $(RM) debian/libignition-rendering*-core-dev/usr/include/ignition/rendering*/ignition/rendering/ogre.hh $(RM) debian/libignition-rendering*-core-dev/usr/include/ignition/rendering*/ignition/rendering/ogre2.hh -# test cannot run in parallel override_dh_auto_test: true - #dh_auto_test --max-parallel=1 override_dh_shlibdeps: - dh_shlibdeps -l/usr/lib/$(DEB_HOST_MULTIARCH)/OGRE-2.1 + dh_shlibdeps -l/usr/lib/$(DEB_HOST_MULTIARCH)/OGRE-2.2 -l/usr/lib/$(DEB_HOST_MULTIARCH)/OGRE-NEXT diff --git a/ubuntu/debian/watch b/ubuntu/debian/watch new file mode 100644 index 0000000..16d63c6 --- /dev/null +++ b/ubuntu/debian/watch @@ -0,0 +1,5 @@ +version=4 +opts=filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\ + dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,repacksuffix=+ds \ + https://github.com/ignitionrobotics/ign-rendering/tags \ + (?:.*?/)@PACKAGE@.*_(\d[\d.]*)\.tar\.gz From 96fb228d28a7bef49f8738460dc77d1ecc09e556 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 7 Mar 2022 18:51:48 +0100 Subject: [PATCH 2/2] Update changelog --- jammy/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jammy/debian/changelog b/jammy/debian/changelog index b1eef6b..301d2a3 100644 --- a/jammy/debian/changelog +++ b/jammy/debian/changelog @@ -1,4 +1,4 @@ -ignition-rendering6 (6.2.1-1~jammy) jammy; urgency=medium +ignition-rendering6 (6.2.1+osrf-1~jammy) jammy; urgency=medium * First release for jammy