From owner-svn-ports-head@freebsd.org Tue Dec 24 01:55:19 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 EB8A21D6AEB;
Tue, 24 Dec 2019 01:55:19 +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 47hfS75wKGz4JS8;
Tue, 24 Dec 2019 01:55:19 +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 C5E1B20E74;
Tue, 24 Dec 2019 01:55:19 +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 xBO1tJDR024829;
Tue, 24 Dec 2019 01:55:19 GMT (envelope-from pkubaj@FreeBSD.org)
Received: (from pkubaj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBO1tJ18024828;
Tue, 24 Dec 2019 01:55:19 GMT (envelope-from pkubaj@FreeBSD.org)
Message-Id: <201912240155.xBO1tJ18024828@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to
pkubaj@FreeBSD.org using -f
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Tue, 24 Dec 2019 01:55:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r520769 - in head/graphics/cloudcompare: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: pkubaj
X-SVN-Commit-Paths: in head/graphics/cloudcompare: . files
X-SVN-Commit-Revision: 520769
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Dec 2019 01:55:20 -0000
Author: pkubaj
Date: Tue Dec 24 01:55:19 2019
New Revision: 520769
URL: https://svnweb.freebsd.org/changeset/ports/520769
Log:
graphics/cloudcompare: fix build on powerpc64 elfv2
xmmintrin.h is unnecesary and makes CXXFLAGS_powerpc64 also unnecessary (tested on amd64 as well), while clang on ppc64 elfv2 needs mm_malloc.h.
PR: 242530
Approved by: neel@neelc.org (maintainer)
Modified:
head/graphics/cloudcompare/Makefile
head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h
Modified: head/graphics/cloudcompare/Makefile
==============================================================================
--- head/graphics/cloudcompare/Makefile Tue Dec 24 01:54:23 2019 (r520768)
+++ head/graphics/cloudcompare/Makefile Tue Dec 24 01:55:19 2019 (r520769)
@@ -68,8 +68,6 @@ PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-li
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
Modified: head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h
==============================================================================
--- head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h Tue Dec 24 01:54:23 2019 (r520768)
+++ head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h Tue Dec 24 01:55:19 2019 (r520769)
@@ -1,6 +1,6 @@
---- ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2019-01-07 13:59:17.670295000 -0500
-+++ ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h 2019-01-07 13:59:38.242600000 -0500
-@@ -1,7 +1,7 @@
+--- plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2019-06-13 21:16:40 UTC
++++ plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h
+@@ -1,12 +1,12 @@
#ifndef MiscLib__ALIGNEDALLOCATOR_HEADER__
#define MiscLib__ALIGNEDALLOCATOR_HEADER__
#include <memory>
@@ -9,3 +9,9 @@
#include <malloc.h>
#else
#include <stdlib.h>
+ #endif
+-#include <xmmintrin.h>
++#include <mm_malloc.h>
+ #include <limits>
+ #ifdef max
+ #undef max