<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133932] trunk/dports/graphics/opencv</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133932">133932</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2015-03-15 15:31:32 -0700 (Sun, 15 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>opencv: update to version 2.4.11</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopencvPortfile">trunk/dports/graphics/opencv/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopencvfilespatchCMakeListstxtdiff">trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsgraphicsopencvfilespatchcmake_OpenCVFindLibsPerfcmakediff">trunk/dports/graphics/opencv/files/patch-cmake_OpenCVFindLibsPerf.cmake.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsopencvPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/opencv/Portfile (133931 => 133932)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name opencv
</span><del>-version 2.4.10
</del><ins>+version 2.4.11
</ins><span class="cx"> revision 0
</span><span class="cx"> categories graphics science
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx">
</span><span class="cx"> use_zip yes
</span><span class="cx">
</span><del>-checksums rmd160 f0fff1421569479dd6918d9e86e701e03aad7945 \
- sha256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6
</del><ins>+checksums rmd160 793391b05b571859005b98612cb176c02352a94f \
+ sha256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:pkgconfig
</span><span class="lines">@@ -54,8 +54,6 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-fix_dirname_case.diff \
</span><span class="cx"> patch-install_name.diff \
</span><del>- patch-CMakeLists.txt.diff \
- patch-cmake_OpenCVFindLibsPerf.cmake.diff \
</del><span class="cx"> patch-modules_java_CMakeLists.txt.diff \
</span><span class="cx"> patch-modules_python_CMakeLists.txt.diff \
</span><span class="cx"> patch-modules_core_src_parallel.cpp.diff \
</span><span class="lines">@@ -86,7 +84,6 @@
</span><span class="cx"> -DWITH_QT=OFF \
</span><span class="cx"> -DWITH_QUICKTIME=OFF \
</span><span class="cx"> -DWITH_TBB=OFF \
</span><del>- -DWITH_GCD=ON \
</del><span class="cx"> -DWITH_CSTRIPES=OFF \
</span><span class="cx"> -DWITH_TIFF=ON \
</span><span class="cx"> -DWITH_UNICAP=OFF \
</span><span class="lines">@@ -152,12 +149,6 @@
</span><span class="cx"> patchfiles-append patch-highgui_CMakeLists.txt.diff
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# GCD is not available
-if {${os.major} <= 11} {
- configure.args-delete -DWITH_GCD=ON
- configure.args-append -DWITH_GCD=OFF
-}
-
</del><span class="cx"> variant eigen description {Enable eigen support.} {
</span><span class="cx"> depends_lib-append port:eigen3
</span><span class="cx"> configure.args-delete -DWITH_EIGEN=OFF
</span></span></pre></div>
<a id="trunkdportsgraphicsopencvfilespatchCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff (133931 => 133932)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- 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) )
</del></span></pre></div>
<a id="trunkdportsgraphicsopencvfilespatchcmake_OpenCVFindLibsPerfcmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/opencv/files/patch-cmake_OpenCVFindLibsPerf.cmake.diff (133931 => 133932)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>---- 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()
</del></span></pre>
</div>
</div>
</body>
</html>