[path/{py-,}hpp-fcl] Update to v2.4.1

Upstream changes: ## [2.4.1] - 2024-01-23 ### Fixed - CachedMeshLoader checks file last modification time. - Fix call to clear methods for {Collision,Distance}Data inside init function (humanoid-path-planner/hpp-fcl#509) - CMake: fix submodule use in bindings in (humanoid-path-planner/hpp-fcl#512) - Fix bug in DynamicAABBTreeCollisionManager (see humanoid-path-planner/hpp-fcl#514) in (humanoid-path-planner/hpp-fcl#515) Packaging changes: - added patch-522 to fix assimp detection
nim65s · Jan 26, 2024 · bb7e340 · bb7e340
1 parent dc9ae62
commit bb7e340
Show file tree

Hide file tree

Showing 6 changed files with 337 additions and 8 deletions.
diff --git a/path/hpp-fcl/Makefile b/path/hpp-fcl/Makefile
@@ -3,7 +3,7 @@
 #
 
 HPP_PACKAGE=		hpp-fcl
-HPP_VERSION=		2.4.0
+HPP_VERSION=		2.4.1
 
 CATEGORIES=		path
 HPP_COMMENT=		collision detection and distance computations

diff --git a/path/hpp-fcl/distinfo b/path/hpp-fcl/distinfo
@@ -1,3 +1,4 @@
-SHA1 (hpp-fcl-2.4.0.tar.gz) = 5f5a03faec0c896b69a9b760364faf74b401685b
-RMD160 (hpp-fcl-2.4.0.tar.gz) = ed3d2f48b513867433a23179e1880741d940a30d
-Size (hpp-fcl-2.4.0.tar.gz) = 3283656 bytes
+SHA1 (hpp-fcl-2.4.1.tar.gz) = d714a982f358afe16212eb1454e14e98f31edcff
+RMD160 (hpp-fcl-2.4.1.tar.gz) = 079bfe53bb95d65cf363c170706da50d1c03a6ef
+Size (hpp-fcl-2.4.1.tar.gz) = 3288137 bytes
+SHA1 (patch-522) = dce61d233507da0bbd2e0b2b8f125b93c4b1057f
diff --git a/path/hpp-fcl/patches/patch-522 b/path/hpp-fcl/patches/patch-522
@@ -0,0 +1,163 @@
+From 0f96bf89925b9aabf8b986d031368886ced77187 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <[email protected]>
+Date: Wed, 24 Jan 2024 16:51:42 +0100
+Subject: [PATCH 1/2] CMake: use Findassimp from jrl cmake module
+
+---
+ CMakeLists.txt                 |   2 +-
+ cmake-modules/Findassimp.cmake | 108 ---------------------------------
+ 2 files changed, 1 insertion(+), 109 deletions(-)
+ delete mode 100644 cmake-modules/Findassimp.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 157689289..1d8957a80 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -77,7 +77,7 @@ include("${JRL_CMAKE_MODULES}/ide.cmake")
+ include(CMakeDependentOption)
+
+ SET(CMAKE_MODULE_PATH
+-  ${CMAKE_SOURCE_DIR}/cmake-modules/
++  ${JRL_CMAKE_MODULES}/find-external/assimp/
+   ${CMAKE_MODULE_PATH})
+
+ set_default_cmake_build_type("RelWithDebInfo")
+diff --git a/cmake-modules/Findassimp.cmake b/cmake-modules/Findassimp.cmake
+deleted file mode 100644
+index 0b3dba213..000000000
+--- cmake-modules/Findassimp.cmake
++++ /dev/null
+@@ -1,108 +0,0 @@
+-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-	set(ASSIMP_ARCHITECTURE "64")
+-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-	set(ASSIMP_ARCHITECTURE "32")
+-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-
+-set(ASSIMP_ROOT_DIR CACHE PATH "ASSIMP root directory")
+-if(WIN32)
+-
+-	# Find path of each library
+-	find_path(ASSIMP_INCLUDE_DIR
+-		NAMES
+-			assimp/anim.h
+-		HINTS
+-			${ASSIMP_ROOT_DIR}/include
+-	)
+-  	SET(assimp_INCLUDE_DIRS ${ASSIMP_INCLUDE_DIR})
+-
+-	if(MSVC12)
+-		set(ASSIMP_MSVC_VERSIONS "vc120")
+-	else()
+-		set(ASSIMP_MSVC_VERSIONS "vc140;vc141;vc142;vc143")
+-	endif(MSVC12)
+-
+-	if(MSVC)
+-
+-		find_path(ASSIMP_LIBRARY_DIR
+-			NAMES
+-			assimp.lib
+-			assimpd.lib
+-			HINTS
+-			${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE}
+-		)
+-
+-		find_library(ASSIMP_LIBRARY_RELEASE assimp.lib PATHS ${ASSIMP_LIBRARY_DIR})
+-		find_library(ASSIMP_LIBRARY_DEBUG assimpd.lib PATHS ${ASSIMP_LIBRARY_DIR})
+-
+-		IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG)
+-			foreach(ASSIMP_MSVC_VERSION ${ASSIMP_MSVC_VERSIONS})
+-				find_path(ASSIMP_LIBRARY_DIR
+-					NAMES
+-					assimp-${ASSIMP_MSVC_VERSION}-mt.lib
+-					assimp-${ASSIMP_MSVC_VERSION}-mtd.lib
+-					HINTS
+-					${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE}
+-				)
+-
+-				find_library(ASSIMP_LIBRARY_RELEASE				assimp-${ASSIMP_MSVC_VERSION}-mt.lib 			PATHS ${ASSIMP_LIBRARY_DIR})
+-				find_library(ASSIMP_LIBRARY_DEBUG				assimp-${ASSIMP_MSVC_VERSION}-mtd.lib			PATHS ${ASSIMP_LIBRARY_DIR})
+-
+-				IF(ASSIMP_LIBRARY_RELEASE OR ASSIMP_LIBRARY_DEBUG)
+-					break()
+-				ENDIF()
+-			endforeach()
+-		ENDIF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG)
+-
+-		IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG)
+-			SET(assimp_FOUND FALSE)
+-			return()
+-		ENDIF()
+-
+-		IF(ASSIMP_LIBRARY_DEBUG)
+-			set(ASSIMP_LIBRARY
+-			optimized 	${ASSIMP_LIBRARY_RELEASE}
+-			debug		${ASSIMP_LIBRARY_DEBUG}
+-			)
+-		ELSE()
+-			set(ASSIMP_LIBRARY
+-			optimized 	${ASSIMP_LIBRARY_RELEASE}
+-			)
+-		ENDIF()
+-
+-		SET(assimp_LIBRARIES ${ASSIMP_LIBRARY})
+-	endif()
+-
+-else(WIN32)
+-
+-	find_path(
+-	  assimp_INCLUDE_DIRS
+-	  NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
+-	  PATHS /usr/local/include
+-	  PATHS /usr/include/
+-		HINTS	${ASSIMP_ROOT_DIR}/include
+-	)
+-
+-	find_library(
+-	  assimp_LIBRARIES
+-	  NAMES assimp
+-	  PATHS /usr/local/lib/
+-	  PATHS /usr/lib64/
+-	  PATHS /usr/lib/
+-	)
+-
+-	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+-	  SET(assimp_FOUND TRUE)
+-	ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+-
+-	if (assimp_FOUND)
+-	  if (NOT assimp_FIND_QUIETLY)
+-		message(STATUS "Found asset importer library: ${assimp_LIBRARIES}")
+-	  endif (NOT assimp_FIND_QUIETLY)
+-	else (assimp_FOUND)
+-	  if (assimp_FIND_REQUIRED)
+-		message(FATAL_ERROR "Could not find asset importer library")
+-	  endif (assimp_FIND_REQUIRED)
+-	endif (assimp_FOUND)
+-
+-endif(WIN32)
+
+From 70928694ff3fc75a78b1e44027fe9cd35cbb458c Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <[email protected]>
+Date: Wed, 24 Jan 2024 18:46:20 +0100
+Subject: [PATCH 2/2] changelog
+
+---
+ CHANGELOG.md | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 349f82117..ec575ee9b 100644
+--- CHANGELOG.md
++++ CHANGELOG.md
+@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+ ## [Unreleased]
+
++### Fixed
++
++- CMake: fix assimp finder
++
+ ## [2.4.1] - 2024-01-23
+
+ ### Fixed
diff --git a/path/py-hpp-fcl/Makefile b/path/py-hpp-fcl/Makefile
@@ -3,7 +3,7 @@
 #
 
 HPP_PACKAGE=		hpp-fcl
