[113084] trunk/dports/graphics/opencv

[stromnov at macports.org]

Revision: 113084
          https://trac.macports.org/changeset/113084
Author:   stromnov at macports.org
Date:     2013-11-08 05:16:10 -0800 (Fri, 08 Nov 2013)
Log Message:
-----------
opencv: update to version 2.4.7

Modified Paths:
--------------
    trunk/dports/graphics/opencv/Portfile
    trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff

Removed Paths:
-------------
    trunk/dports/graphics/opencv/files/patch-issue-3156.diff

Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile	2013-11-08 10:08:31 UTC (rev 113083)
+++ trunk/dports/graphics/opencv/Portfile	2013-11-08 13:16:10 UTC (rev 113084)
@@ -6,8 +6,8 @@
 PortGroup                       compiler_blacklist_versions 1.0
 
 name                            opencv
-version                         2.4.6.1
-revision                        2
+version                         2.4.7
+revision                        0
 categories                      graphics science
 platforms                       darwin
 license                         BSD
@@ -29,8 +29,8 @@
 distname                        opencv-${version}
 worksrcdir                      ${name}-${version}
 
-checksums                       rmd160  805193fc2e129bc4183c48057ca305774dfa5ed4 \
-                                sha256  ae7cfd859476b6cc05246949ddcb165fb284eaf9a6d814b2976dc21088778aa0
+checksums                       rmd160  a4dcb2d6217547ae63aac15604d2de0326461eeb \
+                                sha256  c48d6c735bfa40c76cadcc0106051e095d8b492b05ac7d2cc9647be807dd2a43
 
 depends_build-append            port:pkgconfig
 
@@ -50,8 +50,7 @@
                                 patch-cmake_OpenCVFindLibsPerf.cmake.diff \
                                 patch-modules_java_CMakeLists.txt.diff \
                                 patch-modules_python_CMakeLists.txt.diff \
-                                patch-modules_core_src_parallel.cpp.diff \
-                                patch-issue-3156.diff
+                                patch-modules_core_src_parallel.cpp.diff
 
 configure.args-append           -DWITH_1394=OFF \
                                 -DWITH_CARBON=OFF \
@@ -105,7 +104,7 @@
                                 -DZLIB_LIBRARY=${prefix}/lib/libz.dylib \
                                 -DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib
 
-set opencv_linker_libs {"-Wl,-headerpad_max_install_names"}
+set opencv_linker_libs          ""
 
 # gcc-4.0 exits with a bus error
 compiler.blacklist-append   gcc-4.0

Modified: trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff	2013-11-08 10:08:31 UTC (rev 113083)
+++ trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff	2013-11-08 13:16:10 UTC (rev 113084)
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2013-03-20 13:10:39.000000000 +0400
-+++ CMakeLists.txt	2013-03-20 13:11:41.000000000 +0400
-@@ -134,6 +134,7 @@
- OCV_OPTION(WITH_QT             "Build with Qt Backend support"               OFF  IF (NOT ANDROID AND NOT IOS) )
+--- CMakeLists.txt.orig	2013-11-08 16:14:41.000000000 +0400
++++ CMakeLists.txt	2013-11-08 16:15:01.000000000 +0400
+@@ -150,6 +150,7 @@
+ OCV_OPTION(WITH_WIN32UI        "Build with Win32 UI Backend support"         ON   IF WIN32 )
  OCV_OPTION(WITH_QUICKTIME      "Use QuickTime for Video I/O insted of QTKit" OFF  IF APPLE )
  OCV_OPTION(WITH_TBB            "Include Intel TBB support"                   OFF  IF (NOT IOS) )
 +OCV_OPTION(WITH_GCD            "Include Apple GCD support"                   ON   IF APPLE )
+ OCV_OPTION(WITH_OPENMP         "Include OpenMP support"                      OFF)
  OCV_OPTION(WITH_CSTRIPES       "Include C= support"                          OFF  IF WIN32 )
  OCV_OPTION(WITH_TIFF           "Include TIFF support"                        ON   IF (NOT IOS) )
- OCV_OPTION(WITH_UNICAP         "Include Unicap support (GPL)"                OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )

Deleted: trunk/dports/graphics/opencv/files/patch-issue-3156.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-issue-3156.diff	2013-11-08 10:08:31 UTC (rev 113083)
+++ trunk/dports/graphics/opencv/files/patch-issue-3156.diff	2013-11-08 13:16:10 UTC (rev 113084)
@@ -1,15 +0,0 @@
---- modules/highgui/src/cap_qtkit.mm
-+++ modules/highgui/src/cap_qtkit.mm
-@@ -277,8 +277,11 @@ - (IplImage*)getOutput;
-     double sleepTime = 0.005;
-     double total = 0;
- 
--    while (![capture updateImage] && (total += sleepTime)<=timeOut)
--        usleep((int)(sleepTime*1000));
-+    NSDate *loopUntil = [NSDate dateWithTimeIntervalSinceNow:sleepTime];
-+    while (![capture updateImage] && (total += sleepTime)<=timeOut &&
-+           [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
-+                                    beforeDate:loopUntil])
-+        loopUntil = [NSDate dateWithTimeIntervalSinceNow:sleepTime];
- 
-     [localpool drain];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131108/a3d3702d/attachment.html>