svn commit: r524126 - in head/misc/visp: . files
Yuri Victorovich
yuri at FreeBSD.org
Sat Jan 25 19:58:01 UTC 2020
Author: yuri
Date: Sat Jan 25 19:58:00 2020
New Revision: 524126
URL: https://svnweb.freebsd.org/changeset/ports/524126
Log:
misc/visp: Unbreak
The recent upgrade of graphics/pcl-pointclouds made its headers c++14 but visp uses c++11.
This caused some C++-level breakage.
Fixed by switching visp to c++14.
Reported by: fallout
Modified:
head/misc/visp/Makefile
head/misc/visp/files/patch-CMakeLists.txt
Modified: head/misc/visp/Makefile
==============================================================================
--- head/misc/visp/Makefile Sat Jan 25 19:55:55 2020 (r524125)
+++ head/misc/visp/Makefile Sat Jan 25 19:58:00 2020 (r524126)
@@ -25,7 +25,7 @@ LIB_DEPENDS= libblas.so:math/blas \
libpng.so:graphics/png \
libv4l2.so:multimedia/libv4l
-USES= cmake compiler:c++11-lang eigen:3 fortran gnome jpeg xorg
+USES= cmake compiler:c++14-lang eigen:3 fortran gnome jpeg xorg
USE_GNOME= libxml2
USE_XORG= ice sm x11 xext
USE_LDCONFIG= yes
Modified: head/misc/visp/files/patch-CMakeLists.txt
==============================================================================
--- head/misc/visp/files/patch-CMakeLists.txt Sat Jan 25 19:55:55 2020 (r524125)
+++ head/misc/visp/files/patch-CMakeLists.txt Sat Jan 25 19:58:00 2020 (r524126)
@@ -2,7 +2,16 @@ https://github.com/lagadic/visp/issues/423
--- CMakeLists.txt.orig 2019-01-23 14:54:34 UTC
+++ CMakeLists.txt
-@@ -751,7 +751,7 @@ if(UNIX AND NOT ANDROID)
+@@ -553,6 +553,8 @@ if(NOT USE_CXX11 AND CXX11_FOUND)
+ endif()
+ endif()
+
++set(CMAKE_CXX_STANDARD 14) # see https://github.com/lagadic/visp/issues/690
++
+ VP_OPTION(USE_SOWIN SOWIN "" "Include Coin/SoWin support" "" OFF IF (WIN32 AND USE_COIN3D) AND NOT WINRT AND NOT IOS)
+ # Check for SoQt 1.6.0 linked to Qt5 or older version with SOQT
+ VP_OPTION(USE_SOQT "SoQt;SOQT" QUIET "Include Coin/SoQt support" "" OFF IF USE_COIN3D AND NOT WINRT AND NOT IOS)
+@@ -751,7 +753,7 @@ if(UNIX AND NOT ANDROID)
)
install(FILES
${VISP_BINARY_DIR}/doc/man/man1/visp-config.1.gz
More information about the svn-ports-all
mailing list