misc/visp: Update 3.3.0 -> 3.4.0
This commit is contained in:
parent
7f8c0ba2d7
commit
43b1f952c8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=567353
@ -1,10 +1,9 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= visp
|
||||
DISTVERSION= 3.3.0
|
||||
PORTREVISION= 5
|
||||
DISTVERSION= 3.4.0
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= http://gforge.inria.fr/frs/download.php/latestfile/475/
|
||||
MASTER_SITES= https://visp-doc.inria.fr/download/releases/
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
COMMENT= Modular library for visual tracking and visual servoing
|
||||
@ -26,7 +25,7 @@ LIB_DEPENDS= libblas.so:math/blas \
|
||||
libpng.so:graphics/png \
|
||||
libv4l2.so:multimedia/libv4l
|
||||
|
||||
USES= cmake compiler:c++14-lang eigen:3 fortran gnome jpeg xorg
|
||||
USES= cmake compiler:c++14-lang eigen:3 fortran gnome jpeg xorg zip
|
||||
USE_GNOME= libxml2
|
||||
USE_XORG= ice sm x11 xext
|
||||
USE_LDCONFIG= yes
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1581960141
|
||||
SHA256 (visp-3.3.0.tar.gz) = f2ed11f8fee52c89487e6e24ba6a31fa604b326e08fb0f561a22c877ebdb640d
|
||||
SIZE (visp-3.3.0.tar.gz) = 60822186
|
||||
TIMESTAMP = 1614895979
|
||||
SHA256 (visp-3.4.0.zip) = 17afd33d92e00b3639a1de2f5d31187f5432b4778d762b80a42a8e6ee0eaaa37
|
||||
SIZE (visp-3.4.0.zip) = 52600494
|
||||
|
@ -1,13 +1,13 @@
|
||||
https://github.com/lagadic/visp/issues/423
|
||||
|
||||
--- CMakeLists.txt.orig 2020-02-14 13:41:31 UTC
|
||||
--- CMakeLists.txt.orig 2021-03-05 01:09:20 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -817,7 +817,7 @@ if(UNIX AND NOT ANDROID)
|
||||
)
|
||||
install(FILES
|
||||
${VISP_BINARY_DIR}/doc/man/man1/visp-config.1.gz
|
||||
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1
|
||||
+ DESTINATION man/man1
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
|
||||
COMPONENT dev
|
||||
)
|
||||
@@ -230,7 +230,7 @@ else() # UNIX
|
||||
vp_update(VISP_LIB_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}")
|
||||
endif()
|
||||
vp_update(VISP_BIN_INSTALL_PATH "${CMAKE_INSTALL_BINDIR}")
|
||||
- vp_update(VISP_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}")
|
||||
+ vp_update(VISP_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_DATAROOTDIR}/visp")
|
||||
vp_update(VISP_3P_LIB_INSTALL_PATH "${VISP_LIB_INSTALL_PATH}/visp/3rdparty")
|
||||
vp_update(VISP_SAMPLES_SRC_INSTALL_PATH "${VISP_INSTALL_DATAROOTDIR}/samples")
|
||||
vp_update(VISP_JAR_INSTALL_PATH "${VISP_INSTALL_DATAROOTDIR}/java")
|
||||
|
11
misc/visp/files/patch-cmake_VISPGenerateHeaders.cmake
Normal file
11
misc/visp/files/patch-cmake_VISPGenerateHeaders.cmake
Normal file
@ -0,0 +1,11 @@
|
||||
--- cmake/VISPGenerateHeaders.cmake.orig 2021-02-26 14:57:15 UTC
|
||||
+++ cmake/VISPGenerateHeaders.cmake
|
||||
@@ -58,7 +58,7 @@ configure_file("${VISP_SOURCE_DIR}/cmake/templates/vpC
|
||||
|
||||
# case 2: when ViSP is build with make install; files are used in <install dir>
|
||||
if(UNIX)
|
||||
- set(data_location_ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}")
|
||||
+ set(data_location_ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/visp")
|
||||
else()
|
||||
set(data_location_ "${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
@ -1,11 +0,0 @@
|
||||
--- modules/core/src/tools/file/vpIoTools.cpp.orig 2020-02-22 01:06:07 UTC
|
||||
+++ modules/core/src/tools/file/vpIoTools.cpp
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
// Detect endianness of the host machine
|
||||
// Reference: http://www.boost.org/doc/libs/1_36_0/boost/detail/endian.hpp
|
||||
-#if defined(__GLIBC__) || (defined(__GNUC__) && !defined(__llvm__) && !defined(__MINGW32__) && defined(__BYTE_ORDER__))
|
||||
+#if defined(__GLIBC__) || (defined(__GNUC__) && !defined(__llvm__) && !defined(__MINGW32__) && defined(__BYTE_ORDER__) && defined(__linux__))
|
||||
#include <endian.h>
|
||||
#if (__BYTE_ORDER == __LITTLE_ENDIAN)
|
||||
#define VISP_LITTLE_ENDIAN
|
@ -1,15 +0,0 @@
|
||||
From https://github.com/lagadic/visp/issues/783#issuecomment-653403417
|
||||
|
||||
--- modules/tracker/mbt/src/depth/vpMbtFaceDepthDense.cpp.orig 2020-08-05 18:31:46 UTC
|
||||
+++ modules/tracker/mbt/src/depth/vpMbtFaceDepthDense.cpp
|
||||
@@ -36,6 +36,10 @@
|
||||
#include <visp3/core/vpCPUFeatures.h>
|
||||
#include <visp3/mbt/vpMbtFaceDepthDense.h>
|
||||
|
||||
+#ifdef VISP_HAVE_PCL
|
||||
+#include <pcl/common/point_tests.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined __SSE2__ || defined _M_X64 || (defined _M_IX86_FP && _M_IX86_FP >= 2)
|
||||
#include <emmintrin.h>
|
||||
#define VISP_HAVE_SSE2 1
|
@ -1,20 +0,0 @@
|
||||
--- modules/vision/src/key-point/vpKeyPoint.cpp.orig 2021-01-30 15:50:44 UTC
|
||||
+++ modules/vision/src/key-point/vpKeyPoint.cpp
|
||||
@@ -2269,7 +2269,7 @@ void vpKeyPoint::initDetector(const std::string &detec
|
||||
|
||||
if (detectorNameTmp == "SIFT") {
|
||||
#ifdef VISP_HAVE_OPENCV_XFEATURES2D
|
||||
- cv::Ptr<cv::FeatureDetector> siftDetector = cv::xfeatures2d::SIFT::create();
|
||||
+ cv::Ptr<cv::FeatureDetector> siftDetector = cv::SIFT::create();
|
||||
if (!usePyramid) {
|
||||
m_detectors[detectorNameTmp] = siftDetector;
|
||||
} else {
|
||||
@@ -2447,7 +2447,7 @@ void vpKeyPoint::initExtractor(const std::string &extr
|
||||
#else
|
||||
if (extractorName == "SIFT") {
|
||||
#ifdef VISP_HAVE_OPENCV_XFEATURES2D
|
||||
- m_extractors[extractorName] = cv::xfeatures2d::SIFT::create();
|
||||
+ m_extractors[extractorName] = cv::SIFT::create();
|
||||
#else
|
||||
std::stringstream ss_msg;
|
||||
ss_msg << "Fail to initialize the extractor: SIFT. OpenCV version " << std::hex << VISP_HAVE_OPENCV_VERSION
|
@ -49,6 +49,7 @@ include/visp/vpDisplayX.h
|
||||
include/visp/vpDot.h
|
||||
include/visp/vpDot2.h
|
||||
include/visp/vpEigenConversion.h
|
||||
include/visp/vpEndian.h
|
||||
include/visp/vpException.h
|
||||
include/visp/vpExponentialMap.h
|
||||
include/visp/vpFeatureBuilder.h
|
||||
@ -89,6 +90,7 @@ include/visp/vpFrameGrabberException.h
|
||||
include/visp/vpGDIRenderer.h
|
||||
include/visp/vpGEMM.h
|
||||
include/visp/vpGaussRand.h
|
||||
include/visp/vpGaussianFilter.h
|
||||
include/visp/vpGenericFeature.h
|
||||
include/visp/vpHandEyeCalibration.h
|
||||
include/visp/vpHinkley.h
|
||||
@ -105,7 +107,9 @@ include/visp/vpImageFilter.h
|
||||
include/visp/vpImageIo.h
|
||||
include/visp/vpImageMorphology.h
|
||||
include/visp/vpImagePoint.h
|
||||
include/visp/vpImageQueue.h
|
||||
include/visp/vpImageSimulator.h
|
||||
include/visp/vpImageStorageWorker.h
|
||||
include/visp/vpImageTools.h
|
||||
include/visp/vpImgproc.h
|
||||
include/visp/vpIoException.h
|
||||
@ -128,13 +132,10 @@ include/visp/vpMatrix.h
|
||||
include/visp/vpMatrixException.h
|
||||
include/visp/vpMbDepthDenseTracker.h
|
||||
include/visp/vpMbDepthNormalTracker.h
|
||||
include/visp/vpMbEdgeKltMultiTracker.h
|
||||
include/visp/vpMbEdgeKltTracker.h
|
||||
include/visp/vpMbEdgeMultiTracker.h
|
||||
include/visp/vpMbEdgeTracker.h
|
||||
include/visp/vpMbGenericTracker.h
|
||||
include/visp/vpMbHiddenFaces.h
|
||||
include/visp/vpMbKltMultiTracker.h
|
||||
include/visp/vpMbKltTracker.h
|
||||
include/visp/vpMbScanLine.h
|
||||
include/visp/vpMbTracker.h
|
||||
@ -207,6 +208,7 @@ include/visp/vpRealSense.h
|
||||
include/visp/vpRealSense2.h
|
||||
include/visp/vpRect.h
|
||||
include/visp/vpRectOriented.h
|
||||
include/visp/vpReflexTakktile2.h
|
||||
include/visp/vpRequest.h
|
||||
include/visp/vpRingLight.h
|
||||
include/visp/vpRobot.h
|
||||
@ -219,6 +221,7 @@ include/visp/vpRobotCamera.h
|
||||
include/visp/vpRobotException.h
|
||||
include/visp/vpRobotFlirPtu.h
|
||||
include/visp/vpRobotFranka.h
|
||||
include/visp/vpRobotKinova.h
|
||||
include/visp/vpRobotPioneer.h
|
||||
include/visp/vpRobotPtu46.h
|
||||
include/visp/vpRobotSimulator.h
|
||||
@ -289,6 +292,7 @@ include/visp/vpTranslationVector.h
|
||||
include/visp/vpTriangle.h
|
||||
include/visp/vpUDPClient.h
|
||||
include/visp/vpUDPServer.h
|
||||
include/visp/vpUeyeGrabber.h
|
||||
include/visp/vpUniRand.h
|
||||
include/visp/vpUnicycle.h
|
||||
include/visp/vpV4l2Grabber.h
|
||||
@ -332,6 +336,7 @@ include/visp3/core/vpDebug.h
|
||||
include/visp3/core/vpDisplay.h
|
||||
include/visp3/core/vpDisplayException.h
|
||||
include/visp3/core/vpEigenConversion.h
|
||||
include/visp3/core/vpEndian.h
|
||||
include/visp3/core/vpException.h
|
||||
include/visp3/core/vpExponentialMap.h
|
||||
include/visp3/core/vpFeatureDisplay.h
|
||||
@ -342,6 +347,7 @@ include/visp3/core/vpFrameGrabber.h
|
||||
include/visp3/core/vpFrameGrabberException.h
|
||||
include/visp3/core/vpGEMM.h
|
||||
include/visp3/core/vpGaussRand.h
|
||||
include/visp3/core/vpGaussianFilter.h
|
||||
include/visp3/core/vpHinkley.h
|
||||
include/visp3/core/vpHistogram.h
|
||||
include/visp3/core/vpHistogramPeak.h
|
||||
@ -449,6 +455,8 @@ include/visp3/imgproc/vpContours.h
|
||||
include/visp3/imgproc/vpImgproc.h
|
||||
include/visp3/io/vpDiskGrabber.h
|
||||
include/visp3/io/vpImageIo.h
|
||||
include/visp3/io/vpImageQueue.h
|
||||
include/visp3/io/vpImageStorageWorker.h
|
||||
include/visp3/io/vpKeyboard.h
|
||||
include/visp3/io/vpParallelPort.h
|
||||
include/visp3/io/vpParallelPortException.h
|
||||
@ -458,13 +466,10 @@ include/visp3/io/vpVideoWriter.h
|
||||
include/visp3/klt/vpKltOpencv.h
|
||||
include/visp3/mbt/vpMbDepthDenseTracker.h
|
||||
include/visp3/mbt/vpMbDepthNormalTracker.h
|
||||
include/visp3/mbt/vpMbEdgeKltMultiTracker.h
|
||||
include/visp3/mbt/vpMbEdgeKltTracker.h
|
||||
include/visp3/mbt/vpMbEdgeMultiTracker.h
|
||||
include/visp3/mbt/vpMbEdgeTracker.h
|
||||
include/visp3/mbt/vpMbGenericTracker.h
|
||||
include/visp3/mbt/vpMbHiddenFaces.h
|
||||
include/visp3/mbt/vpMbKltMultiTracker.h
|
||||
include/visp3/mbt/vpMbKltTracker.h
|
||||
include/visp3/mbt/vpMbScanLine.h
|
||||
include/visp3/mbt/vpMbTracker.h
|
||||
@ -496,6 +501,7 @@ include/visp3/robot/vpPioneerPan.h
|
||||
include/visp3/robot/vpPtu46.h
|
||||
include/visp3/robot/vpQbDevice.h
|
||||
include/visp3/robot/vpQbSoftHand.h
|
||||
include/visp3/robot/vpReflexTakktile2.h
|
||||
include/visp3/robot/vpRingLight.h
|
||||
include/visp3/robot/vpRobot.h
|
||||
include/visp3/robot/vpRobotAfma4.h
|
||||
@ -507,6 +513,7 @@ include/visp3/robot/vpRobotCamera.h
|
||||
include/visp3/robot/vpRobotException.h
|
||||
include/visp3/robot/vpRobotFlirPtu.h
|
||||
include/visp3/robot/vpRobotFranka.h
|
||||
include/visp3/robot/vpRobotKinova.h
|
||||
include/visp3/robot/vpRobotPioneer.h
|
||||
include/visp3/robot/vpRobotPtu46.h
|
||||
include/visp3/robot/vpRobotSimulator.h
|
||||
@ -548,6 +555,7 @@ include/visp3/sensor/vpRealSense.h
|
||||
include/visp3/sensor/vpRealSense2.h
|
||||
include/visp3/sensor/vpScanPoint.h
|
||||
include/visp3/sensor/vpSickLDMRS.h
|
||||
include/visp3/sensor/vpUeyeGrabber.h
|
||||
include/visp3/sensor/vpV4l2Grabber.h
|
||||
include/visp3/tt/vpTemplateTracker.h
|
||||
include/visp3/tt/vpTemplateTrackerBSpline.h
|
||||
@ -645,58 +653,58 @@ lib/cmake/visp/VISPModules-%%CMAKE_BUILD_TYPE%%.cmake
|
||||
lib/cmake/visp/VISPModules.cmake
|
||||
lib/cmake/visp/VISPUse.cmake
|
||||
lib/libvisp_ar.so
|
||||
lib/libvisp_ar.so.3.3
|
||||
lib/libvisp_ar.so.3.3.0
|
||||
lib/libvisp_ar.so.3.4
|
||||
lib/libvisp_ar.so.3.4.0
|
||||
lib/libvisp_blob.so
|
||||
lib/libvisp_blob.so.3.3
|
||||
lib/libvisp_blob.so.3.3.0
|
||||
lib/libvisp_blob.so.3.4
|
||||
lib/libvisp_blob.so.3.4.0
|
||||
lib/libvisp_core.so
|
||||
lib/libvisp_core.so.3.3
|
||||
lib/libvisp_core.so.3.3.0
|
||||
lib/libvisp_core.so.3.4
|
||||
lib/libvisp_core.so.3.4.0
|
||||
lib/libvisp_detection.so
|
||||
lib/libvisp_detection.so.3.3
|
||||
lib/libvisp_detection.so.3.3.0
|
||||
lib/libvisp_detection.so.3.4
|
||||
lib/libvisp_detection.so.3.4.0
|
||||
lib/libvisp_gui.so
|
||||
lib/libvisp_gui.so.3.3
|
||||
lib/libvisp_gui.so.3.3.0
|
||||
lib/libvisp_gui.so.3.4
|
||||
lib/libvisp_gui.so.3.4.0
|
||||
lib/libvisp_imgproc.so
|
||||
lib/libvisp_imgproc.so.3.3
|
||||
lib/libvisp_imgproc.so.3.3.0
|
||||
lib/libvisp_imgproc.so.3.4
|
||||
lib/libvisp_imgproc.so.3.4.0
|
||||
lib/libvisp_io.so
|
||||
lib/libvisp_io.so.3.3
|
||||
lib/libvisp_io.so.3.3.0
|
||||
lib/libvisp_io.so.3.4
|
||||
lib/libvisp_io.so.3.4.0
|
||||
lib/libvisp_klt.so
|
||||
lib/libvisp_klt.so.3.3
|
||||
lib/libvisp_klt.so.3.3.0
|
||||
lib/libvisp_klt.so.3.4
|
||||
lib/libvisp_klt.so.3.4.0
|
||||
lib/libvisp_mbt.so
|
||||
lib/libvisp_mbt.so.3.3
|
||||
lib/libvisp_mbt.so.3.3.0
|
||||
lib/libvisp_mbt.so.3.4
|
||||
lib/libvisp_mbt.so.3.4.0
|
||||
lib/libvisp_me.so
|
||||
lib/libvisp_me.so.3.3
|
||||
lib/libvisp_me.so.3.3.0
|
||||
lib/libvisp_me.so.3.4
|
||||
lib/libvisp_me.so.3.4.0
|
||||
lib/libvisp_robot.so
|
||||
lib/libvisp_robot.so.3.3
|
||||
lib/libvisp_robot.so.3.3.0
|
||||
lib/libvisp_robot.so.3.4
|
||||
lib/libvisp_robot.so.3.4.0
|
||||
lib/libvisp_sensor.so
|
||||
lib/libvisp_sensor.so.3.3
|
||||
lib/libvisp_sensor.so.3.3.0
|
||||
lib/libvisp_sensor.so.3.4
|
||||
lib/libvisp_sensor.so.3.4.0
|
||||
lib/libvisp_tt.so
|
||||
lib/libvisp_tt.so.3.3
|
||||
lib/libvisp_tt.so.3.3.0
|
||||
lib/libvisp_tt.so.3.4
|
||||
lib/libvisp_tt.so.3.4.0
|
||||
lib/libvisp_tt_mi.so
|
||||
lib/libvisp_tt_mi.so.3.3
|
||||
lib/libvisp_tt_mi.so.3.3.0
|
||||
lib/libvisp_tt_mi.so.3.4
|
||||
lib/libvisp_tt_mi.so.3.4.0
|
||||
lib/libvisp_vision.so
|
||||
lib/libvisp_vision.so.3.3
|
||||
lib/libvisp_vision.so.3.3.0
|
||||
lib/libvisp_vision.so.3.4
|
||||
lib/libvisp_vision.so.3.4.0
|
||||
lib/libvisp_visual_features.so
|
||||
lib/libvisp_visual_features.so.3.3
|
||||
lib/libvisp_visual_features.so.3.3.0
|
||||
lib/libvisp_visual_features.so.3.4
|
||||
lib/libvisp_visual_features.so.3.4.0
|
||||
lib/libvisp_vs.so
|
||||
lib/libvisp_vs.so.3.3
|
||||
lib/libvisp_vs.so.3.3.0
|
||||
lib/libvisp_vs.so.3.4
|
||||
lib/libvisp_vs.so.3.4.0
|
||||
libdata/pkgconfig/visp.pc
|
||||
man/man1/visp-config.1.gz
|
||||
share/man/man1/visp-config.1.gz
|
||||
%%DATADIR%%/data/robot-simulator/afma6_arm1.bnd
|
||||
%%DATADIR%%/data/robot-simulator/afma6_arm2.bnd
|
||||
%%DATADIR%%/data/robot-simulator/afma6_arm3.bnd
|
||||
|
Loading…
Reference in New Issue
Block a user