From 220dd9123a4534a987e11501f4d85cd9738b9bef Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 9 May 2014 21:15:18 +1000 Subject: package pcl: update and enable x86_64 build --- src/pcl-1-disable-sse-check.patch | 17 ----------------- src/pcl-1-disable-tools.patch | 16 ++++++++++++++++ src/pcl-2-disable-executables.patch | 30 ------------------------------ src/pcl-3-fix-hashmap.patch | 14 -------------- src/pcl.mk | 32 ++++++++++++++++++-------------- 5 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 src/pcl-1-disable-sse-check.patch create mode 100644 src/pcl-1-disable-tools.patch delete mode 100644 src/pcl-2-disable-executables.patch delete mode 100644 src/pcl-3-fix-hashmap.patch diff --git a/src/pcl-1-disable-sse-check.patch b/src/pcl-1-disable-sse-check.patch deleted file mode 100644 index b9f8707..0000000 --- a/src/pcl-1-disable-sse-check.patch +++ /dev/null @@ -1,17 +0,0 @@ -This file is part of MXE. -See index.html for further information. - ---- a/CMakeLists.txt 2012-12-06 14:21:15.914117050 +0100 -+++ b/CMakeLists.txt 2012-12-06 14:20:53.342117928 +0100 -@@ -86,8 +86,9 @@ - endif() - - # check for SSE flags --include(${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake) --PCL_CHECK_FOR_SSE() -+#include(${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake) -+#PCL_CHECK_FOR_SSE() -+set(SSE_FLAGS) - - if (__COMPILER_PATHSCALE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized -zerouv -pthread -mp") diff --git a/src/pcl-1-disable-tools.patch b/src/pcl-1-disable-tools.patch new file mode 100644 index 0000000..ea3005b --- /dev/null +++ b/src/pcl-1-disable-tools.patch @@ -0,0 +1,16 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur pcl-pcl-1.7.1.orig/visualization/CMakeLists.txt pcl-pcl-1.7.1/visualization/CMakeLists.txt +--- pcl-pcl-1.7.1.orig/visualization/CMakeLists.txt 2014-05-09 20:37:41.000000000 +1000 ++++ pcl-pcl-1.7.1/visualization/CMakeLists.txt 2014-05-09 20:48:58.000000000 +1000 +@@ -171,6 +171,8 @@ + add_subdirectory(test) + endif(BUILD_TESTS) + +- add_subdirectory(tools) ++ if(BUILD_tools) ++ add_subdirectory(tools) ++ endif(BUILD_tools) + + endif(build) diff --git a/src/pcl-2-disable-executables.patch b/src/pcl-2-disable-executables.patch deleted file mode 100644 index c290718..0000000 --- a/src/pcl-2-disable-executables.patch +++ /dev/null @@ -1,30 +0,0 @@ -This file is part of MXE. -See index.html for further information. - ---- a/visualization/tools/CMakeLists.txt 2012-12-06 09:40:39.354741544 +0100 -+++ b/visualization/tools/CMakeLists.txt 2012-12-06 09:40:46.562742448 +0100 -@@ -1,24 +0,0 @@ --PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcd_viewer ${SUBSYS_NAME} pcd_viewer.cpp) --target_link_libraries(pcd_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- --PCL_ADD_EXECUTABLE_OPT_BUNDLE(timed_trigger_test ${SUBSYS_NAME} timed_trigger_test.cpp) --target_link_libraries(timed_trigger_test pcl_io pcl_common pcl_kdtree pcl_visualization) -- --if(OPENNI_FOUND AND BUILD_OPENNI) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcd_grabber_viewer ${SUBSYS_NAME} pcd_grabber_viewer.cpp) -- target_link_libraries(pcd_grabber_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- #PCL_ADD_EXECUTABLE(openni_viewer_simple ${SUBSYS_NAME} openni_viewer_simple.cpp) -- #target_link_libraries(openni_viewer_simple pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(oni_viewer ${SUBSYS_NAME} oni_viewer_simple.cpp) -- target_link_libraries(oni_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(openni_viewer ${SUBSYS_NAME} openni_viewer.cpp) -- target_link_libraries(openni_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) -- -- PCL_ADD_EXECUTABLE_OPT_BUNDLE(openni_image ${SUBSYS_NAME} openni_image.cpp) -- target_link_libraries(openni_image pcl_common pcl_io pcl_kdtree pcl_visualization) --endif() -- diff --git a/src/pcl-3-fix-hashmap.patch b/src/pcl-3-fix-hashmap.patch deleted file mode 100644 index 245b944..0000000 --- a/src/pcl-3-fix-hashmap.patch +++ /dev/null @@ -1,14 +0,0 @@ -This file is part of MXE. -See index.html for further information. - ---- a/surface/include/pcl/surface/poisson/hash.h 2012-12-06 09:09:17.962812894 +0100 -+++ b/surface/include/pcl/surface/poisson/hash.h 2012-12-06 09:09:29.630812193 +0100 -@@ -43,7 +43,7 @@ - #define PCL_POISSON_HASH_H_ - - --#ifdef WIN32 -+#ifdef _MSC_VER - #include - using namespace stdext; - #else // !WIN32 diff --git a/src/pcl.mk b/src/pcl.mk index cd7c91d..ce53ca2 100644 --- a/src/pcl.mk +++ b/src/pcl.mk @@ -3,17 +3,17 @@ PKG := pcl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := 45a2e155d7faf5901abe609fd40d5f1659015e9e -$(PKG)_SUBDIR := PCL-$($(PKG)_VERSION)-Source -$(PKG)_FILE := PCL-$($(PKG)_VERSION)-Source.tar.bz2 -$(PKG)_URL := http://www.pointclouds.org/assets/files/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 1.7.1 +$(PKG)_CHECKSUM := 784bce606141260423ea04f37b093f59d4c94c6a +$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/PointCloudLibrary/pcl/archive/$($(PKG)_FILE) $(PKG)_DEPS := gcc libgomp boost eigen flann vtk define $(PKG)_UPDATE - $(WGET) -q -O- "http://www.pointclouds.org/downloads/" | \ + $(WGET) -q -O- "https://github.com/PointCloudLibrary/pcl/releases" | \ grep ']*\)-Source.*,\1,p' | \ + $(SED) -n 's,.*pcl-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef @@ -24,9 +24,10 @@ endef # that PCL wants to use. define $(PKG)_BUILD - cd '$(1)' && \ + mkdir '$(1).build' + cd '$(1).build' && \ CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__" \ - cmake . \ + cmake '$(1)' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DVTK_DIR='$(PREFIX)/$(TARGET)/lib/vtk-5.8' \ -DCMAKE_BUILD_TYPE=Release \ @@ -37,11 +38,14 @@ define $(PKG)_BUILD -DBUILD_apps=OFF \ -DBUILD_examples=OFF \ -DBUILD_global_tests=OFF \ - -DBUILD_tools=OFF - $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1 - $(MAKE) -C '$(1)' -j 1 install VERBOSE=1 + -DBUILD_tools=OFF \ + -DHAVE_MM_MALLOC_EXITCODE=0 \ + -DHAVE_SSE4_1_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSE3_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSE2_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSE_EXTENSIONS_EXITCODE=0 + $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1 + $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 endef -$(PKG)_BUILD_x86_64-w64-mingw32 = - $(PKG)_BUILD_SHARED = -- cgit v0.12