From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B7611395E1 for ; Tue, 1 Nov 2016 14:54:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EA65E0C48; Tue, 1 Nov 2016 14:54:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A03AE0C48 for ; Tue, 1 Nov 2016 14:54:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97A7934121E for ; Tue, 1 Nov 2016 14:54:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A57224BA for ; Tue, 1 Nov 2016 14:54:28 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1478012060.95fea4f3d4f6d9db9719d5b44e46f15ee13fc047.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/collada_urdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild X-VCS-Directories: dev-ros/collada_urdf/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 95fea4f3d4f6d9db9719d5b44e46f15ee13fc047 X-VCS-Branch: master Date: Tue, 1 Nov 2016 14:54:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c1694dd-9e19-4a85-af2d-8612fac7c8c1 X-Archives-Hash: 3d13a9de46f4c5fa0aab509db7528af7 commit: 95fea4f3d4f6d9db9719d5b44e46f15ee13fc047 Author: Alexis Ballier gentoo org> AuthorDate: Tue Nov 1 14:44:42 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Nov 1 14:54:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fea4f3 dev-ros/collada_urdf: forward port urdfdom1 fix. Package-Manager: portage-2.3.2 dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild index bea7a16..ccf46f3 100644 --- a/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild +++ b/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild @@ -7,7 +7,7 @@ ROS_REPO_URI="https://github.com/ros/robot_model" KEYWORDS="~amd64 ~arm" ROS_SUBDIR=${PN} -inherit ros-catkin +inherit ros-catkin flag-o-matic DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents" LICENSE="BSD" @@ -19,11 +19,20 @@ RDEPEND=" dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever - dev-ros/urdf + >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom + >=dev-libs/urdfdom-1:= + dev-cpp/eigen:3 " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/urdfdom1.patch" ) + +src_configure() { + append-cppflags `pkg-config --cflags eigen3` + append-cxxflags -std=gnu++11 + ros-catkin_src_configure +}