From owner-svn-ports-all@freebsd.org Mon Aug 5 10:54:50 2019 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 929D0C0534; Mon, 5 Aug 2019 10:54:50 +0000 (UTC) (envelope-from pkubaj@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 462F5k398sz4Vln; Mon, 5 Aug 2019 10:54:50 +0000 (UTC) (envelope-from pkubaj@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 49A7F1AB65; Mon, 5 Aug 2019 10:54:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x75AsoTJ051100; Mon, 5 Aug 2019 10:54:50 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x75AsoOi051099; Mon, 5 Aug 2019 10:54:50 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201908051054.x75AsoOi051099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 5 Aug 2019 10:54:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508159 - head/graphics/cloudcompare X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/graphics/cloudcompare X-SVN-Commit-Revision: 508159 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: Mon, 05 Aug 2019 10:54:50 -0000 Author: pkubaj Date: Mon Aug 5 10:54:49 2019 New Revision: 508159 URL: https://svnweb.freebsd.org/changeset/ports/508159 Log: graphics/cloudcompare: fix build on powerpc64 This port tries to use SSE instrinsics. Add to CXXFLAGS on powerpc64 -DNO_WARN_X86_INTRINSICS -mvsx, which enable using SSE to Altivec translation layer. Because of that, also use new GCC. Note that intrinsics translations needs VSX, which is only supported on POWER8 and newer, but this port doesn't currently work on powerpc64 anyway. Limit -Wno-narrowing to only clang, gcc doesn't support it. Also add USES=gl for PLUGINS option. PR: 239575 Approved by: neel@neelc.org (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D21130 Modified: head/graphics/cloudcompare/Makefile Modified: head/graphics/cloudcompare/Makefile ============================================================================== --- head/graphics/cloudcompare/Makefile Mon Aug 5 10:48:24 2019 (r508158) +++ head/graphics/cloudcompare/Makefile Mon Aug 5 10:54:49 2019 (r508159) @@ -14,7 +14,7 @@ LICENSE_COMB= multi BROKEN_aarch64= fails to compile: mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'? -USES= cmake localbase:ldflags qt:5 +USES= cmake compiler:c++11-lang localbase:ldflags qt:5 USE_GITHUB= yes GH_ACCOUNT= CloudCompare GH_PROJECT= ${GH_ACCOUNT} @@ -48,14 +48,15 @@ PDAL_LIB_DEPENDS= libpdal_base.so:math/pdal SHAPELIB_CMAKE_BOOL= OPTION_USE_SHAPE_LIB SHAPELIB_LIB_DEPENDS= libshp.so:devel/shapelib -PLUGINS_USES= eigen:3 jpeg python:2.7 +PLUGINS_USES= eigen:3 gl jpeg python:2.7 PLUGINS_CMAKE_BOOL= INSTALL_QANIMATION_PLUGIN INSTALL_QBLUR_PLUGIN INSTALL_QBROOM_PLUGIN INSTALL_QCOMPASS_PLUGIN \ INSTALL_QCSF_PLUGIN INSTALL_QCSV_MATRIX_IO_PLUGIN INSTALL_QDUMMY_PLUGIN INSTALL_QEDL_PLUGIN INSTALL_QFACETS_PLUGIN \ INSTALL_QHPR_PLUGIN INSTALL_QM3C2_PLUGIN \ INSTALL_QPCV_PLUGIN INSTALL_QPHOTOSCAN_IO_PLUGIN INSTALL_QRANSAC_SD_PLUGIN \ INSTALL_QSRA_PLUGIN INSTALL_QSSAO_PLUGIN # plugins requiring rare external libs are left out, TODO maybe add some of them? PLUGINS_CMAKE_ON= -DEIGEN_ROOT_DIR:BOOL=${LOCALBASE}/include/eigen3 -PLUGINS_CXXFLAGS= -Wno-narrowing +PLUGINS_CXXFLAGS= ${PLUGINS_CXXFLAGS_${CHOSEN_COMPILER_TYPE}} +PLUGINS_CXXFLAGS_clang= -Wno-narrowing PLUGINS_CXXFLAGS+= -DEIGEN_DONT_PARALLELIZE # OpenMP is broken in cmake: see bug#223678 PLUGINS_USE= XORG=ice,sm,x11,xext,xt GL=gl,glu PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ @@ -66,6 +67,8 @@ PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-li libtiff.so:graphics/tiff \ libvtkDomainsChemistry-6.2.so:math/vtk6 PLUGINS_IMPLIES= SHAPELIB + +CXXFLAGS_powerpc64= -DNO_WARN_X86_INTRINSICS -mvsx post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop