mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-electronics/gazebo: treeclean together with then obsolete libraries
Closes: https://bugs.gentoo.org/580734 (pkgremoved) Closes: https://bugs.gentoo.org/585528 (pkgremoved) Closes: https://bugs.gentoo.org/643772 (pkgremoved) Closes: https://bugs.gentoo.org/723118 (pkgremoved) Closes: https://bugs.gentoo.org/735082 (pkgremoved) Closes: https://bugs.gentoo.org/740720 (pkgremoved) Closes: https://bugs.gentoo.org/741442 (pkgremoved) Closes: https://bugs.gentoo.org/750839 (pkgremoved) Closes: https://bugs.gentoo.org/752099 (pkgremoved) Closes: https://bugs.gentoo.org/764092 (pkgremoved) Closes: https://bugs.gentoo.org/789486 (pkgremoved) Closes: https://bugs.gentoo.org/797691 (pkgremoved) Closes: https://bugs.gentoo.org/798699 (pkgremoved) Closes: https://bugs.gentoo.org/827964 (pkgremoved) Closes: https://bugs.gentoo.org/829273 (pkgremoved) Closes: https://bugs.gentoo.org/829287 (pkgremoved) Closes: https://bugs.gentoo.org/829952 (pkgremoved) Closes: https://bugs.gentoo.org/830054 (pkgremoved) Closes: https://bugs.gentoo.org/830993 (pkgremoved) Closes: https://bugs.gentoo.org/832790 (pkgremoved) Closes: https://bugs.gentoo.org/833363 (pkgremoved) Closes: https://bugs.gentoo.org/857195 (pkgremoved) Closes: https://bugs.gentoo.org/866317 (pkgremoved) Closes: https://bugs.gentoo.org/868216 (pkgremoved) Closes: https://bugs.gentoo.org/888835 (pkgremoved) Closes: https://bugs.gentoo.org/908410 (pkgremoved) Closes: https://bugs.gentoo.org/913044 (pkgremoved) Closes: https://bugs.gentoo.org/920773 (pkgremoved) Closes: https://bugs.gentoo.org/922604 (pkgremoved) Closes: https://bugs.gentoo.org/926312 (pkgremoved) Closes: https://bugs.gentoo.org/937608 (pkgremoved) Closes: https://bugs.gentoo.org/938271 (pkgremoved) Closes: https://bugs.gentoo.org/940511 (pkgremoved) Closes: https://bugs.gentoo.org/947390 (pkgremoved) Closes: https://bugs.gentoo.org/949276 (pkgremoved) Closes: https://bugs.gentoo.org/953043 (pkgremoved) Closes: https://bugs.gentoo.org/953854 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,3 +0,0 @@
|
||||
DIST ignition-cmake2-2.17.0.tar.bz2 212353 BLAKE2B 4945559d35cea859383fc510fd2b78cbbd3127ef58c94fa239ecad3643725b7e003a9a18ddb25deec42938196adaf0a4f3466b602cf35dd1fe58f02c5a0ede91 SHA512 bb7263531c772474780fab990dafaa9697b1ce7d9113053bc7af3b2ae6cf292a46c6b37452e5bf720ef34ed3a9732503106d5e55b5ae813bed65618ae4ee69dc
|
||||
DIST ignition-cmake2-2.17.1.tar.bz2 205001 BLAKE2B aed538d6c1ebd722067e4747a69be86711ee3d31cabc2070291496cc80cfdb2375530030223378a6a8a5fc98a5e0be1cd3b772ccc06ba9771d9faf7435663382 SHA512 4a07fd7b63b0186855f855a557dfac30ba716c031042a3d5bd0e816eccc77de6c6b221a6b0669e79f743e23c9ae2bd529e23c3bcc7d890062baade378dbbf777
|
||||
DIST ignition-cmake2_2.17.2.tar.gz 272579 BLAKE2B 564f6e55d565cd1fd8748a7e5b207660230a73057b99f8739f9ae24b7af6ab0cfef513acdba1fa1e1869335f3090c1a8dded49f3c4a064782cc9ae557cbdc028 SHA512 2745afb72b6a410df4b4a256eafecc7e0b5ca6e6b1a334d6778859cd75462f4a03bd783cec66e5d8dc1428b4fce6ffb5f39a67744a92b424c058686d2ab889ec
|
||||
@@ -1,54 +0,0 @@
|
||||
Index: ignition-cmake-2.17.0/cmake/FindIgnProtobuf.cmake
|
||||
===================================================================
|
||||
--- ignition-cmake-2.17.0.orig/cmake/FindIgnProtobuf.cmake
|
||||
+++ ignition-cmake-2.17.0/cmake/FindIgnProtobuf.cmake
|
||||
@@ -26,12 +26,12 @@
|
||||
include(IgnPkgConfig)
|
||||
ign_pkg_config_entry(IgnProtobuf "protobuf >= ${IgnProtobuf_FIND_VERSION}")
|
||||
|
||||
-find_package(Protobuf ${IgnProtobuf_FIND_VERSION} QUIET CONFIG)
|
||||
+find_package(protobuf ${IgnProtobuf_FIND_VERSION} QUIET CONFIG)
|
||||
|
||||
-if(NOT ${Protobuf_FOUND})
|
||||
+if(NOT ${protobuf_FOUND})
|
||||
# If a config-file was not found, then fall back on the system-installed
|
||||
# find-module that comes with CMake.
|
||||
- find_package(Protobuf ${IgnProtobuf_FIND_VERSION})
|
||||
+ find_package(protobuf ${IgnProtobuf_FIND_VERSION})
|
||||
endif()
|
||||
|
||||
set(IgnProtobuf_missing_components "")
|
||||
@@ -49,21 +49,21 @@ foreach(component ${IgnProtobuf_FIND_COM
|
||||
|
||||
if((${component} STREQUAL "libprotobuf") OR (${component} STREQUAL "all"))
|
||||
if((NOT PROTOBUF_LIBRARY) AND (NOT TARGET protobuf::libprotobuf))
|
||||
- set(Protobuf_FOUND false)
|
||||
+ set(protobuf_FOUND false)
|
||||
ign_string_append(IgnProtobuf_missing_components "libprotobuf" DELIM " ")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if((${component} STREQUAL "libprotoc") OR (${component} STREQUAL "all"))
|
||||
if((NOT PROTOBUF_PROTOC_LIBRARY) AND (NOT TARGET protobuf::libprotoc))
|
||||
- set(Protobuf_FOUND false)
|
||||
+ set(protobuf_FOUND false)
|
||||
ign_string_append(IgnProtobuf_missing_components "libprotoc" DELIM " ")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if((${component} STREQUAL "protoc") OR (${component} STREQUAL "all"))
|
||||
if((NOT PROTOBUF_PROTOC_EXECUTABLE) AND (NOT TARGET protobuf::protoc))
|
||||
- set(Protobuf_FOUND false)
|
||||
+ set(protobuf_FOUND false)
|
||||
ign_string_append(IgnProtobuf_missing_components "protoc" DELIM " ")
|
||||
endif()
|
||||
endif()
|
||||
@@ -74,7 +74,7 @@ if(IgnProtobuf_missing_components AND NO
|
||||
message(STATUS "Missing required protobuf components: ${IgnProtobuf_missing_components}")
|
||||
endif()
|
||||
|
||||
-if(${Protobuf_FOUND})
|
||||
+if(${protobuf_FOUND})
|
||||
# If we have found Protobuf, then set the IgnProtobuf_FOUND flag to true so
|
||||
# that ign_find_package(~) knows that we were successful.
|
||||
set(IgnProtobuf_FOUND true)
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: gz-cmake-ignition-cmake2_2.17.2/cmake/FindIgnProtobuf.cmake
|
||||
===================================================================
|
||||
--- gz-cmake-ignition-cmake2_2.17.2.orig/cmake/FindIgnProtobuf.cmake
|
||||
+++ gz-cmake-ignition-cmake2_2.17.2/cmake/FindIgnProtobuf.cmake
|
||||
@@ -31,7 +31,7 @@ find_package(Protobuf ${IgnProtobuf_FIND
|
||||
if(NOT ${Protobuf_FOUND})
|
||||
# If a config-file was not found, then fall back on the system-installed
|
||||
# find-module that comes with CMake.
|
||||
- find_package(Protobuf ${IgnProtobuf_FIND_VERSION})
|
||||
+ find_package(Protobuf CONFIG REQUIRED)
|
||||
endif()
|
||||
|
||||
set(IgnProtobuf_missing_components "")
|
||||
@@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="CMake modules to be used by the Ignition projects"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
|
||||
SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${PN}2-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
PATCHES=( "${FILESDIR}/protobuf.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="CMake modules to be used by the Ignition projects"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
|
||||
SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${PN}2-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
PATCHES=( "${FILESDIR}/protobuf.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="CMake modules to be used by the Ignition projects"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
|
||||
SRC_URI="https://github.com/gazebosim/gz-cmake/archive/refs/tags/${PN}2_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
PATCHES=( "${FILESDIR}/protobuf2.patch" )
|
||||
S="${WORKDIR}/gz-cmake-${PN}2_${PV}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="CMake modules to be used by the Ignition projects"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
|
||||
SRC_URI="https://github.com/gazebosim/gz-cmake/archive/refs/tags/${PN}2_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
PATCHES=( "${FILESDIR}/protobuf.patch" )
|
||||
S="${WORKDIR}/gz-cmake-${PN}2_${PV}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="bitbucket">ignitionrobotics/ign-cmake</remote-id>
|
||||
<remote-id type="github">ignitionrobotics/ign-cmake</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,5 +0,0 @@
|
||||
DIST console_bridge-1.0.2-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
|
||||
DIST console_bridge-1.0.2-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
|
||||
DIST console_bridge-1.0.2.tar.gz 259600 BLAKE2B e697219b1779534fd935b6bd940317d4aed2fd7b5c2673a08cf9bb015034f2ea9db85d2af0015805f8508d68c88ece39be8585f681afacb140fb8128c3fd18fe SHA512 ed427da8e59f9629f8d70e0a14415f88177c06fbaf7334bee56135dde91d19a1b54f5c9c668e0fd68314ab8dfd61446a174b9f528304decc5d4626a7c98882cb
|
||||
DIST console_bridge-9999-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
|
||||
DIST console_bridge-9999-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
|
||||
@@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/ros/console_bridge"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake
|
||||
|
||||
AMENT_LINT_VER=0.9.5
|
||||
EXTERNAL_PROGS="
|
||||
https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cppcheck/ament_cppcheck/main.py -> ${P}-ament-${AMENT_LINT_VER}-cppcheck.py
|
||||
https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py
|
||||
"
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI="${EXTERNAL_PROGS}"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="${EXTERNAL_PROGS}
|
||||
https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
|
||||
HOMEPAGE="https://wiki.ros.org/console_bridge"
|
||||
LICENSE="BSD"
|
||||
SLOT="0/1"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="dev-libs/boost:="
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-util/cppcheck
|
||||
)
|
||||
"
|
||||
PATCHES=( "${FILESDIR}/tests.patch" )
|
||||
|
||||
src_prepare() {
|
||||
# Avoid wgeting it. #733704
|
||||
sed -e 's/add_dependencies(console_bridge wget_cppchec/#/' -i test/CMakeLists.txt || die
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_TESTING=$(usex test ON OFF)
|
||||
)
|
||||
cmake_src_configure
|
||||
|
||||
# For tests
|
||||
if use test ; then
|
||||
cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cppcheck.py" "${BUILD_DIR}/test/cppcheck.py" || die
|
||||
cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cpplint.py" "${BUILD_DIR}/test/cpplint.py" || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
export AMENT_CPPCHECK_ALLOW_1_88=yes
|
||||
cmake_src_test
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/ros/console_bridge"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake
|
||||
|
||||
AMENT_LINT_VER=0.9.5
|
||||
EXTERNAL_PROGS="
|
||||
https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cppcheck/ament_cppcheck/main.py -> ${P}-ament-${AMENT_LINT_VER}-cppcheck.py
|
||||
https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py
|
||||
"
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI="${EXTERNAL_PROGS}"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="${EXTERNAL_PROGS}
|
||||
https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
|
||||
HOMEPAGE="https://wiki.ros.org/console_bridge"
|
||||
LICENSE="BSD"
|
||||
SLOT="0/1"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="dev-libs/boost:="
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-util/cppcheck
|
||||
)
|
||||
"
|
||||
PATCHES=( "${FILESDIR}/tests.patch" )
|
||||
|
||||
src_prepare() {
|
||||
# Avoid wgeting it. #733704
|
||||
sed -e 's/add_dependencies(console_bridge wget_cppchec/#/' -i test/CMakeLists.txt || die
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_TESTING=$(usex test ON OFF)
|
||||
)
|
||||
cmake_src_configure
|
||||
|
||||
# For tests
|
||||
if use test ; then
|
||||
cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cppcheck.py" "${BUILD_DIR}/test/cppcheck.py" || die
|
||||
cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cpplint.py" "${BUILD_DIR}/test/cpplint.py" || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
export AMENT_CPPCHECK_ALLOW_1_88=yes
|
||||
cmake_src_test
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
This test does not make sense since the file is not yet installed.
|
||||
|
||||
Index: console_bridge-1.0.1/test/CMakeLists.txt
|
||||
===================================================================
|
||||
--- console_bridge-1.0.1.orig/test/CMakeLists.txt
|
||||
+++ console_bridge-1.0.1/test/CMakeLists.txt
|
||||
@@ -77,7 +77,7 @@ if(WGET_EXE)
|
||||
"--counting=detailed"
|
||||
"--extensions=cpp,h"
|
||||
"--linelength=100"
|
||||
- "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon"
|
||||
+ "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon,-build/header_guard"
|
||||
"${PROJECT_SOURCE_DIR}/include/console_bridge/console.h"
|
||||
"${PROJECT_SOURCE_DIR}/src/console.cpp"
|
||||
)
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>ros@gentoo.org</email>
|
||||
<name>Gentoo ROS Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">ros/console_bridge</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1 +0,0 @@
|
||||
DIST sdformat-9.10.0.tar.bz2 709883 BLAKE2B 3f79ad7d13cc3e2b4e4ee7b2dfc5819e805ccbae7678e4ea4d4e2577845ddc3bc69c15043132de989ac286642757bcf0c1d66990fddbc3b61aa1a297c78b7682 SHA512 233305adc98a57eef360200d651bf0951229b12383e49496e05989ce165d88d4fd86c40819a6b6528125fe0185157d26b5712880332971d8bd2fd1f7daa4c6e8
|
||||
@@ -1,31 +0,0 @@
|
||||
Index: sdformat-9.10.0/tools/xmlschema.rb
|
||||
===================================================================
|
||||
--- sdformat-9.10.0.orig/tools/xmlschema.rb
|
||||
+++ sdformat-9.10.0/tools/xmlschema.rb
|
||||
@@ -265,7 +265,7 @@ opt_parser.parse!
|
||||
if infile.nil?
|
||||
puts "Missing option -i."
|
||||
exit
|
||||
-elsif !File.exists?(infile)
|
||||
+elsif !File.exist?(infile)
|
||||
puts "Input file[#{infile}] does not exist\n"
|
||||
exit
|
||||
end
|
||||
@@ -273,7 +273,7 @@ end
|
||||
if $path.nil?
|
||||
puts "Missing option -s."
|
||||
exit
|
||||
-elsif !Dir.exists?($path)
|
||||
+elsif !Dir.exist?($path)
|
||||
puts "SDF source dir[#{$path}] does not exist\n"
|
||||
exit
|
||||
end
|
||||
@@ -281,7 +281,7 @@ end
|
||||
if outdir.nil?
|
||||
puts "Missing output directory, option -o."
|
||||
exit
|
||||
-elsif !Dir.exists?(outdir)
|
||||
+elsif !Dir.exist?(outdir)
|
||||
Dir.mkdir(outdir)
|
||||
end
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Simulation Description Format (SDF) parser"
|
||||
HOMEPAGE="http://sdformat.org/"
|
||||
SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
# subslot = libsdformat major
|
||||
SLOT="0/9"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/urdfdom-1:=
|
||||
dev-libs/tinyxml
|
||||
dev-libs/boost:=
|
||||
sci-libs/ignition-math:6=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
dev-lang/ruby:*
|
||||
virtual/pkgconfig
|
||||
"
|
||||
PATCHES=( "${FILESDIR}/ruby.patch" )
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
# get rid of default flags
|
||||
sed -i -e '/_FLAGS_RELWITHDEBINFO/d' cmake/DefaultCFlags.cmake || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_INTERNAL_URDF=OFF
|
||||
-DUSE_EXTERNAL_TINYXML=ON
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
DIST urdfdom-3.1.0.tar.gz 286589 BLAKE2B cfe0ba0160091c4160f4ad7d6648657cc19fcaea4346e89d4a8e685c67bbf038b4a23c0133f8af987d4aee7dac623d10c61eb98573e9a0ebf57babd7d6d48b7d SHA512 2ca34982550f0d83504ec711f45c59fa9011802ad85ffc8511fb02b7421ee99daad3f00d82925cd3490dd0164dfe7881c0d52c05fbea2be0449e57e565034695
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>ros@gentoo.org</email>
|
||||
<name>Gentoo ROS Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">ros/urdfdom</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/ros/urdfdom"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="URDF (U-Robot Description Format) library"
|
||||
HOMEPAGE="http://ros.org/wiki/urdf"
|
||||
LICENSE="BSD"
|
||||
SLOT="0/3"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
|
||||
>=dev-libs/console_bridge-0.3:=
|
||||
dev-libs/tinyxml[stl]"
|
||||
DEPEND="${RDEPEND}"
|
||||
@@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/ros/urdfdom"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="URDF (U-Robot Description Format) library"
|
||||
HOMEPAGE="http://ros.org/wiki/urdf"
|
||||
LICENSE="BSD"
|
||||
SLOT="0/3"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
|
||||
>=dev-libs/console_bridge-0.3:=
|
||||
dev-libs/tinyxml[stl]"
|
||||
DEPEND="${RDEPEND}"
|
||||
@@ -1 +0,0 @@
|
||||
DIST urdfdom_headers-1.1.0.tar.gz 12676 BLAKE2B 1c2dbc5d3b63a493abdf1c6e5d41ed51e101332c67d5aad61f073dfe1881ade7be8345a6fea5816ebbf100804d8b13ca1d6a195a54caa1ef093fde49929cb34d SHA512 beae18cd21ad58c7f267075de1242a08579a1667853cc42c3c744484927035bb0095c66751eda4e1baa3ac0103dce4b8c94ef25d83defb42077c1de9342f769a
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>ros@gentoo.org</email>
|
||||
<name>Gentoo ROS Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">ros/urdfdom_headers</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/ros/urdfdom_headers"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="URDF (U-Robot Description Format) headers"
|
||||
HOMEPAGE="http://ros.org/wiki/urdf"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
@@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
SCM=""
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/ros/urdfdom_headers"
|
||||
fi
|
||||
|
||||
inherit ${SCM} cmake
|
||||
|
||||
if [ "${PV#9999}" != "${PV}" ] ; then
|
||||
SRC_URI=""
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="URDF (U-Robot Description Format) headers"
|
||||
HOMEPAGE="http://ros.org/wiki/urdf"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
@@ -1,2 +0,0 @@
|
||||
DIST ignition-msgs5_5.11.0.tar.gz 346560 BLAKE2B 87dd9c99f9d8bf8719f2968a89fbe9fd276d4b35f5a870eee0ab7476affdbca565fbdc7c3e5e94a29a21df6e7b6ace138a8db00ba838de6d8ba07478dd6a3456 SHA512 bbd71339c816947cbf91778303c4370e3d03b068421f0a043de3462d5eb691b16cbc3d19804cb353ad03f78f3e187af366e9d950fa05ebf22d0d08c565748bc4
|
||||
DIST ignition-msgs5_5.11.1.tar.gz 346631 BLAKE2B 2d96ecd4e9fdfc6d1b63659fd63a17b75ab89588bd3acb7fb9a103a15c8469034b7a3e02acd2b82ed85b6592904e0abfe9adf204681dacb2a8386807dc1e1fac SHA512 0e9442a61a08c0ed91907b1d9855332a5a0dd5f9726a44e132261f270ac49d2c0956e3a0a0f5a118ede369bc030b3b7e4e1abb02c72e4df3187266cd56b7a0c4
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- gz-msgs-ignition-msgs5_5.11.0.orig/CMakeLists.txt
|
||||
+++ gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt
|
||||
@@ -62,7 +62,7 @@ message(STATUS "\n\n-- ====== Finding De
|
||||
|
||||
#--------------------------------------
|
||||
# Find Protobuf
|
||||
-set(REQ_PROTOBUF_VER 3)
|
||||
+set(REQ_PROTOBUF_VER 27.2.0)
|
||||
ign_find_package(IgnProtobuf
|
||||
VERSION ${REQ_PROTOBUF_VER}
|
||||
REQUIRED
|
||||
@@ -1,78 +0,0 @@
|
||||
See: https://github.com/gazebosim/gz-msgs/commit/22c57006798470db63e8ecaff7b49dce34d5e76f
|
||||
|
||||
Index: gz-msgs-ignition-msgs5_5.11.1/src/Generator.cc
|
||||
===================================================================
|
||||
--- gz-msgs-ignition-msgs5_5.11.1.orig/src/Generator.cc
|
||||
+++ gz-msgs-ignition-msgs5_5.11.1/src/Generator.cc
|
||||
@@ -71,12 +71,12 @@ bool Generator::Generate(const FileDescr
|
||||
OutputDirectory *_generatorContext,
|
||||
std::string * /*_error*/) const
|
||||
{
|
||||
- std::string headerFilename = _file->name();
|
||||
+ std::string headerFilename(_file->name());
|
||||
std::string delim = ".proto";
|
||||
size_t pos = headerFilename.rfind(delim);
|
||||
headerFilename.replace(pos, delim.size(), ".pb.h");
|
||||
|
||||
- std::string sourceFilename = _file->name();
|
||||
+ std::string sourceFilename( _file->name());
|
||||
pos = sourceFilename.rfind(delim);
|
||||
sourceFilename.replace(pos, delim.size(), ".pb.cc");
|
||||
|
||||
@@ -142,10 +142,11 @@ bool Generator::Generate(const FileDescr
|
||||
printer.Print("#endif\n", "name", "includes");
|
||||
|
||||
// Call the IGN_REGISTER_STATIC_MSG macro
|
||||
- std::string factory = "IGN_REGISTER_STATIC_MSG(\"ign_msgs.";
|
||||
- factory += _file->message_type(0)->name() + "\", " +
|
||||
- _file->message_type(0)->name() +")";
|
||||
- printer.Print(factory.c_str(), "name", "includes");
|
||||
+ std::stringstream factory;
|
||||
+ factory << "IGN_REGISTER_STATIC_MSG(\"ign_msgs.";
|
||||
+ factory << _file->message_type(0)->name() << "\", " <<
|
||||
+ _file->message_type(0)->name() << ")";
|
||||
+ printer.Print(factory.str(), "name", "includes");
|
||||
}
|
||||
|
||||
// Inject code in the auto-generated header files immediately before closing
|
||||
@@ -156,26 +157,27 @@ bool Generator::Generate(const FileDescr
|
||||
io::Printer printer(output.get(), '$');
|
||||
|
||||
// Define std::unique_ptr types for our messages
|
||||
- std::string ptrTypes = "typedef std::unique_ptr<"
|
||||
- + _file->message_type(0)->name() + "> "
|
||||
- + _file->message_type(0)->name() + "UniquePtr;\n";
|
||||
+ std::stringstream ptrTypes;
|
||||
+ ptrTypes << "typedef std::unique_ptr<"
|
||||
+ << _file->message_type(0)->name() << "> "
|
||||
+ << _file->message_type(0)->name() << "UniquePtr;\n";
|
||||
|
||||
// Define const std::unique_ptr types for our messages
|
||||
- ptrTypes += "typedef std::unique_ptr<const "
|
||||
- + _file->message_type(0)->name() + "> Const"
|
||||
- + _file->message_type(0)->name() + "UniquePtr;\n";
|
||||
+ ptrTypes << "typedef std::unique_ptr<const "
|
||||
+ << _file->message_type(0)->name() << "> Const"
|
||||
+ << _file->message_type(0)->name() << "UniquePtr;\n";
|
||||
|
||||
// Define std::shared_ptr types for our messages
|
||||
- ptrTypes += "typedef std::shared_ptr<"
|
||||
- + _file->message_type(0)->name() + "> "
|
||||
- + _file->message_type(0)->name() + "SharedPtr;\n";
|
||||
+ ptrTypes << "typedef std::shared_ptr<"
|
||||
+ << _file->message_type(0)->name() << "> "
|
||||
+ << _file->message_type(0)->name() << "SharedPtr;\n";
|
||||
|
||||
// Define const std::shared_ptr types for our messages
|
||||
- ptrTypes += "typedef std::shared_ptr<const "
|
||||
- + _file->message_type(0)->name() + "> Const"
|
||||
- + _file->message_type(0)->name() + "SharedPtr;\n";
|
||||
+ ptrTypes << "typedef std::shared_ptr<const "
|
||||
+ << _file->message_type(0)->name() << "> Const"
|
||||
+ << _file->message_type(0)->name() << "SharedPtr;\n";
|
||||
|
||||
- printer.Print(ptrTypes.c_str(), "name", "namespace_scope");
|
||||
+ printer.Print(ptrTypes.str(), "name", "namespace_scope");
|
||||
}
|
||||
|
||||
// Pop the warning suppression stack for MSVC
|
||||
@@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Protobuf messages and functions for robot applications"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-msgs"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/protobuf:=
|
||||
sci-libs/ignition-math:6=
|
||||
dev-libs/tinyxml2:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="dev-build/ignition-cmake:2"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}"
|
||||
@@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Protobuf messages and functions for robot applications"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-msgs"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/protobuf:=
|
||||
sci-libs/ignition-math:6=
|
||||
dev-libs/tinyxml2:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="dev-build/ignition-cmake:2"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}"
|
||||
PATCHES=( "${FILESDIR}/protobuf.patch" )
|
||||
@@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Protobuf messages and functions for robot applications"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-msgs"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-msgs/archive/${PN}5_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/protobuf:=
|
||||
sci-libs/ignition-math:6=
|
||||
dev-libs/tinyxml2:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="dev-build/ignition-cmake:2"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}"
|
||||
PATCHES=( "${FILESDIR}/protobuf30.patch" )
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="bitbucket">ignitionrobotics/ign-msgs</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,2 +0,0 @@
|
||||
DIST ignition-transport8_8.4.0.tar.gz 610048 BLAKE2B 82ece18d0777d8ca4f64d3b5c37a8532f3a1d067772303f4373e663a99e95573f8991db465a2d6d86606c8565d2af667c96f2ecf7a8dca032c5ab2d7888e7ea4 SHA512 7ed3d59b707f2d1b26bf80dfa7cc9633d4ce5a39b97c5396012e73bd949859ad3b71f79b8aa025ca78f5c1796bfdc9006c1c704f1b6b75e854ffcfc4c3ab53f8
|
||||
DIST ignition-transport8_8.5.1.tar.gz 610842 BLAKE2B 8b10de23ad68cd24885570f9703ef079f61dc1d4e53e8074da124f9a320bdd1e7aed7132022b59da3be4839880cb02d81c69fe275bc6b976032c4f0684b18eb8 SHA512 8e5b54189ded680c704a6f6d9ddf343f41fc1581fe2b097de75e776730950f4439895ea15b5eb83b8eddc48b1e3b81bc1b8cfafe4cce972d2d75f12197653a6e
|
||||
@@ -1,76 +0,0 @@
|
||||
From e35a697b619dbcecec0ae0c8b8f0a644d368abf3 Mon Sep 17 00:00:00 2001
|
||||
From: Silvio Traversaro <silvio@traversaro.it>
|
||||
Date: Tue, 6 Jun 2023 17:19:49 +0200
|
||||
Subject: [PATCH] Fix compatibility with protobuf 22
|
||||
|
||||
Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
|
||||
---
|
||||
CMakeLists.txt | 2 --
|
||||
include/gz/transport/RepHandler.hh | 8 ++++++--
|
||||
include/gz/transport/SubscriptionHandler.hh | 6 ++++--
|
||||
3 files changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5e3aab859..843fb17cb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -38,9 +38,7 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
|
||||
|
||||
#--------------------------------------
|
||||
# Find Protobuf
|
||||
-set(REQ_PROTOBUF_VER 3)
|
||||
ign_find_package(IgnProtobuf
|
||||
- VERSION ${REQ_PROTOBUF_VER}
|
||||
REQUIRED
|
||||
PRETTY Protobuf)
|
||||
|
||||
diff --git a/include/gz/transport/RepHandler.hh b/include/gz/transport/RepHandler.hh
|
||||
index 5d27f98c1..a5675fca7 100644
|
||||
--- a/include/gz/transport/RepHandler.hh
|
||||
+++ b/include/gz/transport/RepHandler.hh
|
||||
@@ -26,7 +26,7 @@
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
-#if GOOGLE_PROTOBUF_VERSION > 2999999
|
||||
+#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000
|
||||
#include <google/protobuf/stubs/casts.h>
|
||||
#endif
|
||||
|
||||
@@ -140,7 +140,11 @@ namespace ignition
|
||||
return false;
|
||||
}
|
||||
|
||||
-#if GOOGLE_PROTOBUF_VERSION > 2999999
|
||||
+#if GOOGLE_PROTOBUF_VERSION >= 4022000
|
||||
+ auto msgReq =
|
||||
+ google::protobuf::internal::DownCast<const Req*>(&_msgReq);
|
||||
+ auto msgRep = google::protobuf::internal::DownCast<Rep*>(&_msgRep);
|
||||
+#elif GOOGLE_PROTOBUF_VERSION > 2999999
|
||||
auto msgReq = google::protobuf::down_cast<const Req*>(&_msgReq);
|
||||
auto msgRep = google::protobuf::down_cast<Rep*>(&_msgRep);
|
||||
#else
|
||||
diff --git a/include/gz/transport/SubscriptionHandler.hh b/include/gz/transport/SubscriptionHandler.hh
|
||||
index 78477add0..d69c83ddb 100644
|
||||
--- a/include/gz/transport/SubscriptionHandler.hh
|
||||
+++ b/include/gz/transport/SubscriptionHandler.hh
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
|
||||
-#if GOOGLE_PROTOBUF_VERSION >= 3000000
|
||||
+#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000
|
||||
#include <google/protobuf/stubs/casts.h>
|
||||
#endif
|
||||
|
||||
@@ -211,7 +211,9 @@ namespace ignition
|
||||
if (!this->UpdateThrottling())
|
||||
return true;
|
||||
|
||||
-#if GOOGLE_PROTOBUF_VERSION >= 3000000
|
||||
+#if GOOGLE_PROTOBUF_VERSION >= 4022000
|
||||
+ auto msgPtr = google::protobuf::internal::DownCast<const T*>(&_msg);
|
||||
+#elif GOOGLE_PROTOBUF_VERSION >= 3000000
|
||||
auto msgPtr = google::protobuf::down_cast<const T*>(&_msg);
|
||||
#else
|
||||
auto msgPtr = google::protobuf::internal::down_cast<const T*>(&_msg);
|
||||
@@ -1,348 +0,0 @@
|
||||
See: https://github.com/gazebosim/gz-transport/commit/34e12ff4593370cba314a94f025172dd9af1685a
|
||||
|
||||
Index: gz-transport-ignition-transport8_8.5.1/include/gz/transport/RepHandler.hh
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/include/gz/transport/RepHandler.hh
|
||||
+++ gz-transport-ignition-transport8_8.5.1/include/gz/transport/RepHandler.hh
|
||||
@@ -140,7 +140,12 @@ namespace ignition
|
||||
return false;
|
||||
}
|
||||
|
||||
-#if GOOGLE_PROTOBUF_VERSION >= 4022000
|
||||
+#if GOOGLE_PROTOBUF_VERSION >= 5028000
|
||||
+ const auto msgReq =
|
||||
+ google::protobuf::DynamicCastMessage<Req>(&_msgReq);
|
||||
+ auto msgRep =
|
||||
+ google::protobuf::DynamicCastMessage<Rep>(&_msgRep);
|
||||
+#elif GOOGLE_PROTOBUF_VERSION >= 4022000
|
||||
auto msgReq =
|
||||
google::protobuf::internal::DownCast<const Req*>(&_msgReq);
|
||||
auto msgRep = google::protobuf::internal::DownCast<Rep*>(&_msgRep);
|
||||
@@ -192,13 +197,13 @@ namespace ignition
|
||||
// Documentation inherited.
|
||||
public: virtual std::string ReqTypeName() const
|
||||
{
|
||||
- return Req().GetTypeName();
|
||||
+ return std::string(Req().GetTypeName());
|
||||
}
|
||||
|
||||
// Documentation inherited.
|
||||
public: virtual std::string RepTypeName() const
|
||||
{
|
||||
- return Rep().GetTypeName();
|
||||
+ return std::string(Rep().GetTypeName());
|
||||
}
|
||||
|
||||
/// \brief Create a specific protobuf message given its serialized data.
|
||||
Index: gz-transport-ignition-transport8_8.5.1/include/gz/transport/ReqHandler.hh
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/include/gz/transport/ReqHandler.hh
|
||||
+++ gz-transport-ignition-transport8_8.5.1/include/gz/transport/ReqHandler.hh
|
||||
@@ -284,13 +284,13 @@ namespace ignition
|
||||
// Documentation inherited.
|
||||
public: virtual std::string ReqTypeName() const
|
||||
{
|
||||
- return Req().GetTypeName();
|
||||
+ return std::string(Req().GetTypeName());
|
||||
}
|
||||
|
||||
// Documentation inherited.
|
||||
public: virtual std::string RepTypeName() const
|
||||
{
|
||||
- return Rep().GetTypeName();
|
||||
+ return std::string(Rep().GetTypeName());
|
||||
}
|
||||
|
||||
/// \brief Protobuf message containing the request's parameters.
|
||||
@@ -381,7 +381,7 @@ namespace ignition
|
||||
public: virtual std::string ReqTypeName() const
|
||||
{
|
||||
if (this->reqMsg)
|
||||
- return this->reqMsg->GetTypeName();
|
||||
+ return std::string(this->reqMsg->GetTypeName());
|
||||
else
|
||||
{
|
||||
std::cerr << "ReqHandler::ReqTypeName() Warning: Using ReqTypeName() "
|
||||
@@ -394,7 +394,7 @@ namespace ignition
|
||||
public: virtual std::string RepTypeName() const
|
||||
{
|
||||
if (this->repMsg)
|
||||
- return this->repMsg->GetTypeName();
|
||||
+ return std::string(this->repMsg->GetTypeName());
|
||||
else
|
||||
{
|
||||
std::cerr << "ReqHandler::RepTypeName() Warning: Using RepTypeName() "
|
||||
Index: gz-transport-ignition-transport8_8.5.1/include/gz/transport/SubscriptionHandler.hh
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/include/gz/transport/SubscriptionHandler.hh
|
||||
+++ gz-transport-ignition-transport8_8.5.1/include/gz/transport/SubscriptionHandler.hh
|
||||
@@ -185,7 +185,7 @@ namespace ignition
|
||||
// Documentation inherited.
|
||||
public: std::string TypeName()
|
||||
{
|
||||
- return T().GetTypeName();
|
||||
+ return std::string(T().GetTypeName());
|
||||
}
|
||||
|
||||
/// \brief Set the callback for this handler.
|
||||
@@ -211,7 +211,10 @@ namespace ignition
|
||||
if (!this->UpdateThrottling())
|
||||
return true;
|
||||
|
||||
-#if GOOGLE_PROTOBUF_VERSION >= 4022000
|
||||
+
|
||||
+#if GOOGLE_PROTOBUF_VERSION >= 5028000
|
||||
+ auto msgPtr = google::protobuf::DynamicCastMessage<T>(&_msg);
|
||||
+#elif GOOGLE_PROTOBUF_VERSION >= 4022000
|
||||
auto msgPtr = google::protobuf::internal::DownCast<const T*>(&_msg);
|
||||
#elif GOOGLE_PROTOBUF_VERSION >= 3000000
|
||||
auto msgPtr = google::protobuf::down_cast<const T*>(&_msg);
|
||||
Index: gz-transport-ignition-transport8_8.5.1/include/gz/transport/detail/Node.hh
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/include/gz/transport/detail/Node.hh
|
||||
+++ gz-transport-ignition-transport8_8.5.1/include/gz/transport/detail/Node.hh
|
||||
@@ -32,7 +32,7 @@ namespace ignition
|
||||
const std::string &_topic,
|
||||
const AdvertiseMessageOptions &_options)
|
||||
{
|
||||
- return this->Advertise(_topic, MessageT().GetTypeName(), _options);
|
||||
+ return this->Advertise(_topic, std::string(MessageT().GetTypeName()), _options);
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
@@ -265,7 +265,7 @@ namespace ignition
|
||||
this->Shared()->myReplierAddress,
|
||||
this->Shared()->replierId.ToString(),
|
||||
this->Shared()->pUuid, this->NodeUuid(),
|
||||
- RequestT().GetTypeName(), ReplyT().GetTypeName(), _options);
|
||||
+ std::string(RequestT().GetTypeName()), std::string(ReplyT().GetTypeName()), _options);
|
||||
|
||||
if (!this->Shared()->AdvertisePublisher(publisher))
|
||||
{
|
||||
@@ -418,8 +418,8 @@ namespace ignition
|
||||
std::lock_guard<std::recursive_mutex> lk(this->Shared()->mutex);
|
||||
localResponserFound = this->Shared()->repliers.FirstHandler(
|
||||
fullyQualifiedTopic,
|
||||
- RequestT().GetTypeName(),
|
||||
- ReplyT().GetTypeName(),
|
||||
+ std::string(RequestT().GetTypeName()),
|
||||
+ std::string(ReplyT().GetTypeName()),
|
||||
repHandler);
|
||||
}
|
||||
|
||||
@@ -456,7 +456,7 @@ namespace ignition
|
||||
if (this->Shared()->TopicPublishers(fullyQualifiedTopic, addresses))
|
||||
{
|
||||
this->Shared()->SendPendingRemoteReqs(fullyQualifiedTopic,
|
||||
- RequestT().GetTypeName(), ReplyT().GetTypeName());
|
||||
+ std::string(RequestT().GetTypeName()), std::string(ReplyT().GetTypeName()));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -549,7 +549,7 @@ namespace ignition
|
||||
// If the responser is within my process.
|
||||
IRepHandlerPtr repHandler;
|
||||
if (this->Shared()->repliers.FirstHandler(fullyQualifiedTopic,
|
||||
- _request.GetTypeName(), _reply.GetTypeName(), repHandler))
|
||||
+ std::string(_request.GetTypeName()), std::string(_reply.GetTypeName()), repHandler))
|
||||
{
|
||||
// There is a responser in my process, let's use it.
|
||||
_result = repHandler->RunLocalCallback(_request, _reply);
|
||||
@@ -565,7 +565,7 @@ namespace ignition
|
||||
if (this->Shared()->TopicPublishers(fullyQualifiedTopic, addresses))
|
||||
{
|
||||
this->Shared()->SendPendingRemoteReqs(fullyQualifiedTopic,
|
||||
- _request.GetTypeName(), _reply.GetTypeName());
|
||||
+ std::string(_request.GetTypeName()), std::string(_reply.GetTypeName()));
|
||||
}
|
||||
else
|
||||
{
|
||||
Index: gz-transport-ignition-transport8_8.5.1/src/CIface_TEST.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/src/CIface_TEST.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/src/CIface_TEST.cc
|
||||
@@ -93,7 +93,7 @@ TEST(CIfaceTest, PubSub)
|
||||
msg.SerializeToArray(buffer, size);
|
||||
|
||||
EXPECT_EQ(0,
|
||||
- ignTransportPublish(node, topic, buffer, msg.GetTypeName().c_str()));
|
||||
+ ignTransportPublish(node, topic, buffer, std::string(msg.GetTypeName()).c_str()));
|
||||
|
||||
EXPECT_EQ(2, count);
|
||||
|
||||
@@ -102,7 +102,7 @@ TEST(CIfaceTest, PubSub)
|
||||
// Unsubscribe
|
||||
ASSERT_EQ(0, ignTransportUnsubscribe(node, topic));
|
||||
EXPECT_EQ(0,
|
||||
- ignTransportPublish(node, topic, buffer, msg.GetTypeName().c_str()));
|
||||
+ ignTransportPublish(node, topic, buffer, std::string(msg.GetTypeName()).c_str()));
|
||||
EXPECT_EQ(0, count);
|
||||
|
||||
free(buffer);
|
||||
@@ -150,12 +150,12 @@ TEST(CIfaceTest, PubSubPartitions)
|
||||
|
||||
// Publish on "bar" partition
|
||||
EXPECT_EQ(0,
|
||||
- ignTransportPublish(nodeBar, topic, buffer, msg.GetTypeName().c_str()));
|
||||
+ ignTransportPublish(nodeBar, topic, buffer, std::string(msg.GetTypeName()).c_str()));
|
||||
EXPECT_EQ(1, count);
|
||||
|
||||
// Publish on default partition
|
||||
EXPECT_EQ(0,
|
||||
- ignTransportPublish(nodeBar, topic, buffer, msg.GetTypeName().c_str()));
|
||||
+ ignTransportPublish(nodeBar, topic, buffer, std::string(msg.GetTypeName()).c_str()));
|
||||
EXPECT_EQ(2, count);
|
||||
|
||||
count = 0;
|
||||
@@ -163,7 +163,7 @@ TEST(CIfaceTest, PubSubPartitions)
|
||||
// Unsubscribe
|
||||
ASSERT_EQ(0, ignTransportUnsubscribe(nodeBar, topic));
|
||||
EXPECT_EQ(0,
|
||||
- ignTransportPublish(nodeBar, topic, buffer, msg.GetTypeName().c_str()));
|
||||
+ ignTransportPublish(nodeBar, topic, buffer, std::string(msg.GetTypeName()).c_str()));
|
||||
EXPECT_EQ(0, count);
|
||||
|
||||
free(buffer);
|
||||
Index: gz-transport-ignition-transport8_8.5.1/src/HandlerStorage_TEST.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/src/HandlerStorage_TEST.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/src/HandlerStorage_TEST.cc
|
||||
@@ -66,8 +66,8 @@ TEST(RepStorageTest, RepStorageAPI)
|
||||
msgs::Int32 rep1Msg;
|
||||
bool result;
|
||||
msgs::Vector3d reqMsg;
|
||||
- std::string reqType = reqMsg.GetTypeName();
|
||||
- std::string rep1Type = rep1Msg.GetTypeName();
|
||||
+ std::string reqType = std::string(reqMsg.GetTypeName());
|
||||
+ std::string rep1Type = std::string(rep1Msg.GetTypeName());
|
||||
|
||||
reqMsg.set_x(1.0);
|
||||
reqMsg.set_y(2.0);
|
||||
@@ -231,7 +231,7 @@ TEST(RepStorageTest, SubStorageNoCallbac
|
||||
EXPECT_FALSE(subs.FirstHandler(topic, "incorrect type", handler));
|
||||
|
||||
// Now try to retrieve the first callback with the correct type.
|
||||
- EXPECT_TRUE(subs.FirstHandler(topic, msg.GetTypeName(), handler));
|
||||
+ EXPECT_TRUE(subs.FirstHandler(topic, std::string(msg.GetTypeName()), handler));
|
||||
|
||||
// Verify the handler.
|
||||
EXPECT_EQ(handler->TypeName(), sub1HandlerPtr->TypeName());
|
||||
Index: gz-transport-ignition-transport8_8.5.1/src/Node.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/src/Node.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/src/Node.cc
|
||||
@@ -423,7 +423,7 @@ bool Node::Publisher::Publish(const Prot
|
||||
};
|
||||
|
||||
if (!this->dataPtr->shared->Publish(this->dataPtr->publisher.Topic(),
|
||||
- msgBuffer, msgSize, myDeallocator, _msg.GetTypeName()))
|
||||
+ msgBuffer, msgSize, myDeallocator, std::string(_msg.GetTypeName())))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
Index: gz-transport-ignition-transport8_8.5.1/src/Node_TEST.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/src/Node_TEST.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/src/Node_TEST.cc
|
||||
@@ -527,7 +527,7 @@ TEST(NodeTest, PubWithoutAdvertise)
|
||||
EXPECT_TRUE(node1.SubscribedTopics().empty());
|
||||
EXPECT_TRUE(node1.AdvertisedServices().empty());
|
||||
|
||||
- auto pub1 = node1.Advertise(g_topic, msg.GetTypeName());
|
||||
+ auto pub1 = node1.Advertise(g_topic, std::string(msg.GetTypeName()));
|
||||
EXPECT_TRUE(pub1);
|
||||
|
||||
auto advertisedTopics = node1.AdvertisedTopics();
|
||||
@@ -716,7 +716,7 @@ TEST(NodeTest, RawPubSubSameThreadMessag
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
|
||||
// Publish a first message.
|
||||
- EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), msg.GetTypeName()));
|
||||
+ EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), std::string(msg.GetTypeName())));
|
||||
|
||||
// Give some time to the subscribers.
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
@@ -727,7 +727,7 @@ TEST(NodeTest, RawPubSubSameThreadMessag
|
||||
reset();
|
||||
|
||||
// Publish a second message on topic.
|
||||
- EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), msg.GetTypeName()));
|
||||
+ EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), std::string(msg.GetTypeName())));
|
||||
|
||||
// Give some time to the subscribers.
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
@@ -756,7 +756,7 @@ TEST(NodeTest, RawPubRawSubSameThreadMes
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
|
||||
// Publish a first message.
|
||||
- EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), msg.GetTypeName()));
|
||||
+ EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), std::string(msg.GetTypeName())));
|
||||
|
||||
// Give some time to the subscribers.
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
@@ -767,7 +767,7 @@ TEST(NodeTest, RawPubRawSubSameThreadMes
|
||||
reset();
|
||||
|
||||
// Publish a second message on topic.
|
||||
- EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), msg.GetTypeName()));
|
||||
+ EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), std::string(msg.GetTypeName())));
|
||||
|
||||
// Give some time to the subscribers.
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||
Index: gz-transport-ignition-transport8_8.5.1/src/gz.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/src/gz.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/src/gz.cc
|
||||
@@ -163,7 +163,7 @@ extern "C" void IGNITION_TRANSPORT_VISIB
|
||||
{
|
||||
// Create the node and advertise the topic
|
||||
Node node;
|
||||
- auto pub = node.Advertise(_topic, msg->GetTypeName());
|
||||
+ auto pub = node.Advertise(_topic, std::string(msg->GetTypeName()));
|
||||
|
||||
// Publish the message
|
||||
if (pub)
|
||||
Index: gz-transport-ignition-transport8_8.5.1/test/integration/twoProcsPubSub.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/test/integration/twoProcsPubSub.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/test/integration/twoProcsPubSub.cc
|
||||
@@ -170,7 +170,7 @@ TEST(twoProcPubSub, RawPubSubTwoProcsThr
|
||||
// Publish messages for a few seconds
|
||||
for (auto i = 0; i < 10; ++i)
|
||||
{
|
||||
- EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), msg.GetTypeName()));
|
||||
+ EXPECT_TRUE(pub.PublishRaw(msg.SerializeAsString(), std::string(msg.GetTypeName())));
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ TEST(twoProcPubSub, PubRawSubWrongTypesO
|
||||
|
||||
transport::Node node;
|
||||
EXPECT_TRUE(node.SubscribeRaw(g_topic, cbRaw,
|
||||
- msgs::Int32().GetTypeName()));
|
||||
+ std::string(msgs::Int32().GetTypeName())));
|
||||
|
||||
// Wait some time before publishing.
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
|
||||
@@ -319,7 +319,7 @@ TEST(twoProcPubSub, PubSubWrongTypesTwoR
|
||||
transport::Node node3;
|
||||
EXPECT_TRUE(node1.SubscribeRaw(g_topic, wrongCb, "wrong.msg.type"));
|
||||
EXPECT_TRUE(node2.SubscribeRaw(g_topic, correctCb,
|
||||
- msgs::Vector3d().GetTypeName()));
|
||||
+ std::string(msgs::Vector3d().GetTypeName())));
|
||||
EXPECT_TRUE(node3.SubscribeRaw(g_topic, genericCb));
|
||||
|
||||
|
||||
Index: gz-transport-ignition-transport8_8.5.1/test/integration/twoProcsPubSubSubscriber_aux.cc
|
||||
===================================================================
|
||||
--- gz-transport-ignition-transport8_8.5.1.orig/test/integration/twoProcsPubSubSubscriber_aux.cc
|
||||
+++ gz-transport-ignition-transport8_8.5.1/test/integration/twoProcsPubSubSubscriber_aux.cc
|
||||
@@ -99,7 +99,7 @@ void runSubscriber()
|
||||
|
||||
// Add a raw subscription to `node`
|
||||
EXPECT_TRUE(node.SubscribeRaw(g_topic, cbRaw,
|
||||
- msgs::Vector3d().GetTypeName()));
|
||||
+ std::string(msgs::Vector3d().GetTypeName())));
|
||||
|
||||
int interval = 100;
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Combines ZeroMQ with Protobufs to create a message passing system"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-transport"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-transport/archive/${PN}8_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="8"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
net-libs/ignition-msgs:5=
|
||||
dev-libs/protobuf:=
|
||||
>=net-libs/zeromq-4.2.0:=
|
||||
sys-apps/util-linux
|
||||
net-libs/cppzmq
|
||||
dev-db/sqlite:3
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
DEPEND="${DEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="
|
||||
dev-build/ignition-cmake:2
|
||||
virtual/pkgconfig"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
S="${WORKDIR}/gz-transport-ignition-transport8_${PV}"
|
||||
PATCHES=( "${FILESDIR}/protobuf.patch" )
|
||||
@@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Combines ZeroMQ with Protobufs to create a message passing system"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-transport"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-transport/archive/${PN}8_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="8"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
net-libs/ignition-msgs:5=
|
||||
dev-libs/protobuf:=
|
||||
>=net-libs/zeromq-4.2.0:=
|
||||
sys-apps/util-linux
|
||||
net-libs/cppzmq
|
||||
dev-db/sqlite:3
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
DEPEND="${DEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="
|
||||
dev-build/ignition-cmake:2
|
||||
virtual/pkgconfig"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
S="${WORKDIR}/gz-transport-ignition-transport8_${PV}"
|
||||
PATCHES=( "${FILESDIR}/protobuf30.patch" )
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@@ -187,22 +187,6 @@ kde-apps/cervisia
|
||||
# > Unable to locally verify the issuer's authority.
|
||||
=app-misc/ca-certificates-20250419.3.112
|
||||
|
||||
# Andreas Sturmlechner <asturm@gentoo.org> (2025-05-27)
|
||||
# sci-electronics/gazebo depends on x11-libs/qwt:6[qt5] and Qt5, lots of
|
||||
# open bugs. Most packages perpetually stuck at EAPI-7 and several major
|
||||
# version bumps out of date. Bugs #937608, #947390; removal on 2025-06-26.
|
||||
sci-electronics/gazebo
|
||||
dev-libs/sdformat
|
||||
net-libs/ignition-msgs
|
||||
net-libs/ignition-transport
|
||||
sci-libs/ignition-common
|
||||
sci-libs/ignition-fuel-tools
|
||||
sci-libs/ignition-math
|
||||
dev-build/ignition-cmake
|
||||
dev-libs/console_bridge
|
||||
dev-libs/urdfdom
|
||||
dev-libs/urdfdom_headers
|
||||
|
||||
# Sam James <sam@gentoo.org> (2025-05-26)
|
||||
# Breaks some reverse dependencies and is abandoned upstream (bug #956630).
|
||||
=dev-cpp/glog-0.7.1
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DIST gazebo-11.15.1.tar.bz2 111639491 BLAKE2B 1a97fd04980310ed8e775c5ba8aa36af6d60ea0235c467ade763a4d7cb2ca72008bae2299c73018f89b0d5b12c23f3663948fd0a5c91b58a3cf235b49ffaa975 SHA512 085bd71f2495d86752274c02578d4e30d49f4e35dc91226ad11242f0cc5129f98686dfbae83120d228036d2034beb21b9cd1be91505a48d4ccc757d19cecb111
|
||||
@@ -1,198 +0,0 @@
|
||||
Index: gazebo-11.15.1/gazebo/transport/Connection.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/Connection.cc
|
||||
+++ gazebo-11.15.1/gazebo/transport/Connection.cc
|
||||
@@ -73,7 +73,7 @@ IOManager *Connection::iomanager = NULL;
|
||||
// is stolen from adress::is_unspecified function in boost v1.52.
|
||||
static bool addressIsUnspecified(const boost::asio::ip::address_v4 &_addr)
|
||||
{
|
||||
- return _addr.to_ulong() == 0;
|
||||
+ return _addr.to_uint() == 0;
|
||||
}
|
||||
|
||||
// Version 1.52 of boost has an address::is_loopback function, but
|
||||
@@ -81,7 +81,7 @@ static bool addressIsUnspecified(const b
|
||||
// is stolen from adress::is_loopback function in boost v1.52.
|
||||
static bool addressIsLoopback(const boost::asio::ip::address_v4 &_addr)
|
||||
{
|
||||
- return (_addr.to_ulong() & 0xFF000000) == 0x7F000000;
|
||||
+ return (_addr.to_uint() & 0xFF000000) == 0x7F000000;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
@@ -151,15 +151,15 @@ bool Connection::Connect(const std::stri
|
||||
host = _host.substr(7, _host.size() - 7);
|
||||
|
||||
// Resolve the host name into an IP address
|
||||
- boost::asio::ip::tcp::resolver::iterator end;
|
||||
boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
|
||||
- boost::asio::ip::tcp::resolver::query query(host, service,
|
||||
+
|
||||
+ auto res = resolver.resolve(host, service,
|
||||
boost::asio::ip::resolver_query_base::numeric_service);
|
||||
- boost::asio::ip::tcp::resolver::iterator endpointIter;
|
||||
+ auto endpointIter = res.begin();
|
||||
+ auto end = res.end();
|
||||
|
||||
try
|
||||
{
|
||||
- endpointIter = resolver.resolve(query);
|
||||
|
||||
// Find the first valid IPv4 address
|
||||
for (; endpointIter != end &&
|
||||
@@ -690,9 +690,9 @@ boost::asio::ip::tcp::endpoint Connectio
|
||||
if (hostname && !std::string(hostname).empty())
|
||||
{
|
||||
boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
|
||||
- boost::asio::ip::tcp::resolver::query query(hostname, "");
|
||||
- boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query);
|
||||
- boost::asio::ip::tcp::resolver::iterator end;
|
||||
+ auto res = resolver.resolve(hostname, "");
|
||||
+ auto iter = res.begin();
|
||||
+ auto end = res.end();
|
||||
|
||||
// Loop through the results, and stop at the first valid address.
|
||||
while (iter != end)
|
||||
@@ -724,7 +724,7 @@ boost::asio::ip::tcp::endpoint Connectio
|
||||
<< "] is invalid. We will still try to use it, be warned.\n";
|
||||
}
|
||||
|
||||
- address = boost::asio::ip::address_v4::from_string(ip);
|
||||
+ address = boost::asio::ip::make_address_v4(ip);
|
||||
}
|
||||
|
||||
// Try to automatically find a valid address if GAZEBO_IP and
|
||||
@@ -774,7 +774,7 @@ boost::asio::ip::tcp::endpoint Connectio
|
||||
if (!ValidateIP(host))
|
||||
continue;
|
||||
|
||||
- address = boost::asio::ip::address_v4::from_string(host);
|
||||
+ address = boost::asio::ip::make_address_v4(host);
|
||||
|
||||
// Also make sure that the IP address is not a loopback interface.
|
||||
if (!addressIsLoopback(address))
|
||||
@@ -868,7 +868,7 @@ boost::asio::ip::tcp::endpoint Connectio
|
||||
"but will almost certainly not work if you have remote processes."
|
||||
"Report to the disc-zmq development team to seek a fix." << std::endl;
|
||||
}
|
||||
- address = boost::asio::ip::address_v4::from_string(retAddr);
|
||||
+ address = boost::asio::ip::make_address_v4(retAddr);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -923,8 +923,9 @@ std::string Connection::GetHostname(boos
|
||||
else
|
||||
{
|
||||
boost::asio::ip::tcp::resolver resolver(iomanager->GetIO());
|
||||
- boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(_ep);
|
||||
- boost::asio::ip::tcp::resolver::iterator end;
|
||||
+ auto res = resolver.resolve(_ep);
|
||||
+ auto iter = res.begin();
|
||||
+ auto end = res.end();
|
||||
|
||||
while (iter != end)
|
||||
{
|
||||
@@ -950,7 +951,7 @@ std::string Connection::GetLocalHostname
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
void Connection::OnConnect(const boost::system::error_code &_error,
|
||||
- boost::asio::ip::tcp::resolver::iterator /*_endPointIter*/)
|
||||
+ boost::asio::ip::tcp::resolver::results_type::iterator /*_endPointIter*/)
|
||||
{
|
||||
// This function is called when a connection is successfully (or
|
||||
// unsuccessfully) established.
|
||||
Index: gazebo-11.15.1/gazebo/transport/Connection.hh
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/Connection.hh
|
||||
+++ gazebo-11.15.1/gazebo/transport/Connection.hh
|
||||
@@ -409,7 +409,7 @@ namespace gazebo
|
||||
/// \param[in] _error Error code thrown during connection
|
||||
/// \param[in] _endPointIter Pointer to resolver iterator
|
||||
private: void OnConnect(const boost::system::error_code &_error,
|
||||
- boost::asio::ip::tcp::resolver::iterator _endPointIter);
|
||||
+ boost::asio::ip::tcp::resolver::results_type::iterator _endPointIter);
|
||||
|
||||
/// \brief Socket pointer
|
||||
private: boost::asio::ip::tcp::socket *socket;
|
||||
Index: gazebo-11.15.1/gazebo/transport/IOManager.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/IOManager.cc
|
||||
+++ gazebo-11.15.1/gazebo/transport/IOManager.cc
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <atomic>
|
||||
#include <boost/bind/bind.hpp>
|
||||
#include <boost/thread/thread.hpp>
|
||||
+#include <boost/asio/executor_work_guard.hpp>
|
||||
#include <iostream>
|
||||
#include "gazebo/transport/IOManager.hh"
|
||||
|
||||
@@ -28,10 +29,10 @@ namespace transport
|
||||
class IOManagerPrivate
|
||||
{
|
||||
/// \brief IO service.
|
||||
- public: boost::asio::io_service *io_service = nullptr;
|
||||
+ public: boost::asio::io_context *io_service = nullptr;
|
||||
|
||||
/// \brief Use io_service::work to keep the io_service running in thread.
|
||||
- public: boost::asio::io_service::work *work = nullptr;
|
||||
+ //public: boost::asio::executor_work_guard<boost::asio::io_context> work;
|
||||
|
||||
/// \brief Reference count of connections using this IOManager.
|
||||
public: std::atomic_int count;
|
||||
@@ -44,12 +45,11 @@ class IOManagerPrivate
|
||||
IOManager::IOManager()
|
||||
: dataPtr(new IOManagerPrivate)
|
||||
{
|
||||
- this->dataPtr->io_service = new boost::asio::io_service;
|
||||
- this->dataPtr->work = new boost::asio::io_service::work(
|
||||
- *this->dataPtr->io_service);
|
||||
+ this->dataPtr->io_service = new boost::asio::io_context;
|
||||
+ //this->dataPtr->work = boost::asio::make_work_guard(*this->dataPtr->io_service);
|
||||
this->dataPtr->count = 0;
|
||||
this->dataPtr->thread = new boost::thread(boost::bind(
|
||||
- &boost::asio::io_service::run, this->dataPtr->io_service));
|
||||
+ &boost::asio::io_context::run, this->dataPtr->io_service));
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
@@ -57,9 +57,6 @@ IOManager::~IOManager()
|
||||
{
|
||||
this->Stop();
|
||||
|
||||
- delete this->dataPtr->work;
|
||||
- this->dataPtr->work = nullptr;
|
||||
-
|
||||
delete this->dataPtr->io_service;
|
||||
this->dataPtr->io_service = nullptr;
|
||||
|
||||
@@ -70,7 +67,7 @@ IOManager::~IOManager()
|
||||
/////////////////////////////////////////////////
|
||||
void IOManager::Stop()
|
||||
{
|
||||
- this->dataPtr->io_service->reset();
|
||||
+ this->dataPtr->io_service->restart();
|
||||
this->dataPtr->io_service->stop();
|
||||
if (this->dataPtr->thread)
|
||||
{
|
||||
@@ -81,7 +78,7 @@ void IOManager::Stop()
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
-boost::asio::io_service &IOManager::GetIO()
|
||||
+boost::asio::io_context &IOManager::GetIO()
|
||||
{
|
||||
return *this->dataPtr->io_service;
|
||||
}
|
||||
Index: gazebo-11.15.1/gazebo/transport/IOManager.hh
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/IOManager.hh
|
||||
+++ gazebo-11.15.1/gazebo/transport/IOManager.hh
|
||||
@@ -42,7 +42,7 @@ namespace gazebo
|
||||
|
||||
/// \brief Get handle to boost::asio IO service
|
||||
/// \return Handle to boost::asio IO service
|
||||
- public: boost::asio::io_service &GetIO();
|
||||
+ public: boost::asio::io_context &GetIO();
|
||||
|
||||
/// \brief Increment the event count by 1
|
||||
public: void IncCount();
|
||||
@@ -1,24 +0,0 @@
|
||||
From 9fe44347eac29da2afe6e49646310a51641d3182 Mon Sep 17 00:00:00 2001
|
||||
From: Silvio Traversaro <silvio.traversaro@iit.it>
|
||||
Date: Sun, 15 Mar 2020 16:24:17 +0000
|
||||
Subject: [PATCH] Fix problem with automoc in CMake 3.17
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e93d65cc52..51f072bc8a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,6 +5,10 @@ if(COMMAND CMAKE_POLICY)
|
||||
CMAKE_POLICY(SET CMP0004 NEW)
|
||||
endif(COMMAND CMAKE_POLICY)
|
||||
|
||||
+if(POLICY CMP0100)
|
||||
+ cmake_policy(SET CMP0100 NEW)
|
||||
+endif()
|
||||
+
|
||||
project (Gazebo)
|
||||
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
|
||||
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
|
||||
@@ -1,223 +0,0 @@
|
||||
Index: gazebo-11.15.1/gazebo/gui/ConfigWidget.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/gui/ConfigWidget.cc
|
||||
+++ gazebo-11.15.1/gazebo/gui/ConfigWidget.cc
|
||||
@@ -595,7 +595,7 @@ QWidget *ConfigWidget::Parse(google::pro
|
||||
if (!ref)
|
||||
return NULL;
|
||||
|
||||
- std::string name = field->name();
|
||||
+ std::string name(field->name());
|
||||
|
||||
// Parse each field in the message
|
||||
// TODO parse repeated fields
|
||||
@@ -754,7 +754,7 @@ QWidget *ConfigWidget::Parse(google::pro
|
||||
if (typeValueDescriptor)
|
||||
{
|
||||
geometryTypeStr =
|
||||
- QString(typeValueDescriptor->name().c_str()).toLower().
|
||||
+ QString(std::string(typeValueDescriptor->name()).c_str()).toLower().
|
||||
toStdString();
|
||||
}
|
||||
|
||||
@@ -779,7 +779,7 @@ QWidget *ConfigWidget::Parse(google::pro
|
||||
const google::protobuf::Descriptor *geomValueDescriptor =
|
||||
geomValueMsg->GetDescriptor();
|
||||
|
||||
- std::string geomMsgName = geomField->message_type()->name();
|
||||
+ std::string geomMsgName(geomField->message_type()->name());
|
||||
if (geomMsgName == "BoxGeom" || geomMsgName == "MeshGeom")
|
||||
{
|
||||
int fieldIdx = (geomMsgName == "BoxGeom") ? 0 : 1;
|
||||
@@ -1001,7 +1001,7 @@ QWidget *ConfigWidget::Parse(google::pro
|
||||
const google::protobuf::EnumValueDescriptor *valueDescriptor =
|
||||
descriptor->value(j);
|
||||
if (valueDescriptor)
|
||||
- enumValues.push_back(valueDescriptor->name());
|
||||
+ enumValues.push_back(std::string(valueDescriptor->name()));
|
||||
}
|
||||
configChildWidget =
|
||||
this->CreateEnumWidget(name, enumValues, _level);
|
||||
@@ -1015,7 +1015,7 @@ QWidget *ConfigWidget::Parse(google::pro
|
||||
|
||||
newFieldWidget = configChildWidget;
|
||||
}
|
||||
- this->UpdateEnumWidget(configChildWidget, value->name());
|
||||
+ this->UpdateEnumWidget(configChildWidget, std::string(value->name()));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -2086,7 +2086,7 @@ void ConfigWidget::UpdateMsg(google::pro
|
||||
if (!ref)
|
||||
return;
|
||||
|
||||
- std::string name = field->name();
|
||||
+ std::string name(field->name());
|
||||
|
||||
// Update each field in the message
|
||||
// TODO update repeated fields
|
||||
Index: gazebo-11.15.1/gazebo/gui/ModelListWidget.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/gui/ModelListWidget.cc
|
||||
+++ gazebo-11.15.1/gazebo/gui/ModelListWidget.cc
|
||||
@@ -1747,7 +1747,7 @@ void ModelListWidget::FillPropertyTree(c
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < surfaceModelEnum->value_count(); ++i)
|
||||
- types << surfaceModelEnum->value(i)->name().c_str();
|
||||
+ types << std::string(surfaceModelEnum->value(i)->name()).c_str();
|
||||
}
|
||||
|
||||
item->setAttribute("enumNames", types);
|
||||
@@ -3069,7 +3069,7 @@ void ModelListWidget::FillPropertyTree(c
|
||||
}
|
||||
else
|
||||
{
|
||||
- types << engineTypeEnum->value(_msg.type()-1)->name().c_str();
|
||||
+ types << std::string(engineTypeEnum->value(_msg.type()-1)->name()).c_str();
|
||||
}
|
||||
|
||||
item->setAttribute("enumNames", types);
|
||||
Index: gazebo-11.15.1/gazebo/gui/plot/Palette.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/gui/plot/Palette.cc
|
||||
+++ gazebo-11.15.1/gazebo/gui/plot/Palette.cc
|
||||
@@ -1179,7 +1179,7 @@ void Palette::FillFromMsg(google::protob
|
||||
if (!field)
|
||||
return;
|
||||
|
||||
- auto name = field->name();
|
||||
+ auto name = std::string(field->name());
|
||||
|
||||
if (field->is_repeated())
|
||||
continue;
|
||||
Index: gazebo-11.15.1/gazebo/gui/plot/TopicCurveHandler.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/gui/plot/TopicCurveHandler.cc
|
||||
+++ gazebo-11.15.1/gazebo/gui/plot/TopicCurveHandler.cc
|
||||
@@ -370,7 +370,7 @@ void TopicCurve::UpdateCurve(google::pro
|
||||
if (!field)
|
||||
continue;
|
||||
|
||||
- std::string fieldName = field->name();
|
||||
+ std::string fieldName(field->name());
|
||||
|
||||
// Check if message has timestamp and use it if it exists and is
|
||||
// a top level msg field.
|
||||
Index: gazebo-11.15.1/gazebo/msgs/generator/GazeboGenerator.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/msgs/generator/GazeboGenerator.cc
|
||||
+++ gazebo-11.15.1/gazebo/msgs/generator/GazeboGenerator.cc
|
||||
@@ -41,10 +41,10 @@ bool GazeboGenerator::Generate(const Fil
|
||||
OutputDirectory *_generator_context,
|
||||
std::string * /*_error*/) const
|
||||
{
|
||||
- std::string headerFilename = _file->name();
|
||||
+ std::string headerFilename(_file->name());
|
||||
boost::replace_last(headerFilename, ".proto", ".pb.h");
|
||||
|
||||
- std::string sourceFilename = _file->name();
|
||||
+ std::string sourceFilename(_file->name());
|
||||
boost::replace_last(sourceFilename, ".proto", ".pb.cc");
|
||||
|
||||
// Suppress expected warnings
|
||||
@@ -80,12 +80,12 @@ bool GazeboGenerator::Generate(const Fil
|
||||
_generator_context->OpenForInsert(headerFilename, "namespace_scope"));
|
||||
io::Printer printer(output.get(), '$');
|
||||
|
||||
- std::string package = _file->package();
|
||||
+ std::string package(_file->package());
|
||||
boost::replace_all(package, ".", "::");
|
||||
|
||||
std::string ptrType = "typedef boost::shared_ptr<" + package
|
||||
- + "::" + _file->message_type(0)->name() + "> "
|
||||
- + _file->message_type(0)->name() + "Ptr;\n";
|
||||
+ + "::" + std::string(_file->message_type(0)->name()) + "> "
|
||||
+ + std::string(_file->message_type(0)->name()) + "Ptr;\n";
|
||||
|
||||
printer.Print(ptrType.c_str(), "name", "namespace_scope");
|
||||
}
|
||||
@@ -96,12 +96,12 @@ bool GazeboGenerator::Generate(const Fil
|
||||
_generator_context->OpenForInsert(headerFilename, "global_scope"));
|
||||
io::Printer printer(output.get(), '$');
|
||||
|
||||
- std::string package = _file->package();
|
||||
+ std::string package(_file->package());
|
||||
boost::replace_all(package, ".", "::");
|
||||
|
||||
std::string constType = "typedef const boost::shared_ptr<" + package
|
||||
- + "::" + _file->message_type(0)->name() + " const> Const"
|
||||
- + _file->message_type(0)->name() + "Ptr;";
|
||||
+ + "::" + std::string(_file->message_type(0)->name()) + " const> Const"
|
||||
+ + std::string(_file->message_type(0)->name()) + "Ptr;";
|
||||
|
||||
printer.Print(constType.c_str(), "name", "global_scope");
|
||||
}
|
||||
@@ -112,12 +112,12 @@ bool GazeboGenerator::Generate(const Fil
|
||||
_generator_context->OpenForInsert(sourceFilename, "global_scope"));
|
||||
io::Printer printer(output.get(), '$');
|
||||
|
||||
- std::string package = _file->package();
|
||||
+ std::string package(_file->package());
|
||||
boost::replace_all(package, ".", "::");
|
||||
|
||||
- std::string name = _file->message_type(0)->name();
|
||||
+ std::string name(_file->message_type(0)->name());
|
||||
|
||||
- std::string constType = "GZ_REGISTER_STATIC_MSG(\"" + _file->package() +
|
||||
+ std::string constType = "GZ_REGISTER_STATIC_MSG(\"" + std::string(_file->package()) +
|
||||
"." + name + "\", " + name + ")\n";
|
||||
printer.Print(constType.c_str(), "name", "namespace_scope");
|
||||
}
|
||||
Index: gazebo-11.15.1/gazebo/msgs/msgs.cc
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/msgs/msgs.cc
|
||||
+++ gazebo-11.15.1/gazebo/msgs/msgs.cc
|
||||
@@ -118,7 +118,7 @@ namespace gazebo
|
||||
|
||||
std::string *serialized_data = pkg.mutable_serialized_data();
|
||||
if (!message.IsInitialized())
|
||||
- gzthrow("Can't serialize message of type[" + message.GetTypeName() +
|
||||
+ gzthrow("Can't serialize message of type[" + std::string(message.GetTypeName()) +
|
||||
"] because it is missing required fields");
|
||||
|
||||
if (!message.SerializeToString(serialized_data))
|
||||
Index: gazebo-11.15.1/gazebo/transport/CallbackHelper.hh
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/CallbackHelper.hh
|
||||
+++ gazebo-11.15.1/gazebo/transport/CallbackHelper.hh
|
||||
@@ -136,7 +136,7 @@ namespace gazebo
|
||||
if ((m = dynamic_cast<google::protobuf::Message*>(&test))
|
||||
== NULL)
|
||||
gzthrow("Message type must be a google::protobuf type\n");
|
||||
- return m->GetTypeName();
|
||||
+ return std::string(m->GetTypeName());
|
||||
}
|
||||
|
||||
// documentation inherited
|
||||
Index: gazebo-11.15.1/gazebo/transport/Node.hh
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/Node.hh
|
||||
+++ gazebo-11.15.1/gazebo/transport/Node.hh
|
||||
@@ -228,7 +228,7 @@ namespace gazebo
|
||||
const google::protobuf::Message &_message)
|
||||
{
|
||||
transport::PublisherPtr pub = this->Advertise(_topic,
|
||||
- _message.GetTypeName());
|
||||
+ std::string(_message.GetTypeName()));
|
||||
pub->WaitForConnection();
|
||||
|
||||
pub->Publish(_message, true);
|
||||
Index: gazebo-11.15.1/gazebo/transport/TopicManager.hh
|
||||
===================================================================
|
||||
--- gazebo-11.15.1.orig/gazebo/transport/TopicManager.hh
|
||||
+++ gazebo-11.15.1/gazebo/transport/TopicManager.hh
|
||||
@@ -160,7 +160,7 @@ namespace gazebo
|
||||
if (!msg)
|
||||
gzthrow("Advertise requires a google protobuf type");
|
||||
|
||||
- return this->Advertise(_topic, msg->GetTypeName(), _queueLimit,
|
||||
+ return this->Advertise(_topic, std::string(msg->GetTypeName()), _queueLimit,
|
||||
_hzRate);
|
||||
}
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
Index: gazebo-11.10.2/cmake/SearchForStuff.cmake
|
||||
===================================================================
|
||||
--- gazebo-11.10.2.orig/cmake/SearchForStuff.cmake
|
||||
+++ gazebo-11.10.2/cmake/SearchForStuff.cmake
|
||||
@@ -847,10 +847,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
|
||||
/usr/local/lib/qwt.framework/Headers
|
||||
${QWT_WIN_INCLUDE_DIR}
|
||||
|
||||
- PATH_SUFFIXES qwt qwt5
|
||||
+ PATH_SUFFIXES qwt qwt5 qwt6
|
||||
)
|
||||
|
||||
-find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
|
||||
+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt-qt5 qwt PATHS
|
||||
/usr/local/lib
|
||||
/usr/local/lib/qwt.framework
|
||||
${QWT_WIN_LIBRARY_DIR}
|
||||
@@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="A 3D multiple robot simulator with dynamics"
|
||||
HOMEPAGE="https://gazebosim.org/home"
|
||||
SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
# Subslot = major version = soname of libs
|
||||
SLOT="0/11"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="cpu_flags_x86_sse2 test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/protobuf-2:=
|
||||
virtual/opengl
|
||||
media-libs/openal
|
||||
net-misc/curl
|
||||
dev-libs/tinyxml
|
||||
>=dev-libs/tinyxml2-6:=
|
||||
dev-libs/libtar
|
||||
dev-cpp/tbb:=
|
||||
>=dev-games/ogre-1.7.4:=[freeimage]
|
||||
<dev-games/ogre-1.10
|
||||
>=media-libs/freeimage-3.15.4[png]
|
||||
sci-libs/libccd
|
||||
>=media-video/ffmpeg-2.6:0=
|
||||
sci-libs/gts
|
||||
>=sci-physics/bullet-2.82:=
|
||||
>=dev-libs/sdformat-9.8:=
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtopengl:5
|
||||
dev-libs/boost:=
|
||||
sci-libs/gdal:=
|
||||
virtual/libusb:1
|
||||
dev-libs/libspnav
|
||||
media-libs/freeimage
|
||||
sci-libs/hdf5:=[cxx]
|
||||
sys-apps/util-linux
|
||||
>=media-gfx/graphviz-4
|
||||
net-libs/ignition-msgs:5=
|
||||
sci-libs/ignition-math:6=
|
||||
net-libs/ignition-transport:8=
|
||||
sci-libs/ignition-common:3=
|
||||
sci-libs/ignition-fuel-tools:4=
|
||||
x11-libs/qwt:6=[qt5(+)]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-qt/qttest:5
|
||||
x11-apps/mesa-progs
|
||||
test? ( dev-libs/libxslt )
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/ronn-ng
|
||||
app-arch/gzip
|
||||
virtual/pkgconfig
|
||||
"
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
PATCHES=(
|
||||
"${FILESDIR}/qwt2.patch"
|
||||
"${FILESDIR}/cmake.patch"
|
||||
"${FILESDIR}/boost187.patch"
|
||||
"${FILESDIR}/protobuf30.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# find OGRE properly
|
||||
sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
|
||||
|
||||
local mycmakeargs=(
|
||||
"-DUSE_UPSTREAM_CFLAGS=OFF"
|
||||
"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
|
||||
"-DUSE_HOST_CFLAGS=FALSE"
|
||||
"-DBUILD_TESTING=$(usex test TRUE FALSE)"
|
||||
"-DENABLE_SCREEN_TESTS=FALSE"
|
||||
"-DUSE_EXTERNAL_TINYXML2=TRUE"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">gazebosim/gazebo-classic</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1 +0,0 @@
|
||||
DIST ignition-common3_3.17.0.tar.gz 8037300 BLAKE2B edebfa767c5640b2be5ca4cbe41687f7fb646dd3074789b4f4fb35242d6d2393f3ab2398945cf47cbe032a25f30284beb23a0b8d4ca72931f343a7be431efc5c SHA512 282024e5a99ae5f0879f1d11ed7ad4db0920b02e41051f76142b9de74ed296af365723e769ed3b0bd85a9f77a32d7735c85f2f7ef747ea83c5398697598473b1
|
||||
@@ -1,28 +0,0 @@
|
||||
Index: gz-common-ignition-common3_3.14.2/graphics/src/Image.cc
|
||||
===================================================================
|
||||
--- gz-common-ignition-common3_3.14.2.orig/graphics/src/Image.cc
|
||||
+++ gz-common-ignition-common3_3.14.2/graphics/src/Image.cc
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <FreeImage.h>
|
||||
|
||||
#include <string>
|
||||
+#include <cstring>
|
||||
|
||||
#include <ignition/common/Console.hh>
|
||||
#include <ignition/common/Util.hh>
|
||||
Index: gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
|
||||
===================================================================
|
||||
--- gz-common-ignition-common3_3.14.2.orig/av/src/AudioDecoder.cc
|
||||
+++ gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
|
||||
@@ -157,7 +157,11 @@ bool AudioDecoder::Decode(uint8_t **_out
|
||||
// decodedFrame->linesize[0].
|
||||
int size = decodedFrame->nb_samples *
|
||||
av_get_bytes_per_sample(this->data->codecCtx->sample_fmt) *
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,24,100)
|
||||
this->data->codecCtx->ch_layout.nb_channels;
|
||||
+#else
|
||||
+ this->data->codecCtx->channels;
|
||||
+#endif
|
||||
// Resize the audio buffer as necessary
|
||||
if (*_outBufferSize + size > maxBufferSize)
|
||||
{
|
||||
@@ -1,40 +0,0 @@
|
||||
Index: gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
|
||||
===================================================================
|
||||
--- gz-common-ignition-common3_3.14.2.orig/av/src/AudioDecoder.cc
|
||||
+++ gz-common-ignition-common3_3.14.2/av/src/AudioDecoder.cc
|
||||
@@ -348,6 +348,7 @@ bool AudioDecoder::SetFile(const std::st
|
||||
return false;
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
|
||||
if (this->data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
|
||||
this->data->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
|
||||
@@ -355,6 +356,7 @@ bool AudioDecoder::SetFile(const std::st
|
||||
if (this->data->codec->capabilities & CODEC_CAP_TRUNCATED)
|
||||
this->data->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
// Open codec
|
||||
if (avcodec_open2(this->data->codecCtx, this->data->codec, nullptr) < 0)
|
||||
Index: gz-common-ignition-common3_3.14.2/av/src/Video.cc
|
||||
===================================================================
|
||||
--- gz-common-ignition-common3_3.14.2.orig/av/src/Video.cc
|
||||
+++ gz-common-ignition-common3_3.14.2/av/src/Video.cc
|
||||
@@ -179,6 +179,7 @@ bool Video::Load(const std::string &_fil
|
||||
this->dataPtr->videoStream]->codec;
|
||||
#endif
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
// Inform the codec that we can handle truncated bitstreams -- i.e.,
|
||||
// bitstreams where frame boundaries can fall in the middle of packets
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
|
||||
@@ -188,6 +189,7 @@ bool Video::Load(const std::string &_fil
|
||||
if (codec->capabilities & CODEC_CAP_TRUNCATED)
|
||||
this->dataPtr->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
// Open codec
|
||||
if (avcodec_open2(this->dataPtr->codecCtx, codec, nullptr) < 0)
|
||||
@@ -1,12 +0,0 @@
|
||||
Index: gz-common-ignition-common3_3.17.0/profiler/include/gz/common/Profiler.hh
|
||||
===================================================================
|
||||
--- gz-common-ignition-common3_3.17.0.orig/profiler/include/gz/common/Profiler.hh
|
||||
+++ gz-common-ignition-common3_3.17.0/profiler/include/gz/common/Profiler.hh
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <cstdint> // uint32
|
||||
|
||||
#include <gz/common/profiler/Export.hh>
|
||||
#include <gz/common/SingletonT.hh>
|
||||
@@ -1,48 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
inherit cmake
|
||||
|
||||
IGN_MAJOR=3
|
||||
|
||||
DESCRIPTION="Set of libraries designed to rapidly develop robot applications"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-common"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="${IGN_MAJOR}"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
#RESTRICT="!test? ( test )"
|
||||
# tests dont even build
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/tinyxml2:=
|
||||
sci-libs/ignition-math:6=
|
||||
sys-apps/util-linux
|
||||
media-libs/freeimage:=
|
||||
sci-libs/gts:=
|
||||
media-video/ffmpeg:0=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="
|
||||
dev-build/ignition-cmake:2"
|
||||
|
||||
S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/ffmpeg5.patch"
|
||||
"${FILESDIR}/ffmpeg6.patch"
|
||||
"${FILESDIR}/stdint.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
inherit cmake
|
||||
|
||||
IGN_MAJOR=3
|
||||
|
||||
DESCRIPTION="Set of libraries designed to rapidly develop robot applications"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-common"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="${IGN_MAJOR}"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
#RESTRICT="!test? ( test )"
|
||||
# tests dont even build
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/tinyxml2:=
|
||||
sci-libs/ignition-math:6=
|
||||
sys-apps/util-linux
|
||||
media-libs/freeimage:=
|
||||
sci-libs/gts:=
|
||||
media-video/ffmpeg:0=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="
|
||||
dev-build/ignition-cmake:2"
|
||||
|
||||
S="${WORKDIR}/gz-common-ignition-common${IGN_MAJOR}_${PV}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/ffmpeg5.patch"
|
||||
"${FILESDIR}/ffmpeg6.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">ignitionrobotics/ign-common</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1 +0,0 @@
|
||||
DIST ignition-fuel-tools4_4.9.1.tar.gz 352667 BLAKE2B e4cf7c90961b9513b442e98d8683740ba6f9d2291caec89e8efd9a38d699c5cc44007e5f6ebc2bffff5d643841fba3572dd6507282f04f62d0cb2aceade54e3e SHA512 037d590930a6d672e9286ee27b003b497108c8a961b5a7159141c7997f0c690218ed111fb35815f25f1f388e2a630a16386ff4a63d7306d312f27ba8fba84ab9
|
||||
@@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
inherit cmake
|
||||
|
||||
IGN_MAJOR=4
|
||||
|
||||
DESCRIPTION="Classes and tools for interacting with Ignition Fuel"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-fuel-tools/"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-fuel-tools/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="${IGN_MAJOR}"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/tinyxml2:=
|
||||
net-misc/curl:=
|
||||
dev-libs/jsoncpp:=
|
||||
dev-libs/libyaml:=
|
||||
dev-libs/libzip:=
|
||||
sci-libs/ignition-common:3=
|
||||
net-libs/ignition-msgs:5=
|
||||
dev-libs/protobuf:=
|
||||
"
|
||||
#igncurl
|
||||
DEPEND="${RDEPEND}
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="
|
||||
dev-build/ignition-cmake:2"
|
||||
|
||||
S="${WORKDIR}/gz-fuel-tools-${PN}${IGN_MAJOR}_${PV}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
"-DBUILD_TESTING=$(usex test)"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">ignitionrobotics/ign-fuel-tools</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1 +0,0 @@
|
||||
DIST ignition-math6_6.15.1.tar.gz 632975 BLAKE2B 94a300b56a74a0c44da9ec74861fce7946e50d5a16bd56b383bfbd63e9d6f285bd803da6528d899711b74002cce1a8c95cc7c82580aa391794dd0d9fd63ae96f SHA512 569fb37be4b42f170189de680beb71c6274e2a48d02f77d6a9d675ca9901be32df7af6b86f69916ff96b4f7065f8f1d4a9fb3ef81c2b7f5fc3f325e17279edba
|
||||
@@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
inherit cmake vcs-snapshot
|
||||
|
||||
DESCRIPTION="A small, fast, and high performance math library for robot applications"
|
||||
HOMEPAGE="https://github.com/ignitionrobotics/ign-math"
|
||||
SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="6/6"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/eigen:3
|
||||
dev-build/ignition-cmake:2"
|
||||
BDEPEND="
|
||||
dev-build/ignition-cmake:2"
|
||||
|
||||
S="${WORKDIR}/${PN}6_${PV}"
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>aballier@gentoo.org</email>
|
||||
<name>Alexis Ballier</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="bitbucket">ignitionrobotics/ign-math</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user