svn commit: r520769 - in head/graphics/cloudcompare: . files

[Piotr Kubaj]

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 at 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