[Lunar-commits] <moonbase-other> Merge branch 'master' of git://github.com/lunar-linux/moonbase-other

[v4hn]

commit f7ac0ddde148c3104ae591def90544283baa2947
Author: v4hn <me at v4hn.de>
Date: Thu, 25 Jul 2013 13:30:19 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/f7ac0ddde148c3104ae591def90544283baa2947

Merge branch 'master' of git://github.com/lunar-linux/moonbase-other
---
  docs/abs-guide/DETAILS | +2/-2     
  graphics/hugin/BUILD   | +3/-7     
  graphics/hugin/DEPENDS | +8/-8     
  libs/flann/BUILD       | +2/-0     
  libs/flann/DEPENDS     | +3/-0     
  libs/flann/DETAILS     | +13/-0    
  6 files changed, 31 insertions(+), 17 deletions(-)

--- a/docs/abs-guide/DETAILS
+++ b/docs/abs-guide/DETAILS
@@ -4,10 +4,10 @@
    SOURCE_URL[0]=http://bash.webofcrafts.net
    SOURCE_URL[1]=http://bash.neuralshortcircuit.com
    SOURCE_URL[2]=http://thegrendel.150m.com
-      SOURCE_VFY=sha1:2070f9ab95e9518a9b964d2ae8c4adaa4ee50ea7
+      SOURCE_VFY=sha1:684c5260e7548b492a85e2cc750a5ea7572f32f9
         WEB_SITE=http://tldp.org/LDP/abs/html
          ENTERED=20020723
-         UPDATED=20111125
+         UPDATED=20130725
            SHORT="An in-depth exploration of the gentle art of shell scripting"
          ARCHIVE=off
 
--- a/graphics/hugin/BUILD
+++ b/graphics/hugin/BUILD
@@ -1,10 +1,6 @@
-(
 
-# if ! in_depends wxGTK mesa-lib ; then
-#  message "${PROBLEM_COLOR}Error: ${DEFAULT_COLOR}Compile wxGTK with OpenGL support"
-#  exit 1;
-# fi &&
+# The make barfs on some non-ascii character, don't know what it should be
+# but just delete the offender.
+  sedit "90d" doc/deghosting_mask.pod &&
 
   default_cmake_build
-
-) > $C_FIFO 2>&1
--- a/graphics/hugin/DEPENDS
+++ b/graphics/hugin/DEPENDS
@@ -1,17 +1,17 @@
+depends zlib
 depends tclap
+depends tiff
+depends glew
 depends wxGTK
 depends libpano13
 depends boost
 depends openexr
 depends enblend-enfuse
 
-optional_depends autopano-sift-C \
-                 "" \
-                 "" \
-                 "in order to use [Create ctrl points]"
+optional_depends lapack          "-DENABLE_LAPACK=ON" "-DENABLE_LAPACK=OFF" "for lapack support"
+optional_depends lensfun         "" "" "for lensfun support"
+optional_depends flann           "" "" "for fann support"
+optional_depends autopano-sift-C "" "" "in order to use [Create ctrl points]"
 
 #do not force autopano-tools as it requires mono
-optional_depends autopano-sift \
-                 "" \
-                 "" \
-                 "in order to use [Create ctrl points], requires mono"
+optional_depends autopano-sift   "" "" "in order to use [Create ctrl points], requires mono"
--- /dev/null
+++ b/libs/flann/BUILD
@@ -0,0 +1,2 @@
+
+  default_cmake_build
--- /dev/null
+++ b/libs/flann/DEPENDS
@@ -0,0 +1,3 @@
+depends ImageMagick
+depends cmake
+depends Python
--- /dev/null
+++ b/libs/flann/DETAILS
@@ -0,0 +1,13 @@
+          MODULE=flann
+         VERSION=1.8.4-src
+          SOURCE=$MODULE-$VERSION.zip
+      SOURCE_URL=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/
+      SOURCE_VFY=sha1:e03d9d458757f70f6af1d330ff453e3621550a4f
+        WEB_SITE=http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
+         ENTERED=20130725
+         UPDATED=20130725
+           SHORT="Fast Library for Approximate Nearest Neighbors"
+
+cat << EOF
+Fast Library for Approximate Nearest Neighbors.
+EOF