-HPP_VERSION=		2.4.0
+HPP_VERSION=		2.4.1
 
 CATEGORIES=		path
 HPP_COMMENT=		collision detection and distance computations (python bindingss)
@@ -22,6 +22,7 @@ include ../../devel/boost-libs/depend.mk
 include ../../mapping/octomap/depend.mk
 include ../../math/py-eigenpy/depend.mk
 include ../../path/hpp-fcl/depend.mk
+include ../../graphics/assimp/depend.mk
 include ../../pkgtools/pkg-config/depend.mk
 include ../../mk/sysdep/cmake.mk
 include ../../mk/sysdep/python.mk

diff --git a/path/py-hpp-fcl/distinfo b/path/py-hpp-fcl/distinfo
@@ -1,4 +1,5 @@
-SHA1 (hpp-fcl-2.4.0.tar.gz) = 5f5a03faec0c896b69a9b760364faf74b401685b
-RMD160 (hpp-fcl-2.4.0.tar.gz) = ed3d2f48b513867433a23179e1880741d940a30d
-Size (hpp-fcl-2.4.0.tar.gz) = 3283656 bytes
+SHA1 (hpp-fcl-2.4.1.tar.gz) = d714a982f358afe16212eb1454e14e98f31edcff
+RMD160 (hpp-fcl-2.4.1.tar.gz) = 079bfe53bb95d65cf363c170706da50d1c03a6ef
+Size (hpp-fcl-2.4.1.tar.gz) = 3288137 bytes
+SHA1 (patch-522) = dce61d233507da0bbd2e0b2b8f125b93c4b1057f
 SHA1 (patch-aa) = 6e793df3e784d4bb8ce2db3a568a1c58f163b699
