[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/

[Alexis Ballier]

commit:     b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 13:19:15 2022 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 13:19:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f

dev-ros/rviz: properly find assimp

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/rviz/files/assimp.patch  | 13 +++++++++++++
 dev-ros/rviz/rviz-1.14.14.ebuild |  5 ++++-
 dev-ros/rviz/rviz-9999.ebuild    |  5 ++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index 000000000000..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===================================================================
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
++++ rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+   ${rviz_ADDITIONAL_LIBRARIES}
+   ${TinyXML2_LIBRARIES}
+   ${X11_X11_LIB}
+-  ${ASSIMP_LIBRARIES}
++  ${assimp_LIBRARIES}
+   ${YAML_CPP_LIBRARIES}
+ )
+ 

diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
        virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+       "${FILESDIR}/yamlcpp.patch"
+       "${FILESDIR}/assimp.patch"
+)
 
 src_test() {
        virtx ros-catkin_src_test

diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
        virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+       "${FILESDIR}/yamlcpp.patch"
+       "${FILESDIR}/assimp.patch"
+)
 
 src_test() {
        virtx ros-catkin_src_test