<!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>[137653] 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/137653">137653</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2015-06-16 02:50:44 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>opencv: update to version 3.0.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopencvPortfile">trunk/dports/graphics/opencv/Portfile</a></li>
<li><a href="#trunkdportsgraphicsopencvfilespatchinstall_namediff">trunk/dports/graphics/opencv/files/patch-install_name.diff</a></li>
<li><a href="#trunkdportsgraphicsopencvfilespatchmodules_java_CMakeListstxtdiff">trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsgraphicsopencvfilespatchmodules_python_CMakeListstxtdiff">trunk/dports/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopencvfilespatchfix_dirname_casediff">trunk/dports/graphics/opencv/files/patch-fix_dirname_case.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 (137652 => 137653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/Portfile 2015-06-16 09:32:01 UTC (rev 137652)
+++ trunk/dports/graphics/opencv/Portfile 2015-06-16 09:50:44 UTC (rev 137653)
</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.11
</del><ins>+version 3.0.0
</ins><span class="cx"> revision 0
</span><span class="cx"> categories graphics science
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx">
</span><span class="cx"> use_zip yes
</span><span class="cx">
</span><del>-checksums rmd160 793391b05b571859005b98612cb176c02352a94f \
- sha256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea
</del><ins>+checksums rmd160 7b4dff26502e71e6570c2452c35fd03a1982bc7e \
+ sha256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:pkgconfig
</span><span class="lines">@@ -45,61 +45,75 @@
</span><span class="cx"> port:openexr \
</span><span class="cx"> path:lib/libavcodec.dylib:ffmpeg
</span><span class="cx">
</span><del>-patchfiles patch-fix_dirname_case.diff \
- patch-install_name.diff \
- patch-modules_java_CMakeLists.txt.diff \
</del><ins>+patchfiles-append patch-install_name.diff \
</ins><span class="cx"> patch-modules_python_CMakeLists.txt.diff \
</span><del>- patch-modules_core_src_parallel.cpp.diff \
- patch-modules-highgui-src-window_cocoa.mm.diff
</del><ins>+ patch-modules_java_CMakeLists.txt.diff
</ins><span class="cx">
</span><ins>+# TODO: check and adapt those patches
+# patch-modules_core_src_parallel.cpp.diff \
+# patch-modules-highgui-src-window_cocoa.mm.diff
+
</ins><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DWITH_1394=OFF \
</span><span class="cx"> -DWITH_CARBON=OFF \
</span><del>- -DWITH_CUBLAS=OFF \
</del><ins>+ -DWITH_VTK=OFF \
</ins><span class="cx"> -DWITH_CUDA=OFF \
</span><del>- -DWITH_VTK=OFF \
</del><span class="cx"> -DWITH_CUFFT=OFF \
</span><span class="cx"> -DWITH_CUBLAS=OFF \
</span><ins>+ -DWITH_NVCUVID=OFF \
</ins><span class="cx"> -DWITH_EIGEN=OFF \
</span><span class="cx"> -DWITH_FFMPEG=ON \
</span><span class="cx"> -DWITH_GSTREAMER=OFF \
</span><span class="cx"> -DWITH_GTK=OFF \
</span><del>- -DWITH_IMAGEIO=ON \
</del><ins>+ -DWITH_GTK_2_X=OFF \
</ins><span class="cx"> -DWITH_IPP=OFF \
</span><span class="cx"> -DWITH_JASPER=ON \
</span><span class="cx"> -DWITH_JPEG=ON \
</span><ins>+ -DWITH_WEBP=OFF \
</ins><span class="cx"> -DWITH_OPENEXR=ON \
</span><span class="cx"> -DWITH_OPENGL=ON \
</span><span class="cx"> -DWITH_OPENNI=OFF \
</span><ins>+ -DWITH_OPENNI2=OFF \
</ins><span class="cx"> -DWITH_PNG=ON \
</span><span class="cx"> -DWITH_PVAPI=OFF \
</span><span class="cx"> -DWITH_GIGEAPI=OFF \
</span><span class="cx"> -DWITH_QT=OFF \
</span><span class="cx"> -DWITH_QUICKTIME=OFF \
</span><span class="cx"> -DWITH_TBB=OFF \
</span><ins>+ -DWITH_OPENMP=OFF \
</ins><span class="cx"> -DWITH_CSTRIPES=OFF \
</span><ins>+ -DWITH_PTHREADS_PF=OFF \
</ins><span class="cx"> -DWITH_TIFF=ON \
</span><span class="cx"> -DWITH_UNICAP=OFF \
</span><span class="cx"> -DWITH_V4L=OFF \
</span><del>- -DWITH_VIDEOINPUT=OFF \
</del><ins>+ -DWITH_LIBV4L=OFF \
</ins><span class="cx"> -DWITH_XIMEA=OFF \
</span><span class="cx"> -DWITH_XINE=OFF \
</span><ins>+ -DWITH_CLP=OFF \
</ins><span class="cx"> -DWITH_OPENCL=OFF \
</span><ins>+ -DWITH_OPENCL_SVM=OFF \
</ins><span class="cx"> -DWITH_OPENCLAMDFFT=OFF \
</span><span class="cx"> -DWITH_OPENCLAMDBLAS=OFF \
</span><ins>+ -DWITH_INTELPERC=OFF \
+ -DWITH_IPP_A=OFF \
+ -DWITH_GDAL=OFF \
</ins><span class="cx"> -DBUILD_SHARED_LIBS=ON \
</span><ins>+ -DBUILD_opencv_apps=ON \
</ins><span class="cx"> -DBUILD_DOCS=OFF \
</span><span class="cx"> -DBUILD_EXAMPLES=OFF \
</span><ins>+ -DBUILD_PACKAGE=OFF \
</ins><span class="cx"> -DBUILD_PERF_TESTS=OFF \
</span><span class="cx"> -DBUILD_TESTS=OFF \
</span><ins>+ -DBUILD_WITH_DYNAMIC_IPP=OFF \
</ins><span class="cx"> -DBUILD_ZLIB=OFF \
</span><span class="cx"> -DBUILD_TIFF=OFF \
</span><span class="cx"> -DBUILD_JASPER=OFF \
</span><span class="cx"> -DBUILD_JPEG=OFF \
</span><span class="cx"> -DBUILD_PNG=OFF \
</span><span class="cx"> -DBUILD_OPENEXR=OFF \
</span><ins>+ -DBUILD_TBB=OFF \
</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">@@ -135,8 +149,8 @@
</span><span class="cx">
</span><span class="cx"> # PCH broken when universal
</span><span class="cx"> if {[variant_isset universal]} {
</span><del>- configure.args-delete -DENABLE_PRECOMPILED_HEADERS=ON
- configure.args-append -DENABLE_PRECOMPILED_HEADERS=OFF
</del><ins>+ configure.args-replace -DENABLE_PRECOMPILED_HEADERS=ON \
+ -DENABLE_PRECOMPILED_HEADERS=OFF
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Video Decode Acceleration Framework is not available
</span><span class="lines">@@ -146,9 +160,9 @@
</span><span class="cx">
</span><span class="cx"> variant eigen description {Enable eigen support.} {
</span><span class="cx"> depends_lib-append port:eigen3
</span><del>- configure.args-delete -DWITH_EIGEN=OFF
- configure.args-append -DWITH_EIGEN=ON \
- -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
</del><ins>+ configure.args-replace -DWITH_EIGEN=OFF \
+ -DWITH_EIGEN=ON
+ configure.args-append -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant opencl description {Enable OpenCL support.} {
</span><span class="lines">@@ -158,15 +172,15 @@
</span><span class="cx"> return -code error "incompatible OS X version"
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- configure.args-delete -DWITH_OPENCL=OFF
- configure.args-append -DWITH_OPENCL=ON
</del><ins>+ configure.args-replace -DWITH_OPENCL=OFF \
+ -DWITH_OPENCL=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant openni description {Enable OpenNI support.} {
</span><span class="cx"> depends_lib-append port:openni
</span><span class="cx"> patchfiles-append patch-cmake_OpenCVFindOpenNI.cmake.diff
</span><del>- configure.args-delete -DWITH_OPENNI=OFF
- configure.args-append -DWITH_OPENNI=ON
</del><ins>+ configure.args-replace -DWITH_OPENNI=OFF \
+ -DWITH_OPENNI=ON
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s,@@PREFIX@@,${prefix},g" ${worksrcpath}/cmake/OpenCVFindOpenNI.cmake
</span><span class="lines">@@ -175,21 +189,21 @@
</span><span class="cx">
</span><span class="cx"> variant dc1394 description {Use libdc1394 for FireWire camera. Breaks compatibility with Apple iSight FireWire camera.} {
</span><span class="cx"> depends_lib-append port:libdc1394
</span><del>- configure.args-delete -DWITH_1394=OFF
- configure.args-append -DWITH_1394=ON \
- -DHAVE_DC1394_2=ON
</del><ins>+ configure.args-replace -DWITH_1394=OFF \
+ -DWITH_1394=ON
+ configure.args-append -DHAVE_DC1394_2=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant qt4 conflicts qt5 description {Build with Qt4 Backend support.} {
</span><span class="cx"> PortGroup qt4 1.0
</span><del>- configure.args-delete -DWITH_QT=OFF
- configure.args-append -DWITH_QT=ON
</del><ins>+ configure.args-replace -DWITH_QT=OFF \
+ -DWITH_QT=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant qt5 conflicts qt4 description {Build with Qt5 Backend support.} {
</span><span class="cx"> PortGroup qt5 1.0
</span><del>- configure.args-delete -DWITH_QT=OFF
- configure.args-append -DWITH_QT=ON
</del><ins>+ configure.args-replace -DWITH_QT=OFF \
+ -DWITH_QT=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant java description {Add Java bindings.} {
</span><span class="lines">@@ -197,50 +211,51 @@
</span><span class="cx"> patchfiles-delete patch-modules_java_CMakeLists.txt.diff
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset java] && ![variant_isset python26] && ![variant_isset python27]} {
- configure.args-delete -DPYTHON_EXECUTABLE=OFF
- configure.args-append -DPYTHON_EXECUTABLE=/usr/bin/python
</del><ins>+if {[variant_isset java] && ![variant_isset python27] && ![variant_isset python34]} {
+ configure.args-replace -DPYTHON_EXECUTABLE=OFF \
+ -DPYTHON_EXECUTABLE=/usr/bin/python
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant python26 conflicts python27 description {Add Python 2.6 bindings.} {
- depends_lib-append port:python26 \
- port:py26-numpy
</del><ins>+variant python27 conflicts python34 description {Add Python 2.7 bindings.} {
+ depends_lib-append port:python27 \
+ port:py27-numpy
</ins><span class="cx"> patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span><span class="cx"> configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
</span><span class="cx"> -DPYTHON_EXECUTABLE=OFF
</span><span class="cx"> configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
</span><del>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
- -DPYTHON_LIBRARY=${prefix}/lib/libpython2.6.dylib \
- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/Headers \
- -DPYTHON_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages
</del><ins>+ -DPYTHON2_EXECUTABLE=${prefix}/bin/python2.7 \
+ -DPYTHON_LIBRARIES=${prefix}/lib/libpython2.7.dylib \
+ -DPYTHON2_LIBRARIES=${prefix}/lib/libpython2.7.dylib \
+ -DPYTHON2_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
+ -DPYTHON2_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python26 description {Add Python 2.7 bindings.} {
- depends_lib-append port:python27 \
- port:py27-numpy
</del><ins>+variant python34 conflicts python27 description {Add Python 3.4 bindings.} {
+ depends_lib-append port:python34 \
+ port:py34-numpy
</ins><span class="cx"> patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span><span class="cx"> configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
</span><span class="cx"> -DPYTHON_EXECUTABLE=OFF
</span><span class="cx"> configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
</span><del>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
- -DPYTHON_LIBRARY=${prefix}/lib/libpython2.7.dylib \
- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
- -DPYTHON_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</del><ins>+ -DPYTHON3_EXECUTABLE=${prefix}/bin/python3.4 \
+ -DPYTHON3_LIBRARY=${prefix}/lib/libpython3.4.dylib \
+ -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.4/Headers \
+ -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/3.4/lib/python3.4/site-packages
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant tbb description {Use Intel TBB.} {
</span><span class="cx"> depends_lib-append port:tbb
</span><del>- configure.args-delete -DWITH_TBB=OFF
- configure.args-append -DWITH_TBB=ON \
- -DHAVE_TBB=ON \
</del><ins>+ configure.args-replace -DWITH_TBB=OFF \
+ -DWITH_TBB=ON
+ configure.args-append -DHAVE_TBB=ON \
</ins><span class="cx"> -DTBB_INCLUDE_DIRS=${prefix}/include
</span><span class="cx"> lappend opencv_linker_libs "-ltbb" "-ltbbmalloc"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant vtk description {Include VTK support.} {
</span><span class="cx"> depends_lib-append port:vtk
</span><del>- configure.args-delete -DWITH_VTK=OFF
- configure.args-append -DWITH_VTK=ON
</del><ins>+ configure.args-replace -DWITH_VTK=OFF \
+ -DWITH_VTK=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="lines">@@ -253,6 +268,7 @@
</span><span class="cx"> reinplace {/Libs: /s:\.a::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span class="cx"> reinplace {/Libs: /s:\.dylib::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span class="cx"> reinplace {s|Libs: |Libs: -L\${exec_prefix}/lib |g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><ins>+ reinplace {s:-l-framework|-framework::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type sourceforge
</span></span></pre></div>
<a id="trunkdportsgraphicsopencvfilespatchfix_dirname_casediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/opencv/files/patch-fix_dirname_case.diff (137652 => 137653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/files/patch-fix_dirname_case.diff 2015-06-16 09:32:01 UTC (rev 137652)
+++ trunk/dports/graphics/opencv/files/patch-fix_dirname_case.diff 2015-06-16 09:50:44 UTC (rev 137653)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- modules/python/test/test.py.orig 2012-05-13 10:33:44.000000000 +0200
-+++ modules/python/test/test.py 2012-05-13 10:35:24.000000000 +0200
-@@ -1821,7 +1821,7 @@
-
- def local_test_Haar(self):
- import os
-- hcfile = os.environ['OPENCV_ROOT'] + '/share/opencv/haarcascades/haarcascade_frontalface_default.xml'
-+ hcfile = os.environ['OPENCV_ROOT'] + '/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml'
- hc = cv.Load(hcfile)
- img = cv.LoadImage('Stu.jpg', 0)
- faces = cv.HaarDetectObjects(img, hc, cv.CreateMemStorage())
</del></span></pre></div>
<a id="trunkdportsgraphicsopencvfilespatchinstall_namediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/opencv/files/patch-install_name.diff (137652 => 137653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/files/patch-install_name.diff 2015-06-16 09:32:01 UTC (rev 137652)
+++ trunk/dports/graphics/opencv/files/patch-install_name.diff 2015-06-16 09:50:44 UTC (rev 137653)
</span><span class="lines">@@ -1,28 +1,38 @@
</span><del>---- apps/haartraining/CMakeLists.txt.orig 2012-05-11 10:05:02.000000000 +0200
-+++ apps/haartraining/CMakeLists.txt 2012-05-11 10:05:39.000000000 +0200
-@@ -40,7 +40,6 @@
</del><ins>+--- apps/annotation/CMakeLists.txt
++++ apps/annotation/CMakeLists.txt
+@@ -21,7 +21,6 @@ set_target_properties(${the_target} PROPERTIES
</ins><span class="cx"> DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
</span><span class="cx"> ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span class="cx"> RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span class="cx"> - INSTALL_NAME_DIR lib
</span><del>- )
</del><ins>+ OUTPUT_NAME "opencv_annotation")
</ins><span class="cx">
</span><del>- # -----------------------------------------------------------
---- apps/traincascade/CMakeLists.txt.orig 2012-05-11 10:05:13.000000000 +0200
-+++ apps/traincascade/CMakeLists.txt 2012-05-11 10:06:00.000000000 +0200
-@@ -30,7 +30,6 @@
</del><ins>+ if(ENABLE_SOLUTION_FOLDERS)
+--- apps/createsamples/CMakeLists.txt
++++ apps/createsamples/CMakeLists.txt
+@@ -23,7 +23,6 @@ set_target_properties(${the_target} PROPERTIES
</ins><span class="cx"> DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
</span><span class="cx"> ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span class="cx"> RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span class="cx"> - INSTALL_NAME_DIR lib
</span><ins>+ OUTPUT_NAME "opencv_createsamples")
+
+ if(ENABLE_SOLUTION_FOLDERS)
+--- apps/traincascade/CMakeLists.txt
++++ apps/traincascade/CMakeLists.txt
+@@ -23,7 +23,6 @@ set_target_properties(${the_target} PROPERTIES
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
</ins><span class="cx"> OUTPUT_NAME "opencv_traincascade")
</span><del>-
</del><ins>+
</ins><span class="cx"> if(ENABLE_SOLUTION_FOLDERS)
</span><del>---- cmake/OpenCVModule.cmake.orig 2012-06-28 17:55:15.000000000 -0500
-+++ cmake/OpenCVModule.cmake 2012-07-05 15:04:47.000000000 -0500
-@@ -457,7 +457,6 @@
- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
</del><ins>+--- cmake/OpenCVModule.cmake
++++ cmake/OpenCVModule.cmake
+@@ -754,7 +754,6 @@ macro(_ocv_create_module)
</ins><span class="cx"> ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><ins>+ LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</ins><span class="cx"> RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span class="cx"> - INSTALL_NAME_DIR lib
</span><span class="cx"> )
</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 (137652 => 137653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff 2015-06-16 09:32:01 UTC (rev 137652)
+++ trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff 2015-06-16 09:50:44 UTC (rev 137653)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- modules/java/CMakeLists.txt.orig 2013-03-01 19:44:17.000000000 +0400
-+++ modules/java/CMakeLists.txt 2013-04-03 13:50:15.000000000 +0400
</del><ins>+--- 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
</ins><span class="cx"> @@ -1,6 +1,9 @@
</span><span class="cx"> # ----------------------------------------------------------------------------
</span><span class="cx"> # CMake file for java support
</span><span class="lines">@@ -7,6 +7,6 @@
</span><span class="cx"> +
</span><span class="cx"> +ocv_module_disable(java)
</span><span class="cx"> +
</span><del>- if(IOS OR NOT PYTHON_EXECUTABLE OR NOT ANT_EXECUTABLE OR NOT (JNI_FOUND OR (ANDROID AND ANDROID_NATIVE_API_LEVEL GREATER 7)))
- ocv_module_disable(java)
- endif()
</del><ins>+ 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))
+ OR BUILD_opencv_world
+ )
</ins></span></pre></div>
<a id="trunkdportsgraphicsopencvfilespatchmodules_python_CMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff (137652 => 137653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff 2015-06-16 09:32:01 UTC (rev 137652)
+++ trunk/dports/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff 2015-06-16 09:50:44 UTC (rev 137653)
</span><span class="lines">@@ -1,11 +1,12 @@
</span><del>---- modules/python/CMakeLists.txt.orig 2013-04-03 13:48:47.000000000 +0400
-+++ modules/python/CMakeLists.txt 2013-04-03 13:49:02.000000000 +0400
-@@ -2,6 +2,8 @@
</del><ins>+--- modules/python/CMakeLists.txt.orig 2015-04-27 19:27:04.000000000 +0300
++++ modules/python/CMakeLists.txt 2015-04-27 19:26:31.000000000 +0300
+@@ -2,6 +2,9 @@
</ins><span class="cx"> # CMake file for python support
</span><span class="cx"> # ----------------------------------------------------------------------------
</span><span class="cx">
</span><del>-+ocv_module_disable(python)
</del><ins>++ocv_module_disable(python2)
++ocv_module_disable(python3)
</ins><span class="cx"> +
</span><del>- if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
- ocv_module_disable(python)
- endif()
</del><ins>+ if((WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+ OR BUILD_opencv_world
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>