From owner-svn-ports-all@freebsd.org Sat Jan 25 19:58:01 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFDF01F8DEC; Sat, 25 Jan 2020 19:58:01 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 484myd5d2rz41c9; Sat, 25 Jan 2020 19:58:01 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B658BD861; Sat, 25 Jan 2020 19:58:01 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00PJw1xd030323; Sat, 25 Jan 2020 19:58:01 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00PJw16Q030322; Sat, 25 Jan 2020 19:58:01 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202001251958.00PJw16Q030322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 25 Jan 2020 19:58:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524126 - in head/misc/visp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/misc/visp: . files X-SVN-Commit-Revision: 524126 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2020 19:58:01 -0000 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