diff options
| author | Andreas Behr | 2012-06-30 12:54:23 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2012-07-02 21:38:02 -0700 |
| commit | 1a81ec617141863d15a3834cdccff02e003e78d0 (patch) | |
| tree | 8129046de885a08d6b46d2ac90388a72ab212759 /Library/Formula | |
| parent | af5a810df89de984455192fa01826fb3d33ea9e6 (diff) | |
| download | homebrew-1a81ec617141863d15a3834cdccff02e003e78d0.tar.bz2 | |
opencv: fixes highgui not linking appkit framework
adds inline patch to fix http://code.opencv.org/issues/2038
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/opencv.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Library/Formula/opencv.rb b/Library/Formula/opencv.rb index ca542c24b..ab0e73914 100644 --- a/Library/Formula/opencv.rb +++ b/Library/Formula/opencv.rb @@ -35,6 +35,13 @@ class Opencv < Formula ] end + def patches + # fixes HighGUI build failure on Mac OS X – Not linking against AppKit framework + # patch is taken from upstream bug report + # upstream patch should be included in version 2.4.2 + return DATA + end + def install args = std_cmake_args args << "-DOPENCV_EXTRA_C_FLAGS='-arch i386 -m32'" if ARGV.build_32_bit? @@ -79,3 +86,17 @@ class Opencv < Formula EOS end end + +__END__ +diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt +index ecd0276..f045ec2 100644 +--- a/modules/highgui/CMakeLists.txt ++++ b/modules/highgui/CMakeLists.txt +@@ -180,7 +180,7 @@ elseif(APPLE) + list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore") + else() + list(APPEND highgui_srcs src/cap_qtkit.mm) +- list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore") ++ list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit") + endif() + endif() |