[133932] trunk/dports/graphics/opencv

[stromnov at macports.org]

Revision: 133932
          https://trac.macports.org/changeset/133932
Author:   stromnov at macports.org
Date:     2015-03-15 15:31:32 -0700 (Sun, 15 Mar 2015)
Log Message:
-----------
opencv: update to version 2.4.11

Modified Paths:
--------------
    trunk/dports/graphics/opencv/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff
    trunk/dports/graphics/opencv/files/patch-cmake_OpenCVFindLibsPerf.cmake.diff

Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile	2015-03-15 22:29:13 UTC (rev 133931)
+++ trunk/dports/graphics/opencv/Portfile	2015-03-15 22:31:32 UTC (rev 133932)
@@ -6,7 +6,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                opencv
-version             2.4.10
+version             2.4.11
 revision            0
 categories          graphics science
 platforms           darwin
@@ -36,8 +36,8 @@
 
 use_zip             yes
 
-checksums           rmd160  f0fff1421569479dd6918d9e86e701e03aad7945 \
-                    sha256  1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6
+checksums           rmd160  793391b05b571859005b98612cb176c02352a94f \
+                    sha256  af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea
 
 depends_build-append \
                     port:pkgconfig
@@ -54,8 +54,6 @@
 
 patchfiles          patch-fix_dirname_case.diff \
                     patch-install_name.diff \
-                    patch-CMakeLists.txt.diff \
-                    patch-cmake_OpenCVFindLibsPerf.cmake.diff \
                     patch-modules_java_CMakeLists.txt.diff \
                     patch-modules_python_CMakeLists.txt.diff \
                     patch-modules_core_src_parallel.cpp.diff \
@@ -86,7 +84,6 @@
                     -DWITH_QT=OFF \
                     -DWITH_QUICKTIME=OFF \
                     -DWITH_TBB=OFF \
-                    -DWITH_GCD=ON \
                     -DWITH_CSTRIPES=OFF \
                     -DWITH_TIFF=ON \
                     -DWITH_UNICAP=OFF \
@@ -152,12 +149,6 @@
     patchfiles-append       patch-highgui_CMakeLists.txt.diff
 }
 
-# GCD is not available
-if {${os.major} <= 11} {
-    configure.args-delete   -DWITH_GCD=ON
-    configure.args-append   -DWITH_GCD=OFF
-}
-
 variant eigen description {Enable eigen support.} {
     depends_lib-append      port:eigen3
     configure.args-delete   -DWITH_EIGEN=OFF

Deleted: trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff	2015-03-15 22:29:13 UTC (rev 133931)
+++ trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff	2015-03-15 22:31:32 UTC (rev 133932)
@@ -1,10 +0,0 @@
---- 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) )

Deleted: trunk/dports/graphics/opencv/files/patch-cmake_OpenCVFindLibsPerf.cmake.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-cmake_OpenCVFindLibsPerf.cmake.diff	2015-03-15 22:29:13 UTC (rev 133931)
+++ trunk/dports/graphics/opencv/files/patch-cmake_OpenCVFindLibsPerf.cmake.diff	2015-03-15 22:31:32 UTC (rev 133932)
@@ -1,18 +0,0 @@
---- cmake/OpenCVFindLibsPerf.cmake.orig	2013-03-20 12:39:40.000000000 +0400
-+++ cmake/OpenCVFindLibsPerf.cmake	2013-03-20 13:08:15.000000000 +0400
-@@ -56,8 +56,13 @@
- endif()
- 
- # --- GCD ---
--if(APPLE AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES AND NOT HAVE_OPENMP)
--  set(HAVE_GCD 1)
-+if(WITH_GCD AND APPLE AND NOT HAVE_TBB AND NOT HAVE_CSTRIPES AND NOT HAVE_OPENMP)
-+  find_path(GCD_INCLUDE_PATH dispatch/dispatch.h)
-+  if(GCD_INCLUDE_PATH)
-+    set(HAVE_GCD 1)
-+  else()
-+    set(HAVE_GCD 0)
-+  endif()
- else()
-   set(HAVE_GCD 0)
- endif()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150315/eb3a7155/attachment.html>