* [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/
@ 2016-11-28 15:11 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-11-28 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 2701f4e2ecddcdce15248edf2f4d66936b3187ef
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 15:04:16 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 15:04:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2701f4e2
dev-ros/pluginlib: look for package.xml in ros_packages too for plugins.
Package-Manager: portage-2.3.2
dev-ros/pluginlib/files/gentoo.patch | 34 ++++++++++++++++++++++
...ib-1.10.4.ebuild => pluginlib-1.10.4-r1.ebuild} | 1 +
dev-ros/pluginlib/pluginlib-9999.ebuild | 1 +
3 files changed, 36 insertions(+)
diff --git a/dev-ros/pluginlib/files/gentoo.patch b/dev-ros/pluginlib/files/gentoo.patch
new file mode 100644
index 00000000..6737f76
--- /dev/null
+++ b/dev-ros/pluginlib/files/gentoo.patch
@@ -0,0 +1,34 @@
+Find package.xml in ros_packages/package_name too as we moved it here.
+
+Index: pluginlib-1.10.4/include/pluginlib/class_loader_imp.h
+===================================================================
+--- pluginlib-1.10.4.orig/include/pluginlib/class_loader_imp.h
++++ pluginlib-1.10.4/include/pluginlib/class_loader_imp.h
+@@ -444,6 +444,7 @@ namespace pluginlib
+ std::string package_name;
+ boost::filesystem::path p(plugin_xml_file_path);
+ boost::filesystem::path parent = p.parent_path();
++ boost::filesystem::path basename = p.filename();
+
+ //Figure out exactly which package the passed XML file is exported by.
+ while (true)
+@@ -453,6 +454,11 @@ namespace pluginlib
+ std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string();
+ return(extractPackageNameFromPackageXML(package_file_path));
+ }
++ else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml"))
++ {
++ std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string();
++ return(extractPackageNameFromPackageXML(package_file_path));
++ }
+ else if (boost::filesystem::exists(parent / "manifest.xml"))
+ {
+ #if BOOST_FILESYSTEM_VERSION >= 3
+@@ -470,6 +476,7 @@ namespace pluginlib
+ }
+
+ //Recursive case - hop one folder up
++ basename = parent.filename();
+ parent = parent.parent_path().string();
+
+ //Base case - reached root and cannot find what we're looking for
diff --git a/dev-ros/pluginlib/pluginlib-1.10.4.ebuild b/dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild
similarity index 93%
rename from dev-ros/pluginlib/pluginlib-1.10.4.ebuild
rename to dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild
index 2791a4d..a96bdae 100644
--- a/dev-ros/pluginlib/pluginlib-1.10.4.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild
@@ -25,3 +25,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 2791a4d..a96bdae 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -25,3 +25,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/
@ 2017-11-10 8:51 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-11-10 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 619bddaf28567ae40e8b3ee45e257092327e3ea6
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 11:45:18 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 08:51:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619bddaf
dev-ros/pluginlib: bump to 1.11.1
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-ros/pluginlib/Manifest | 1 +
dev-ros/pluginlib/files/gentoo2.patch | 32 ++++++++++++++++++++++
...uginlib-9999.ebuild => pluginlib-1.11.1.ebuild} | 2 +-
dev-ros/pluginlib/pluginlib-9999.ebuild | 2 +-
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index abffa2803f3..a1d1aa7745e 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,2 +1,3 @@
DIST pluginlib-1.10.5.tar.gz 21470 SHA256 53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c SHA512 619c552c7f6d59f02f580204477e789e2adf15ea53dfdf1d3fe3fc6e65e34dbfe1d7e7ae60b833bbf589c2afd49dc09187222e989de902758475509b8cf7cd88 WHIRLPOOL c441fbee18fa152d900e0b49198cc2b0f75a85f801bc756bc1d56f4153360e2ddfc3c63223a57fbc7ee299aef4313bd55c147fe614d6fcca708f7302ac9c52fd
DIST pluginlib-1.11.0.tar.gz 21555 SHA256 f5acf838cdf15538505b670dfdf93a0c5e453d222464d729d71a22513a60e2ca SHA512 2ef27759a6fb3db0354ffd28f2de5781405d4515dad028cbba6e108aa2eb79da56bbcb8ad4dab5686a9dc59d031bfd06ca713382e99258ecdf78fc45a877e588 WHIRLPOOL 71fa457e3bd0c93f2ea68729086b6f9b1b2653f126bdec3f461ad26cb37237c27397cca8d1c5dcf74e96b72988c025738d20ef303ac6d12ae7fc17d4b3bb8a02
+DIST pluginlib-1.11.1.tar.gz 21621 SHA256 bee838a9e62c8e889e8354f6ec5c76493f3aa6df5d19c30110068c82feb927c0 SHA512 1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00 WHIRLPOOL 1d05ddb55c800e0272e6c203804fdd0cdc966a6213df55a999e2ab5f14ff157ec84654d6155a1de77cdd15821776ad51918e0fa1072efbc1c08e539dd10ebce3
diff --git a/dev-ros/pluginlib/files/gentoo2.patch b/dev-ros/pluginlib/files/gentoo2.patch
new file mode 100644
index 00000000000..60fbd7fee41
--- /dev/null
+++ b/dev-ros/pluginlib/files/gentoo2.patch
@@ -0,0 +1,32 @@
+Find package.xml in ros_packages/package_name too as we moved it here.
+
+Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
+===================================================================
+--- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h
++++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
+@@ -510,12 +510,17 @@ ClassLoader<T>::getPackageFromPluginXMLF
+ std::string package_name;
+ boost::filesystem::path p(plugin_xml_file_path);
+ boost::filesystem::path parent = p.parent_path();
++ boost::filesystem::path basename = p.filename();
+
+ // Figure out exactly which package the passed XML file is exported by.
+ while (true) {
+ if (boost::filesystem::exists(parent / "package.xml")) {
+ std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string();
+ return extractPackageNameFromPackageXML(package_file_path);
++ } else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml"))
++ {
++ std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string();
++ return(extractPackageNameFromPackageXML(package_file_path));
+ } else if (boost::filesystem::exists(parent / "manifest.xml")) {
+ #if BOOST_FILESYSTEM_VERSION >= 3
+ std::string package = parent.filename().string();
+@@ -532,6 +537,7 @@ ClassLoader<T>::getPackageFromPluginXMLF
+ }
+
+ // Recursive case - hop one folder up
++ basename = parent.filename();
+ parent = parent.parent_path().string();
+
+ // Base case - reached root and cannot find what we're looking for
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
similarity index 93%
copy from dev-ros/pluginlib/pluginlib-9999.ebuild
copy to dev-ros/pluginlib/pluginlib-1.11.1.ebuild
index 4194e2cd13c..1e00a91c58c 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/gentoo2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 4194e2cd13c..1e00a91c58c 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/gentoo2.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/
@ 2017-11-10 8:51 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-11-10 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 68550f71c97eec4fea2c31e41075e4ed838b86d9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 08:50:11 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 08:51:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68550f71
dev-ros/pluginlib: Fix runtime issues using CMAKE_PREFIX_PATH
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-ros/pluginlib/files/catkin_prefix_path.patch | 15 +++++++++++
dev-ros/pluginlib/files/gentoo2.patch | 32 ------------------------
dev-ros/pluginlib/pluginlib-1.11.1.ebuild | 2 +-
dev-ros/pluginlib/pluginlib-9999.ebuild | 2 +-
4 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/dev-ros/pluginlib/files/catkin_prefix_path.patch b/dev-ros/pluginlib/files/catkin_prefix_path.patch
new file mode 100644
index 00000000000..f5a19ec6d42
--- /dev/null
+++ b/dev-ros/pluginlib/files/catkin_prefix_path.patch
@@ -0,0 +1,15 @@
+Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH.
+
+Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
+===================================================================
+--- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h
++++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
+@@ -66,7 +66,7 @@ namespace
+ std::vector<std::string> catkinFindLib()
+ {
+ std::vector<std::string> lib_paths;
+- const char * env = std::getenv("CMAKE_PREFIX_PATH");
++ const char * env = std::getenv("CATKIN_PREFIX_PATH");
+ if (env) {
+ std::string env_catkin_prefix_paths(env);
+ std::vector<std::string> catkin_prefix_paths;
diff --git a/dev-ros/pluginlib/files/gentoo2.patch b/dev-ros/pluginlib/files/gentoo2.patch
deleted file mode 100644
index 60fbd7fee41..00000000000
--- a/dev-ros/pluginlib/files/gentoo2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Find package.xml in ros_packages/package_name too as we moved it here.
-
-Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
-===================================================================
---- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h
-+++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
-@@ -510,12 +510,17 @@ ClassLoader<T>::getPackageFromPluginXMLF
- std::string package_name;
- boost::filesystem::path p(plugin_xml_file_path);
- boost::filesystem::path parent = p.parent_path();
-+ boost::filesystem::path basename = p.filename();
-
- // Figure out exactly which package the passed XML file is exported by.
- while (true) {
- if (boost::filesystem::exists(parent / "package.xml")) {
- std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string();
- return extractPackageNameFromPackageXML(package_file_path);
-+ } else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml"))
-+ {
-+ std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string();
-+ return(extractPackageNameFromPackageXML(package_file_path));
- } else if (boost::filesystem::exists(parent / "manifest.xml")) {
- #if BOOST_FILESYSTEM_VERSION >= 3
- std::string package = parent.filename().string();
-@@ -532,6 +537,7 @@ ClassLoader<T>::getPackageFromPluginXMLF
- }
-
- // Recursive case - hop one folder up
-+ basename = parent.filename();
- parent = parent.parent_path().string();
-
- // Base case - reached root and cannot find what we're looking for
diff --git a/dev-ros/pluginlib/pluginlib-1.11.1.ebuild b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
index 1e00a91c58c..730a3b5305d 100644
--- a/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.1.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 1e00a91c58c..730a3b5305d 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -24,4 +24,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/
@ 2020-08-07 13:16 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2020-08-07 13:16 UTC (permalink / raw
To: gentoo-commits
commit: fe92a7ebd0267e053d01643dcf00655e87f9393b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 10:38:42 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 13:16:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe92a7eb
dev-ros/pluginlib: add more search pathes
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/pluginlib/files/libdir.patch | 19 +++++++++++++++++++
...inlib-1.13.0.ebuild => pluginlib-1.13.0-r1.ebuild} | 5 +----
dev-ros/pluginlib/pluginlib-9999.ebuild | 5 +----
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/dev-ros/pluginlib/files/libdir.patch b/dev-ros/pluginlib/files/libdir.patch
new file mode 100644
index 00000000000..5152705f019
--- /dev/null
+++ b/dev-ros/pluginlib/files/libdir.patch
@@ -0,0 +1,19 @@
+Add more search pathes for potential libdirs
+
+Index: pluginlib/include/pluginlib/class_loader_imp.hpp
+===================================================================
+--- pluginlib.orig/include/pluginlib/class_loader_imp.hpp
++++ pluginlib/include/pluginlib/class_loader_imp.hpp
+@@ -323,6 +323,12 @@ std::vector<std::string> ClassLoader<T>:
+ boost::filesystem::path bin("bin");
+ lib_paths.push_back((path / bin).string());
+ #endif
++ boost::filesystem::path lib64("lib64");
++ lib_paths.push_back((path / lib64).string());
++ boost::filesystem::path lib32("lib32");
++ lib_paths.push_back((path / lib32).string());
++ boost::filesystem::path libx32("libx32");
++ lib_paths.push_back((path / libx32).string());
+ boost::filesystem::path lib("lib");
+ lib_paths.push_back((path / lib).string());
+ }
diff --git a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild
similarity index 81%
rename from dev-ros/pluginlib/pluginlib-1.13.0.ebuild
rename to dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild
index 6589477b3a3..3386003b331 100644
--- a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.13.0-r1.ebuild
@@ -23,15 +23,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
src_test() {
cmake_build tests
export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
- if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then
- ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die
- fi
export CATKIN_PREFIX_PATH=devel/
ros-catkin_src_test
}
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 6589477b3a3..3386003b331 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -23,15 +23,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
src_test() {
cmake_build tests
export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
- if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then
- ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die
- fi
export CATKIN_PREFIX_PATH=devel/
ros-catkin_src_test
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-07 13:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-07 13:16 [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/, dev-ros/pluginlib/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-11-10 8:51 Alexis Ballier
2017-11-10 8:51 Alexis Ballier
2016-11-28 15:11 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox