| 1 |
commit: d429baf76dfbce3ce995e2524013635fada2ddfe |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 28 10:56:35 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 28 10:56:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d429baf7 |
| 7 |
|
| 8 |
sci-libs/pcl: bump to 1.8.0 and add subslot |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sci-libs/pcl/Manifest | 1 + |
| 13 |
sci-libs/pcl/{pcl-9999.ebuild => pcl-1.8.0.ebuild} | 17 +++++++++++------ |
| 14 |
sci-libs/pcl/pcl-9999.ebuild | 17 +++++++++++------ |
| 15 |
3 files changed, 23 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest |
| 18 |
index 293b421..ae402fd 100644 |
| 19 |
--- a/sci-libs/pcl/Manifest |
| 20 |
+++ b/sci-libs/pcl/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST pcl-1.7.2.tar.gz 63474627 SHA256 479f84f2c658a6319b78271111251b4c2d6cf07643421b66bbc351d9bed0ae93 SHA512 23b24f35aa97a167083b0e94164af1c1e1b4b82e1ed7a2514b2453fb5001ad375cda983f4470b34b7b7f717f1399ccec1bcff7ce7f057cd25f024a58830cc2e9 WHIRLPOOL f41f2aa964e617a7e554c5ecf18dc2fc92a87ea1358d3796b364d933c8353bbcf16da6e57409e191b99ca59d5cd7fce236ead29f130e6231949ea5f4c9624332 |
| 23 |
+DIST pcl-1.8.0.tar.gz 66811948 SHA256 9e54b0c1b59a67a386b9b0f4acb2d764272ff9a0377b825c4ed5eedf46ebfcf4 SHA512 185470e980a208bd7213e1087dbc81b9741ae6e8783984e306d34d3e0e4fa69d42aa9c3a2a276d260d11cb89fff9c6cf324401938a66cd3883bdeaa38994e6a1 WHIRLPOOL 1ed161cce3882353241e5720df4c092eff1b2561373b1620bebd98ffae2028eeb31a689377edd1bf1394b0474e221e14d3d0b0107848d37dd54bfbf731dbd91b |
| 24 |
|
| 25 |
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-1.8.0.ebuild |
| 26 |
similarity index 86% |
| 27 |
copy from sci-libs/pcl/pcl-9999.ebuild |
| 28 |
copy to sci-libs/pcl/pcl-1.8.0.ebuild |
| 29 |
index 528691c..c5c91fc 100644 |
| 30 |
--- a/sci-libs/pcl/pcl-9999.ebuild |
| 31 |
+++ b/sci-libs/pcl/pcl-1.8.0.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2015 Gentoo Foundation |
| 34 |
+# Copyright 1999-2016 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
# $Id$ |
| 37 |
|
| 38 |
@@ -24,8 +24,8 @@ fi |
| 39 |
HOMEPAGE="http://pointclouds.org/" |
| 40 |
DESCRIPTION="2D/3D image and point cloud processing" |
| 41 |
LICENSE="BSD" |
| 42 |
-SLOT="0" |
| 43 |
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt4 usb vtk cpu_flags_x86_sse test tutorials" |
| 44 |
+SLOT="0/1.8" |
| 45 |
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
>=sci-libs/flann-1.7.1 |
| 49 |
@@ -37,9 +37,14 @@ RDEPEND=" |
| 50 |
pcap? ( net-libs/libpcap ) |
| 51 |
png? ( media-libs/libpng:0= ) |
| 52 |
qhull? ( media-libs/qhull ) |
| 53 |
- qt4? ( dev-qt/qtgui:4 ) |
| 54 |
+ qt5? ( |
| 55 |
+ dev-qt/qtgui:5 |
| 56 |
+ dev-qt/qtcore:5 |
| 57 |
+ dev-qt/qtconcurrent:5 |
| 58 |
+ dev-qt/qtopengl:5 |
| 59 |
+ ) |
| 60 |
usb? ( virtual/libusb:1 ) |
| 61 |
- vtk? ( >=sci-libs/vtk-5.6[imaging,rendering,qt4?] ) |
| 62 |
+ vtk? ( >=sci-libs/vtk-5.6[imaging,rendering] ) |
| 63 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) |
| 64 |
" |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
@@ -63,7 +68,7 @@ src_configure() { |
| 67 |
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)" |
| 68 |
"-DWITH_PNG=$(usex png TRUE FALSE)" |
| 69 |
"-DWITH_QHULL=$(usex qhull TRUE FALSE)" |
| 70 |
- "-DWITH_QT=$(usex qt4 TRUE FALSE)" |
| 71 |
+ "-DWITH_QT=$(usex qt5 TRUE FALSE)" |
| 72 |
"-DWITH_VTK=$(usex vtk TRUE FALSE)" |
| 73 |
"-DWITH_PCAP=$(usex pcap TRUE FALSE)" |
| 74 |
"-DWITH_OPENNI=$(usex openni TRUE FALSE)" |
| 75 |
|
| 76 |
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild |
| 77 |
index 528691c..c5c91fc 100644 |
| 78 |
--- a/sci-libs/pcl/pcl-9999.ebuild |
| 79 |
+++ b/sci-libs/pcl/pcl-9999.ebuild |
| 80 |
@@ -1,4 +1,4 @@ |
| 81 |
-# Copyright 1999-2015 Gentoo Foundation |
| 82 |
+# Copyright 1999-2016 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
# $Id$ |
| 85 |
|
| 86 |
@@ -24,8 +24,8 @@ fi |
| 87 |
HOMEPAGE="http://pointclouds.org/" |
| 88 |
DESCRIPTION="2D/3D image and point cloud processing" |
| 89 |
LICENSE="BSD" |
| 90 |
-SLOT="0" |
| 91 |
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt4 usb vtk cpu_flags_x86_sse test tutorials" |
| 92 |
+SLOT="0/1.8" |
| 93 |
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials" |
| 94 |
|
| 95 |
RDEPEND=" |
| 96 |
>=sci-libs/flann-1.7.1 |
| 97 |
@@ -37,9 +37,14 @@ RDEPEND=" |
| 98 |
pcap? ( net-libs/libpcap ) |
| 99 |
png? ( media-libs/libpng:0= ) |
| 100 |
qhull? ( media-libs/qhull ) |
| 101 |
- qt4? ( dev-qt/qtgui:4 ) |
| 102 |
+ qt5? ( |
| 103 |
+ dev-qt/qtgui:5 |
| 104 |
+ dev-qt/qtcore:5 |
| 105 |
+ dev-qt/qtconcurrent:5 |
| 106 |
+ dev-qt/qtopengl:5 |
| 107 |
+ ) |
| 108 |
usb? ( virtual/libusb:1 ) |
| 109 |
- vtk? ( >=sci-libs/vtk-5.6[imaging,rendering,qt4?] ) |
| 110 |
+ vtk? ( >=sci-libs/vtk-5.6[imaging,rendering] ) |
| 111 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) |
| 112 |
" |
| 113 |
DEPEND="${RDEPEND} |
| 114 |
@@ -63,7 +68,7 @@ src_configure() { |
| 115 |
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)" |
| 116 |
"-DWITH_PNG=$(usex png TRUE FALSE)" |
| 117 |
"-DWITH_QHULL=$(usex qhull TRUE FALSE)" |
| 118 |
- "-DWITH_QT=$(usex qt4 TRUE FALSE)" |
| 119 |
+ "-DWITH_QT=$(usex qt5 TRUE FALSE)" |
| 120 |
"-DWITH_VTK=$(usex vtk TRUE FALSE)" |
| 121 |
"-DWITH_PCAP=$(usex pcap TRUE FALSE)" |
| 122 |
"-DWITH_OPENNI=$(usex openni TRUE FALSE)" |
Archives