homebrew-core/Formula/opencv.rb
Yogesh Girdhar 2b64269a58 opencv patched to compile with clang
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2012-03-16 22:06:16 -07:00

172 lines
5.3 KiB
Ruby

require 'formula'
def which_python
"python" + `python -c 'import sys;print(sys.version[:3])'`.strip
end
def site_package_dir
"lib/#{which_python}/site-packages"
end
class Opencv < Formula
homepage 'http://opencv.willowgarage.com/wiki/'
url 'http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.3.1/OpenCV-2.3.1a.tar.bz2'
md5 '82e4b6bfa349777233eea09b075e931e'
depends_on 'cmake' => :build
depends_on 'pkg-config' => :build
depends_on 'libtiff' => :optional
depends_on 'jasper' => :optional
depends_on 'tbb' => :optional
depends_on 'qt' if ARGV.include? '--with-qt'
depends_on 'numpy' => :python
# Can also depend on ffmpeg, but this pulls in a lot of extra stuff that
# you don't need unless you're doing video analysis, and some of it isn't
# in Homebrew anyway.
# Fix conflict when OpenEXR is installed. See:
# http://tech.groups.yahoo.com/group/OpenCV/message/83201
# Fix compile on llvm-gcc-4.2. See
# "https://code.ros.org/trac/opencv/ticket/1431"
# "https://code.ros.org/trac/opencv/ticket/1432"
def patches
DATA
end
def options
[
["--32-bit", "Build 32-bit only."],
["--with-qt", "Build qt backend."]
]
end
def install
args = std_cmake_parameters.split
args << "-DOPENCV_EXTRA_C_FLAGS='-arch i386 -m32'" if ARGV.build_32_bit?
args << "-DWITH_QT=ON" if ARGV.include? "--with-qt"
# The CMake `FindPythonLibs` Module is dumber than a bag of hammers when
# more than one python installation is available---for example, it clings
# to the Header folder of the system Python Framework like a drowning
# sailor.
#
# This code was cribbed from the VTK formula and uses the output to
# `python-config` to do the job FindPythonLibs should be doing in the first
# place.
python_prefix = `python-config --prefix`.strip
# Python is actually a library. The libpythonX.Y.dylib points to this lib, too.
if File.exist? "#{python_prefix}/Python"
# Python was compiled with --framework:
args << "-DPYTHON_LIBRARY='#{python_prefix}/Python'"
args << "-DPYTHON_INCLUDE_DIR='#{python_prefix}/Headers'"
else
python_lib = "#{python_prefix}/lib/lib#{which_python}"
if File.exists? "#{python_lib}.a"
args << "-DPYTHON_LIBRARY='#{python_lib}.a'"
else
args << "-DPYTHON_LIBRARY='#{python_lib}.dylib'"
end
args << "-DPYTHON_INCLUDE_DIR='#{python_prefix}/include/#{which_python}'"
end
args << "-DPYTHON_PACKAGES_PATH='#{lib}/#{which_python}/site-packages'"
system 'cmake', '.', *args
system "make"
system "make install"
end
def caveats; <<-EOS.undent
The OpenCV Python module will not work until you edit your PYTHONPATH like so:
export PYTHONPATH="#{HOMEBREW_PREFIX}/#{site_package_dir}:$PYTHONPATH"
To make this permanent, put it in your shell's profile (e.g. ~/.profile).
EOS
end
end
__END__
Fix conflict when OpenEXR is installed. See:
http://tech.groups.yahoo.com/group/OpenCV/message/83201
diff --git a/modules/highgui/src/grfmt_exr.hpp b/modules/highgui/src/grfmt_exr.hpp
index 642000b..b1414f1 100644
--- a/modules/highgui/src/grfmt_exr.hpp
+++ b/modules/highgui/src/grfmt_exr.hpp
@@ -56,6 +56,7 @@ namespace cv
using namespace Imf;
using namespace Imath;
+using Imf::PixelType;
/* libpng version only */
Fix compile on llvm-gcc-4.2. See
https://code.ros.org/trac/opencv/ticket/1431
https://code.ros.org/trac/opencv/ticket/1432
diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h
index 46e1116..0a5f468 100644
--- a/modules/flann/include/opencv2/flann/any.h
+++ b/modules/flann/include/opencv2/flann/any.h
@@ -114,7 +114,7 @@ struct choose_policy<any>
#define SMALL_POLICY(TYPE) \
template<> \
struct choose_policy<TYPE> { typedef small_any_policy<TYPE> type; \
- };
+ }
SMALL_POLICY(signed char);
SMALL_POLICY(unsigned char);
diff --git a/modules/flann/include/opencv2/flann/defines.h b/modules/flann/include/opencv2/flann/defines.h
index c71e149..7bd8964 100644
--- a/modules/flann/include/opencv2/flann/defines.h
+++ b/modules/flann/include/opencv2/flann/defines.h
@@ -120,7 +120,7 @@ enum flann_log_level_t
FLANN_LOG_FATAL = 1,
FLANN_LOG_ERROR = 2,
FLANN_LOG_WARN = 3,
- FLANN_LOG_INFO = 4,
+ FLANN_LOG_INFO = 4
};
enum flann_distance_t
diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h
index 0a5f468..9f9a4dd 100644
--- a/modules/flann/include/opencv2/flann/any.h
+++ b/modules/flann/include/opencv2/flann/any.h
@@ -30,6 +30,12 @@ struct empty_any
{
};
+inline std::ostream& operator <<(std::ostream& out, const empty_any&)
+{
+ out<<"[empty_any]";
+ return out;
+}
+
struct base_any_policy
{
virtual void static_delete(void** x) = 0;
diff --git a/modules/flann/include/opencv2/flann/lsh_index.h b/modules/flann/include/opencv2/flann/lsh_index.h
index a777990..77f15d5 100644
--- a/modules/flann/include/opencv2/flann/lsh_index.h
+++ b/modules/flann/include/opencv2/flann/lsh_index.h
@@ -56,6 +56,10 @@ namespace cvflann
struct LshIndexParams : public IndexParams
{
+ LshIndexParams()
+ {
+ }
+
LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level)
{
(* this)["algorithm"] = FLANN_INDEX_LSH;