pcl: update 1.8.0 --> 1.9.1

This commit is contained in:
Tony Theodore 2019-02-27 03:55:21 +11:00
parent 31de3ba82d
commit cbf35c9278
2 changed files with 58 additions and 2 deletions

56
src/pcl-1-fixes.patch Normal file
View File

@ -0,0 +1,56 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 27 Feb 2019 00:55:49 +1100
Subject: [PATCH 1/1] mingw fixes
diff --git a/common/include/pcl/pcl_macros.h b/common/include/pcl/pcl_macros.h
index 1111111..2222222 100644
--- a/common/include/pcl/pcl_macros.h
+++ b/common/include/pcl/pcl_macros.h
@@ -412,7 +412,7 @@ aligned_malloc (size_t size)
ptr = 0;
#elif defined (HAVE_MM_MALLOC)
ptr = _mm_malloc (size, 16);
-#elif defined (_MSC_VER)
+#elif defined (_WIN32)
ptr = _aligned_malloc (size, 16);
#elif defined (ANDROID)
ptr = memalign (16, size);
@@ -430,7 +430,7 @@ aligned_free (void* ptr)
std::free (ptr);
#elif defined (HAVE_MM_MALLOC)
_mm_free (ptr);
-#elif defined (_MSC_VER)
+#elif defined (_WIN32)
_aligned_free (ptr);
#elif defined (ANDROID)
free (ptr);
diff --git a/io/include/pcl/io/low_level_io.h b/io/include/pcl/io/low_level_io.h
index 1111111..2222222 100644
--- a/io/include/pcl/io/low_level_io.h
+++ b/io/include/pcl/io/low_level_io.h
@@ -53,7 +53,6 @@
# include <io.h>
# include <windows.h>
# include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
#else
# include <unistd.h>
# include <sys/mman.h>
diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
index 1111111..2222222 100644
--- a/surface/CMakeLists.txt
+++ b/surface/CMakeLists.txt
@@ -181,4 +181,7 @@ if(build)
if(WIN32)
target_link_libraries("${LIB_NAME}" Rpcrt4.lib)
endif(WIN32)
+ if(MINGW)
+ add_definitions(-Wa,-mbig-obj)
+ endif(MINGW)
endif(build)

View File

@ -4,8 +4,8 @@ PKG := pcl
$(PKG)_WEBSITE := http://www.pointclouds.org/
$(PKG)_DESCR := PCL (Point Cloud Library)
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.8.0
$(PKG)_CHECKSUM := 9e54b0c1b59a67a386b9b0f4acb2d764272ff9a0377b825c4ed5eedf46ebfcf4
$(PKG)_VERSION := 1.9.1
$(PKG)_CHECKSUM := 0add34d53cd27f8c468a59b8e931a636ad3174b60581c0387abb98a9fc9cddb6
$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/PointCloudLibrary/pcl/archive/$($(PKG)_FILE)