Version bump sci-libs/pcl to 1.6.0.

3 files changed, 104 insertions, 0 deletions

diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 0e3928a..6d197b0 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,5 +1,8 @@
 AUX pcl-1.4.0-vtk.patch 2443 RMD160 26823e6d3b00ea32470d00a33fdea2353662f64b SHA1 b4b76b6953d4e8c93ff3f7574eda9f20c5cdbf7b SHA256 b388627bf89c16b6d5e682314311c4b9ddc4c49b7eb0c4f17d99fbc0b767280d
 AUX pcl-1.4.0-with.patch 817 RMD160 b896b3965c3c46f824accbdb7656f3736f49bfc8 SHA1 b9528fc4a637020302957abd7a8bd2502fea01ce SHA256 60dee8979a413143f0fc6705279495abb068b2f65bc6b6392e97a57de4966a5b
+AUX pcl-1.6.0-with.patch 951 RMD160 9458a9f33c72b69d83c7c28f5567088e16dc0f3c SHA1 08be9f425fc0cc553a409272711722b15b3236a8 SHA256 cad024cd646d568bf016ee80de158b45ff357b8d047388b7774262719c036eec
 DIST PCL-1.4.0-Source.tar.bz2 10626702 RMD160 440de4c12c4aba81d2b6197180df85e008eef4d9 SHA1 dc2f89cfafb098c27291549115d39cc6b425d31f SHA256 20d49246773bb54d4b9e133ef3b8b5081c94d1677d823cc0c2d03bcd5bf30a2b
+DIST PCL-1.6.0-Source.tar.bz2 15672685 RMD160 08a251e513c1e7a79b22eb439f3d479ce3cf36e5 SHA1 45a2e155d7faf5901abe609fd40d5f1659015e9e SHA256 3d384a37ce801a75c8995801e650a5e2c13e0d67541aa676cad4fa27996ce346
 EBUILD pcl-1.4.0.ebuild 1539 RMD160 edeaba72356004b26eca4f66c26ebde33923476a SHA1 f1dcac1e81baf0728543283e328748ff80db6fb7 SHA256 1dc9ce088fd0e2e96078302dbd430c30f65dbc4632d9b61e53a1ea576c364739
+EBUILD pcl-1.6.0.ebuild 1409 RMD160 c0c74d98338525eb887601c19fe2b64e059cf0af SHA1 1ef18dc74f105a23e9b97575f3e7642fa7866e35 SHA256 cf2cdce91bd237e1862874fc336a84418e5af9fa989e8cb3e97576cbe986f7f6
 MISC metadata.xml 429 RMD160 8dcebf6342fdc1a0ce8b6167b2727af4a59cbb11 SHA1 468eabfbcaa14808c6848682c955b0a5ecf7fb8f SHA256 4b98ec64528cc840cdd7202a1e537d383bb629e3e8419e3616bd71fad545b2be
diff --git a/sci-libs/pcl/files/pcl-1.6.0-with.patch b/sci-libs/pcl/files/pcl-1.6.0-with.patch
new file mode 100644
index 0000000..c9d6644
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.6.0-with.patch
@@ -0,0 +1,36 @@
+diff -Naur PCL-1.6.0-Source.old/CMakeLists.txt PCL-1.6.0-Source/CMakeLists.txt
+--- PCL-1.6.0-Source.old/CMakeLists.txt	2012-07-17 19:11:32.000000000 -0400
++++ PCL-1.6.0-Source/CMakeLists.txt	2012-08-10 16:21:28.000000000 -0400
+@@ -185,7 +185,9 @@
+ find_package(FLANN 1.7.0 REQUIRED)
+ include_directories(SYSTEM ${FLANN_INCLUDE_DIRS})
+ # OpenNI
+-find_package(OpenNI)
++if(WITH_OPENNI)
++  find_package(OpenNI)
++endif()
+ # Qhull
+ if(NOT PCL_SHARED_LIBS OR WIN32)
+   set(QHULL_USE_STATIC ON)
+@@ -199,7 +201,9 @@
+   include(${QT_USE_FILE})
+ endif (QT4_FOUND)
+ # Find VTK
+-find_package(VTK)
++if(WITH_VTK)
++  find_package(VTK)
++endif()
+ if(VTK_FOUND)
+   if (PCL_SHARED_LIBS OR 
+       (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS)))
+@@ -216,7 +220,9 @@
+   endif ()
+ endif(VTK_FOUND)
+ # Find MPI
+-find_package(MPI)
++if(WITH_MPI)
++  find_package(MPI)
++endif()
+ if(MPI_CXX_FOUND)
+   include_directories(SYSTEM ${MPI_INCLUDE_PATH})
+ endif(MPI_CXX_FOUND)
diff --git a/sci-libs/pcl/pcl-1.6.0.ebuild b/sci-libs/pcl/pcl-1.6.0.ebuild
new file mode 100644
index 0000000..f2a913b
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2008-2012 Funtoo Technologies
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit toolchain-funcs cmake-utils
+
+MY_P=PCL-${PV}
+
+DESCRIPTION="The Point Cloud Library (or PCL) is a large scale, open project for 3D point cloud processing."
+HOMEPAGE="http://www.pointclouds.org"
+SRC_URI="${HOMEPAGE}/assets/files/${PV}/${MY_P}-Source.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc mpi +tools +vtk"
+
+RDEPEND="
+	>=dev-libs/boost-1.46
+	dev-cpp/eigen:3
+	>=sci-libs/flann-1.7.1
+	>=media-libs/qhull-2010.1
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+	mpi? ( virtual/mpi )
+	vtk? ( >=sci-libs/vtk-5.6.0 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-with.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P}-Source
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with mpi)
+		$(cmake-utils_use_with vtk)
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build tools)
+		$(cmake-utils_use_build test TESTS)
+	)
+
+	if use cuda; then
+		if [[ "$(gcc-version)" > "4.4" ]]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
+			mycmakeargs+=( "-DHAVE_CUDA=OFF" )
+		else
+			mycmakeargs+=( "-DHAVE_CUDA=ON" )
+		fi
+	else
+		mycmakeargs+=( "-DHAVE_CUDA=OFF" )
+	fi
+
+	# no openni support yet
+	mycmakeargs+=( "-DWITH_OPENNI=OFF" )
+
+	cmake-utils_src_configure
+}