diff options
Diffstat (limited to 'dev-ros/stage_ros')
| -rw-r--r-- | dev-ros/stage_ros/Manifest | 1 | ||||
| -rw-r--r-- | dev-ros/stage_ros/files/fltk.patch | 68 | ||||
| -rw-r--r-- | dev-ros/stage_ros/files/stageconfig.patch | 73 | ||||
| -rw-r--r-- | dev-ros/stage_ros/metadata.xml | 5 | ||||
| -rw-r--r-- | dev-ros/stage_ros/stage_ros-1.7.5.ebuild | 32 | ||||
| -rw-r--r-- | dev-ros/stage_ros/stage_ros-9999.ebuild | 32 |
6 files changed, 211 insertions, 0 deletions
diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest new file mode 100644 index 000000000000..b0c67837a5e8 --- /dev/null +++ b/dev-ros/stage_ros/Manifest @@ -0,0 +1 @@ +DIST stage_ros-1.7.5.tar.gz 58903 SHA256 44ce79611d3e6f2dc88000b3253986b2cebc9760909b90d9e512abf0f95ce376 SHA512 ce4e46f04d4440932f548ccb97745d421dbb5be41ead46df0f45a02e002c2ab672281277ad9835f8c40c001b823873299952b25d6758639a682b19ae470b9511 WHIRLPOOL 2991db94c7c52cef4d66556c669092cef5c046f0b63f0219fce43785d74a2b59fda05accfefca65b6ae00ea01ee5a0da938b924396abb59fd86346fbcc629b3d diff --git a/dev-ros/stage_ros/files/fltk.patch b/dev-ros/stage_ros/files/fltk.patch new file mode 100644 index 000000000000..3e7dc2582944 --- /dev/null +++ b/dev-ros/stage_ros/files/fltk.patch @@ -0,0 +1,68 @@ +commit c62d2b2e64e3d36cac91fbd656db8f69b7c42dc5 +Author: Alexis Ballier <aballier@gentoo.org> +Date: Wed Sep 23 14:58:50 2015 +0200 + + Revert "Remove all references to FLTK/Fluid" + + This reverts commit 933f2bf0b776ee028aaa4b58a382101d81fb042e. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ddd2c7..f709ea5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,12 +14,27 @@ find_package(catkin REQUIRED + + find_package(Boost REQUIRED COMPONENTS system thread) + ++find_package(FLTK REQUIRED) ++if(FLTK_FOUND) ++ # FindFLTK.cmake doesn't populate FLTK_INCLUDE_DIRS on some systems, ++ # so we try to use FLTK_INCLUDE_DIR if we need to. ++ if("${FLTK_INCLUDE_DIRS}" STREQUAL "") ++ set(FLTK_INCLUDE_DIRS "${FLTK_INCLUDE_DIR}") ++ endif() ++ message(status "FLTK_LIBRARIES=" ${FLTK_LIBRARIES}) ++ message(status "FLTK_INCLUDE_DIR=" ${FLTK_INCLUDE_DIR}) ++ message(status "FLTK_INCLUDE_DIRS=" ${FLTK_INCLUDE_DIRS}) ++else() ++ message(fatal_error "FLTK not found...aborting!") ++endif() ++ + set(Stage_DIR cmake) + find_package(Stage REQUIRED) + + include_directories( + ${catkin_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ++ ${FLTK_INCLUDE_DIRS} + ${Stage_INCLUDE_DIRS} + ) + +@@ -34,6 +49,7 @@ endif() + target_link_libraries(stageros + ${catkin_LIBRARIES} + ${Boost_LIBRARIES} ++ ${FLTK_LIBRARIES} + ${Stage_LIBRARIES} + ${${PROJECT_NAME}_extra_libs} + ) +diff --git a/package.xml b/package.xml +index 8803254..fde1a64 100644 +--- a/package.xml ++++ b/package.xml +@@ -17,6 +17,7 @@ + <buildtool_depend>catkin</buildtool_depend> + + <build_depend>boost</build_depend> ++ <build_depend>libfltk-dev</build_depend> + <build_depend>geometry_msgs</build_depend> + <build_depend>nav_msgs</build_depend> + <build_depend>roscpp</build_depend> +@@ -28,6 +29,7 @@ + <build_depend>tf</build_depend> + + <run_depend>boost</run_depend> ++ <run_depend>fluid</run_depend> + <run_depend>geometry_msgs</run_depend> + <run_depend>nav_msgs</run_depend> + <run_depend>roscpp</run_depend> diff --git a/dev-ros/stage_ros/files/stageconfig.patch b/dev-ros/stage_ros/files/stageconfig.patch new file mode 100644 index 000000000000..baadba4ec10c --- /dev/null +++ b/dev-ros/stage_ros/files/stageconfig.patch @@ -0,0 +1,73 @@ +commit 7e9a04fef3b02510017d0ea3bbea047c32a408b1 +Author: Alexis Ballier <aballier@gentoo.org> +Date: Wed Sep 23 14:55:50 2015 +0200 + + Revert "Use upstream stage-config.cmake" + + This reverts commit 55700196507b44ea577233747de25dbf271cdef8. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 89c433d..7ddd2c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,12 +14,13 @@ find_package(catkin REQUIRED + + find_package(Boost REQUIRED COMPONENTS system thread) + +-find_package(stage REQUIRED) ++set(Stage_DIR cmake) ++find_package(Stage REQUIRED) + + include_directories( + ${catkin_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +- ${STAGE_INCLUDE_DIRS} ++ ${Stage_INCLUDE_DIRS} + ) + + catkin_package() +@@ -33,7 +34,7 @@ endif() + target_link_libraries(stageros + ${catkin_LIBRARIES} + ${Boost_LIBRARIES} +- ${STAGE_LIBRARIES} ++ ${Stage_LIBRARIES} + ${${PROJECT_NAME}_extra_libs} + ) + if(catkin_EXPORTED_TARGETS) +diff --git a/cmake/StageConfig.cmake b/cmake/StageConfig.cmake +new file mode 100644 +index 0000000..118e41c +--- /dev/null ++++ b/cmake/StageConfig.cmake +@@ -0,0 +1,30 @@ ++# - Try to find Stage ++# ++# Once done this will define ++# ++# Stage_FOUND - system has Stage ++# Stage_INCLUDE_DIRS - the Stage include directory ++# Stage_LIBRARIES - the Stage libraries ++# ++# Written by William Woodall <william@osrfoundation.org> ++# ++ ++find_package(PkgConfig) ++pkg_check_modules(PC_Stage stage) ++ ++find_library(Stage_LIBRARIES ++ NAMES ${PC_Stage_LIBRARIES} ++ PATHS ${PC_Stage_LIBRARY_DIRS} ++) ++ ++set(Stage_INCLUDE_DIRS ${PC_Stage_INCLUDE_DIRS}) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Stage ++ DEFAULT_MSG ++ Stage_LIBRARIES Stage_INCLUDE_DIRS ++) ++ ++mark_as_advanced(Stage_LIBRARIES Stage_INCLUDE_DIRS) ++ ++set(Stage_FOUND ${STAGE_FOUND}) diff --git a/dev-ros/stage_ros/metadata.xml b/dev-ros/stage_ros/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/stage_ros/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild new file mode 100644 index 000000000000..00cb85f0f2fe --- /dev/null +++ b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-simulation/stage_ros" +KEYWORDS="~amd64" + +inherit ros-catkin + +DESCRIPTION="ROS specific hooks and tools for the Stage simulator" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + dev-ros/geometry_msgs + dev-ros/nav_msgs + dev-ros/roscpp + dev-ros/rostest + dev-ros/sensor_msgs + dev-ros/std_msgs + dev-ros/tf + x11-libs/fltk + sci-electronics/Stage +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest ) + virtual/pkgconfig" +PATCHES=( "${FILESDIR}/stageconfig.patch" "${FILESDIR}/fltk.patch" ) diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild new file mode 100644 index 000000000000..00cb85f0f2fe --- /dev/null +++ b/dev-ros/stage_ros/stage_ros-9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-simulation/stage_ros" +KEYWORDS="~amd64" + +inherit ros-catkin + +DESCRIPTION="ROS specific hooks and tools for the Stage simulator" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + dev-ros/geometry_msgs + dev-ros/nav_msgs + dev-ros/roscpp + dev-ros/rostest + dev-ros/sensor_msgs + dev-ros/std_msgs + dev-ros/tf + x11-libs/fltk + sci-electronics/Stage +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest ) + virtual/pkgconfig" +PATCHES=( "${FILESDIR}/stageconfig.patch" "${FILESDIR}/fltk.patch" ) |