diff --git a/path/py-hpp-fcl/patches/patch-522 b/path/py-hpp-fcl/patches/patch-522
@@ -0,0 +1,163 @@
+From 0f96bf89925b9aabf8b986d031368886ced77187 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <[email protected]>
+Date: Wed, 24 Jan 2024 16:51:42 +0100
+Subject: [PATCH 1/2] CMake: use Findassimp from jrl cmake module
+
+---
+ CMakeLists.txt                 |   2 +-
+ cmake-modules/Findassimp.cmake | 108 ---------------------------------
+ 2 files changed, 1 insertion(+), 109 deletions(-)
+ delete mode 100644 cmake-modules/Findassimp.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 157689289..1d8957a80 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -77,7 +77,7 @@ include("${JRL_CMAKE_MODULES}/ide.cmake")
+ include(CMakeDependentOption)
+
+ SET(CMAKE_MODULE_PATH
+-  ${CMAKE_SOURCE_DIR}/cmake-modules/
++  ${JRL_CMAKE_MODULES}/find-external/assimp/
+   ${CMAKE_MODULE_PATH})
+
+ set_default_cmake_build_type("RelWithDebInfo")
+diff --git a/cmake-modules/Findassimp.cmake b/cmake-modules/Findassimp.cmake
+deleted file mode 100644
+index 0b3dba213..000000000
+--- cmake-modules/Findassimp.cmake
++++ /dev/null
+@@ -1,108 +0,0 @@
+-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-	set(ASSIMP_ARCHITECTURE "64")
+-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-	set(ASSIMP_ARCHITECTURE "32")
+-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-
+-set(ASSIMP_ROOT_DIR CACHE PATH "ASSIMP root directory")
+-if(WIN32)
+-
+-	# Find path of each library
+-	find_path(ASSIMP_INCLUDE_DIR
+-		NAMES
+-			assimp/anim.h
+-		HINTS
+-			${ASSIMP_ROOT_DIR}/include
+-	)
+-  	SET(assimp_INCLUDE_DIRS ${ASSIMP_INCLUDE_DIR})
+-
+-	if(MSVC12)
+-		set(ASSIMP_MSVC_VERSIONS "vc120")
+-	else()
+-		set(ASSIMP_MSVC_VERSIONS "vc140;vc141;vc142;vc143")
+-	endif(MSVC12)
+-
+-	if(MSVC)
+-
+-		find_path(ASSIMP_LIBRARY_DIR
+-			NAMES
+-			assimp.lib
+-			assimpd.lib
+-			HINTS
+-			${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE}
+-		)
+-
+-		find_library(ASSIMP_LIBRARY_RELEASE assimp.lib PATHS ${ASSIMP_LIBRARY_DIR})
+-		find_library(ASSIMP_LIBRARY_DEBUG assimpd.lib PATHS ${ASSIMP_LIBRARY_DIR})
+-
+-		IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG)
+-			foreach(ASSIMP_MSVC_VERSION ${ASSIMP_MSVC_VERSIONS})
+-				find_path(ASSIMP_LIBRARY_DIR
+-					NAMES
+-					assimp-${ASSIMP_MSVC_VERSION}-mt.lib
+-					assimp-${ASSIMP_MSVC_VERSION}-mtd.lib
+-					HINTS
+-					${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE}
+-				)
+-
+-				find_library(ASSIMP_LIBRARY_RELEASE				assimp-${ASSIMP_MSVC_VERSION}-mt.lib 			PATHS ${ASSIMP_LIBRARY_DIR})
+-				find_library(ASSIMP_LIBRARY_DEBUG				assimp-${ASSIMP_MSVC_VERSION}-mtd.lib			PATHS ${ASSIMP_LIBRARY_DIR})
+-
+-				IF(ASSIMP_LIBRARY_RELEASE OR ASSIMP_LIBRARY_DEBUG)
+-					break()
+-				ENDIF()
+-			endforeach()
+-		ENDIF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG)
+-
+-		IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG)
+-			SET(assimp_FOUND FALSE)
+-			return()
+-		ENDIF()
+-
+-		IF(ASSIMP_LIBRARY_DEBUG)
+-			set(ASSIMP_LIBRARY
+-			optimized 	${ASSIMP_LIBRARY_RELEASE}
+-			debug		${ASSIMP_LIBRARY_DEBUG}
+-			)
+-		ELSE()
+-			set(ASSIMP_LIBRARY
+-			optimized 	${ASSIMP_LIBRARY_RELEASE}
+-			)
+-		ENDIF()
+-
+-		SET(assimp_LIBRARIES ${ASSIMP_LIBRARY})
+-	endif()
+-
+-else(WIN32)
+-
+-	find_path(
+-	  assimp_INCLUDE_DIRS
+-	  NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
+-	  PATHS /usr/local/include
+-	  PATHS /usr/include/
+-		HINTS	${ASSIMP_ROOT_DIR}/include
+-	)
+-
+-	find_library(
+-	  assimp_LIBRARIES
+-	  NAMES assimp
+-	  PATHS /usr/local/lib/
+-	  PATHS /usr/lib64/
+-	  PATHS /usr/lib/
+-	)
+-
+-	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+-	  SET(assimp_FOUND TRUE)
+-	ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+-
+-	if (assimp_FOUND)
+-	  if (NOT assimp_FIND_QUIETLY)
+-		message(STATUS "Found asset importer library: ${assimp_LIBRARIES}")
+-	  endif (NOT assimp_FIND_QUIETLY)
+-	else (assimp_FOUND)
+-	  if (assimp_FIND_REQUIRED)
+-		message(FATAL_ERROR "Could not find asset importer library")
+-	  endif (assimp_FIND_REQUIRED)
+-	endif (assimp_FOUND)
+-
+-endif(WIN32)
+
+From 70928694ff3fc75a78b1e44027fe9cd35cbb458c Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <[email protected]>
+Date: Wed, 24 Jan 2024 18:46:20 +0100
+Subject: [PATCH 2/2] changelog
+
+---
+ CHANGELOG.md | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 349f82117..ec575ee9b 100644
+--- CHANGELOG.md
++++ CHANGELOG.md
+@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+ ## [Unreleased]
+
++### Fixed
++
++- CMake: fix assimp finder
++
+ ## [2.4.1] - 2024-01-23
+
+ ### Fixed