<!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>[143876] 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/143876">143876</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2015-12-24 03:18:42 -0800 (Thu, 24 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>opencv: update to version 3.1.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopencvPortfile">trunk/dports/graphics/opencv/Portfile</a></li>
<li><a href="#trunkdportsgraphicsopencvfilespatchmodules_java_CMakeListstxtdiff">trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.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 (143875 => 143876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/Portfile 2015-12-24 04:42:36 UTC (rev 143875)
+++ trunk/dports/graphics/opencv/Portfile 2015-12-24 11:18:42 UTC (rev 143876)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name opencv
</span><del>-version 3.0.0
-revision 1
</del><ins>+version 3.1.0
+revision 0
</ins><span class="cx"> categories graphics science
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> use_zip yes
</span><span class="cx">
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- rmd160 7b4dff26502e71e6570c2452c35fd03a1982bc7e \
- sha256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 \
</del><ins>+ rmd160 d7a811c67cfb16243470822150760252d5770165 \
+ sha256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 \
</ins><span class="cx"> ${version}.zip \
</span><del>- rmd160 b257895ab529db2354f17c87b9f02d53625bb5e2 \
- sha256 77b28692b9e477a8554dd5b2180211dd86b6fd69d98e6896b6a7e1753e5f7e8f
</del><ins>+ rmd160 91266cae464ab0f9c00f0f764ba9025a6765d83a \
+ sha256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:pkgconfig
</span><span class="lines">@@ -48,17 +48,18 @@
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:jasper \
</span><span class="cx"> port:tiff \
</span><ins>+ port:webp \
</ins><span class="cx"> port:ilmbase \
</span><span class="cx"> port:openexr \
</span><span class="cx"> path:lib/libavcodec.dylib:ffmpeg
</span><span class="cx">
</span><span class="cx"> patchfiles-append patch-install_name.diff \
</span><span class="cx"> patch-modules_python_CMakeLists.txt.diff \
</span><del>- patch-modules_java_CMakeLists.txt.diff \
- patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
</del><ins>+ patch-modules_java_CMakeLists.txt.diff
</ins><span class="cx">
</span><span class="cx"> # TODO: check and adapt those patches
</span><del>-# patch-modules_core_src_parallel.cpp.diff \
</del><ins>+# patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
+# patch-modules_core_src_parallel.cpp.diff
</ins><span class="cx"> # patch-modules-highgui-src-window_cocoa.mm.diff
</span><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span><span class="lines">@@ -79,7 +80,7 @@
</span><span class="cx"> -DWITH_IPP=OFF \
</span><span class="cx"> -DWITH_JASPER=ON \
</span><span class="cx"> -DWITH_JPEG=ON \
</span><del>- -DWITH_WEBP=OFF \
</del><ins>+ -DWITH_WEBP=ON \
</ins><span class="cx"> -DWITH_OPENEXR=ON \
</span><span class="cx"> -DWITH_OPENGL=ON \
</span><span class="cx"> -DWITH_OPENNI=OFF \
</span><span class="lines">@@ -106,7 +107,11 @@
</span><span class="cx"> -DWITH_OPENCLAMDBLAS=OFF \
</span><span class="cx"> -DWITH_INTELPERC=OFF \
</span><span class="cx"> -DWITH_IPP_A=OFF \
</span><ins>+ -DWITH_VA=OFF \
+ -DWITH_VA_INTEL=OFF \
</ins><span class="cx"> -DWITH_GDAL=OFF \
</span><ins>+ -DWITH_GPHOTO2=OFF \
+ \
</ins><span class="cx"> -DBUILD_SHARED_LIBS=ON \
</span><span class="cx"> -DBUILD_opencv_apps=ON \
</span><span class="cx"> -DBUILD_DOCS=OFF \
</span><span class="lines">@@ -115,6 +120,7 @@
</span><span class="cx"> -DBUILD_PERF_TESTS=OFF \
</span><span class="cx"> -DBUILD_TESTS=OFF \
</span><span class="cx"> -DBUILD_WITH_DYNAMIC_IPP=OFF \
</span><ins>+ \
</ins><span class="cx"> -DBUILD_ZLIB=OFF \
</span><span class="cx"> -DBUILD_TIFF=OFF \
</span><span class="cx"> -DBUILD_JASPER=OFF \
</span><span class="lines">@@ -122,6 +128,7 @@
</span><span class="cx"> -DBUILD_PNG=OFF \
</span><span class="cx"> -DBUILD_OPENEXR=OFF \
</span><span class="cx"> -DBUILD_TBB=OFF \
</span><ins>+ \
</ins><span class="cx"> -DPYTHON_EXECUTABLE=OFF \
</span><span class="cx"> -DINSTALL_C_EXAMPLES=OFF \
</span><span class="cx"> -DINSTALL_PYTHON_EXAMPLES=OFF \
</span><span class="lines">@@ -168,7 +175,7 @@
</span><span class="cx"> configure.args-append -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant opencl description {Enable OpenCL support.} {
</del><ins>+variant opencl description {Enable OpenCL support (broken).} {
</ins><span class="cx"> pre-configure {
</span><span class="cx"> if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span class="cx"> ui_error "The OpenCL variant only works with OS X 10.7 Lion or later."
</span><span class="lines">@@ -274,6 +281,12 @@
</span><span class="cx"> -DWITH_VTK=ON
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant gdal description {Include GDAL support.} {
+ depends_lib-append port:gdal
+ configure.args-replace -DWITH_GDAL=OFF \
+ -DWITH_GDAL=ON
+}
+
</ins><span class="cx"> variant contrib description {Build OpenCV with extra modules.} {
</span><span class="cx"> distfiles-append ${version}.zip:opencv_contrib
</span><span class="cx"> configure.args-append -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules
</span></span></pre></div>
<a id="trunkdportsgraphicsopencvfilespatchmodules_java_CMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff (143875 => 143876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff 2015-12-24 04:42:36 UTC (rev 143875)
+++ trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff 2015-12-24 11:18:42 UTC (rev 143876)
</span><span class="lines">@@ -1,12 +1,11 @@
</span><del>---- modules/java/CMakeLists.txt.orig 2015-06-16 00:07:26.000000000 +0300
-+++ modules/java/CMakeLists.txt 2015-06-16 00:07:39.000000000 +0300
-@@ -1,6 +1,9 @@
</del><ins>+--- modules/java/CMakeLists.txt.orig 2015-12-23 23:35:34.000000000 +0300
++++ modules/java/CMakeLists.txt 2015-12-23 23:36:25.000000000 +0300
+@@ -1,6 +1,8 @@
</ins><span class="cx"> # ----------------------------------------------------------------------------
</span><span class="cx"> # CMake file for java support
</span><span class="cx"> # ----------------------------------------------------------------------------
</span><del>-+
</del><span class="cx"> +ocv_module_disable(java)
</span><span class="cx"> +
</span><del>- if(IOS OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE OR NOT (JNI_FOUND OR (ANDROID AND ANDROID_NATIVE_API_LEVEL GREATER 7))
</del><ins>+ if(APPLE_FRAMEWORK OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE
+ OR NOT (JNI_FOUND OR (ANDROID AND ANDROID_NATIVE_API_LEVEL GREATER 7))
</ins><span class="cx"> OR BUILD_opencv_world
</span><del>- )
</del></span></pre>
</div>
</div>
</body>
</html>