Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

13 files changed, 45 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c0feff0765..8ce4dc1ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	* science-libs/flann: new spell
 	  Fast Library for Approximate Nearest Neighbors
 	* science-libs/cminpack: new spell, C/C++ Minpack
+	* science-libs/pcl: new spell, Point Cloud Library
 
 2011-10-15 Bor Kraljič <pyrobor@ver.si>
 	* chat-im/openwengo: removed (deprecated over 180 days ago)
diff --git a/perl-cpan/log-dispatch/DEPENDS b/perl-cpan/log-dispatch/DEPENDS
index ba484a4af1..6826bc7952 100755
--- a/perl-cpan/log-dispatch/DEPENDS
+++ b/perl-cpan/log-dispatch/DEPENDS
@@ -1,2 +1 @@
-depends perl  &&
-depends module-build
+depends perl
diff --git a/perl-cpan/log-dispatch/HISTORY b/perl-cpan/log-dispatch/HISTORY
index 3bd6843739..97918f957b 100644
--- a/perl-cpan/log-dispatch/HISTORY
+++ b/perl-cpan/log-dispatch/HISTORY
@@ -1,3 +1,6 @@
+2011-10-15 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: module-build was merged into perl (fixes #289)
+
 2008-01-07 Vlad Glagolev <stealth@sourcemage.org>
 	* BUILD: useless
 
diff --git a/perl-cpan/mod_perl/DEPENDS b/perl-cpan/mod_perl/DEPENDS
index db6ec2033e..4eaa298358 100755
--- a/perl-cpan/mod_perl/DEPENDS
+++ b/perl-cpan/mod_perl/DEPENDS
@@ -1,6 +1,6 @@
 if [ "$MOD_PERL_2" == "y" ]; then
   depends APACHE2
 else
-  depends apache
+  depends apache1
 fi   &&
 depends  perl
diff --git a/perl-cpan/mod_perl/HISTORY b/perl-cpan/mod_perl/HISTORY
index 762dea2536..51290b67c9 100644
--- a/perl-cpan/mod_perl/HISTORY
+++ b/perl-cpan/mod_perl/HISTORY
@@ -1,3 +1,6 @@
+2011-10-15 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: apache was renamed to apache1 (fixes #291)
+
 2011-03-19 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated apache2 version to 2.0.5
 	  Removed SOURCE_URL[0] and made [1] now [0]
diff --git a/perl-cpan/module-install/DEPENDS b/perl-cpan/module-install/DEPENDS
index b657013a3b..1dd0168982 100755
--- a/perl-cpan/module-install/DEPENDS
+++ b/perl-cpan/module-install/DEPENDS
@@ -1 +1 @@
-depends  module-build
+depends  perl
diff --git a/perl-cpan/module-install/HISTORY b/perl-cpan/module-install/HISTORY
index fb84c807b3..48373e5f4f 100644
--- a/perl-cpan/module-install/HISTORY
+++ b/perl-cpan/module-install/HISTORY
@@ -1,3 +1,6 @@
+2011-10-15 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: module-build was merged into perl (fixes #290)
+
 2008-01-07 Vlad Glagolev <stealth@sourcemage.org>
 	* BUILD: cleaned up
 
diff --git a/science-libs/pcl/BUILD b/science-libs/pcl/BUILD
new file mode 100755
index 0000000000..e013b8d866
--- /dev/null
+++ b/science-libs/pcl/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/science-libs/pcl/DEPENDS b/science-libs/pcl/DEPENDS
new file mode 100755
index 0000000000..1d7de0c272
--- /dev/null
+++ b/science-libs/pcl/DEPENDS
@@ -0,0 +1,4 @@
+depends cmake &&
+depends eigen3 &&
+depends flann &&
+depends cminpack
diff --git a/science-libs/pcl/DETAILS b/science-libs/pcl/DETAILS
new file mode 100755
index 0000000000..f31c936c21
--- /dev/null
+++ b/science-libs/pcl/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=pcl
+         VERSION=1.2.0
+          SOURCE=PCL-$VERSION-Source.tar.bz2
+   SOURCE_URL[0]=http://dev.pointclouds.org/attachments/download/442/$SOURCE
+     SOURCE_HASH=sha512:9cb4e9fa63fc5776d90d1a87142eb14c9e29fa2d062f0b456abd7c135f661a2cd8c085472a5dd40c385da4656823d597a6dad4c85d213d778071f99eade55615
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/PCL-$VERSION-Source
+        WEB_SITE=http://pointclouds.org/
+      LICENSE[0]=BSD
+         ENTERED=20111015
+           SHORT="Point Cloud Library"
+cat << EOF
+The Point Cloud Library (or PCL) is a large scale, open project for point
+cloud processing. The PCL framework contains numerous state-of-the art
+algorithms including filtering, feature estimation, surface reconstruction,
+registration, model fitting and segmentation. These algorithms can be used,
+for example, to filter outliers from noisy data, stitch 3D point clouds
+together, segment relevant parts of a scene, extract keypoints and compute
+descriptors to recognize objects in the world based on their geometric
+appearance, and create surfaces from point clouds and visualize them -- to
+name a few.
+EOF
diff --git a/science-libs/pcl/HISTORY b/science-libs/pcl/HISTORY
new file mode 100644
index 0000000000..2412998b62
--- /dev/null
+++ b/science-libs/pcl/HISTORY
@@ -0,0 +1,2 @@
+2011-10-15 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, DEPENDS, BUILD: spell created, version 1.2.0
diff --git a/utils/rtirq/DEPENDS b/utils/rtirq/DEPENDS
index 0527dd3d0c..f440a39c39 100755
--- a/utils/rtirq/DEPENDS
+++ b/utils/rtirq/DEPENDS
@@ -1 +1 @@
-depends  schedutils
+depends  util-linux
diff --git a/utils/rtirq/HISTORY b/utils/rtirq/HISTORY
index ad7be9c36f..e34e9440b4 100644
--- a/utils/rtirq/HISTORY
+++ b/utils/rtirq/HISTORY
@@ -1,3 +1,6 @@
+2011-10-15 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: schedutils was deprecated in favour of util-linux (fixes #286)
+
 2007-12-02 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: Updated to 20071012.