<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/14a1fa8d5e1d4e07a6f2538d1779f5f42714aed3">https://github.com/macports/macports-ports/commit/14a1fa8d5e1d4e07a6f2538d1779f5f42714aed3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 14a1fa8 Squashed commit of the following:
</span>14a1fa8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14a1fa8d5e1d4e07a6f2538d1779f5f42714aed3
</span>Author: René J. V. Bertin <rjvbertin@gmail.com>
AuthorDate: Tue Nov 29 00:56:28 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> Squashed commit of the following:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> commit 264222b8b22875f21d29f43b5b95eaeef6500d41
</span><span style='display:block; white-space:pre;color:#404040;'> Author: R.J.V. Bertin <rjvbertin@gmail.com>
</span><span style='display:block; white-space:pre;color:#404040;'> Date: Thu Nov 24 10:33:21 2016 +0100
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove redundant conflicts keyword
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> commit 74aac3cfd47a79958030ce3d8177cd057b6ba7a5
</span><span style='display:block; white-space:pre;color:#404040;'> Author: R.J.V. Bertin <rjvbertin@gmail.com>
</span><span style='display:block; white-space:pre;color:#404040;'> Date: Wed Nov 23 17:18:33 2016 +0100
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> port:opencv : cleanup and fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The main fix allows building opencv on 10.12 where the QuickTime and
</span><span style='display:block; white-space:pre;color:#404040;'> QTKit SDKs have been made unavailable. This is done by building against
</span><span style='display:block; white-space:pre;color:#404040;'> AVFoundation on 10.9 and newer.
</span><span style='display:block; white-space:pre;color:#404040;'> Confusion between installed Qt versions is avoided by specifying the
</span><span style='display:block; white-space:pre;color:#404040;'> desired version (`-DWITH_QT={4,5}`)
</span><span style='display:block; white-space:pre;color:#404040;'> OpenCV supports building bindings for Python 2 and Python 3; the port
</span><span style='display:block; white-space:pre;color:#404040;'> now allows that. Python2.7 is used for building, unless only Python 3
</span><span style='display:block; white-space:pre;color:#404040;'> bindings are requested.
</span><span style='display:block; white-space:pre;color:#404040;'> Two additional variants expose OpenCV's support for the AVX and AVX2
</span><span style='display:block; white-space:pre;color:#404040;'> instruction sets. I'm not sure if there are still a significant number
</span><span style='display:block; white-space:pre;color:#404040;'> of Macs that have SSE4x but no AVX (nor if SSE4x support gives a
</span><span style='display:block; white-space:pre;color:#404040;'> noticeable performance boost on such systems) so I have coupled SSE4x
</span><span style='display:block; white-space:pre;color:#404040;'> with AVX support.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patch also does some cleanup, moving candidate patches
</span><span style='display:block; white-space:pre;color:#404040;'> that have to be checked out (by the port maintainer!) to a subdirectory.
</span>---
graphics/opencv/Portfile | 107 ++++++++++-----------
.../patch-modules-highgui-src-window_cocoa.mm.diff | 0
.../patch-modules_core_src_parallel.cpp.diff | 0
...patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff | 0
4 files changed, 52 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/Portfile b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 351ec66..b469992 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,22 +57,19 @@ patchfiles-append patch-install_name.diff \
</span> patch-modules_java_CMakeLists.txt.diff \
patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform linux {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pchsupport.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/OpenCVFindOpenEXR.cmake
}
# TODO: check and adapt those patches
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-modules_core_src_parallel.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-modules-highgui-src-window_cocoa.mm.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# candidates/patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# candidates/patch-modules_core_src_parallel.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# candidates/patch-modules-highgui-src-window_cocoa.mm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # not currently used in the cmake build system:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DWITH_GTK_2_X=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DWITH_NVCUVID=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DCMAKE_VERBOSE=ON
</span> configure.args-append \
-DWITH_1394=OFF \
-DWITH_CARBON=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,12 +77,10 @@ configure.args-append \
</span> -DWITH_CUDA=OFF \
-DWITH_CUFFT=OFF \
-DWITH_CUBLAS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_NVCUVID=OFF \
</span> -DWITH_EIGEN=OFF \
-DWITH_FFMPEG=ON \
-DWITH_GSTREAMER=OFF \
-DWITH_GTK=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_GTK_2_X=OFF \
</span> -DWITH_IPP=OFF \
-DWITH_JASPER=ON \
-DWITH_JPEG=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,11 +134,14 @@ configure.args-append \
</span> -DBUILD_TBB=OFF \
\
-DPYTHON_EXECUTABLE=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_opencv_python2=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_opencv_python3=OFF \
</span> -DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DENABLE_PRECOMPILED_HEADERS=ON \
-DCMAKE_VERBOSE=ON \
-DENABLE_SSE3=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
if {${os.major} >= 13} {
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,28 +153,13 @@ platform darwin {
</span> -DZLIB_LIBRARY=${prefix}/lib/libz.dylib \
-DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform linux {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_VA=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DZLIB_LIBRARY=${prefix}/lib/libz.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBZIP2_LIBRARIES=${prefix}/lib/libbz2.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant sse4 description {Enable SSE4* support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SSE41=ON -DENABLE_SSE42=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
set opencv_linker_libs ""
# gcc-4.0 exits with a bus error
compiler.blacklist-append gcc-4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Xcode 3.1.4's and Xcode 3.2.6's gcc-4.2 fails to build opencv-2.4.10 for i386:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# opencv-2.4.10/modules/core/src/system.cpp: In static member function 'static cv::HWFeatures cv::HWFeatures::initialize()':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# opencv-2.4.10/modules/core/src/system.cpp:280: error: can't find a register in class 'BREG' while reloading 'asm'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# opencv-2.4.10/modules/core/src/system.cpp:238: error: 'asm' operand has impossible constraints
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# opencv-2.4.10/modules/core/src/system.cpp:280: error: 'asm' operand has impossible constraints
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Xcode 3.1.4's and Xcode 3.2.6's gcc-4.2 fails to build opencv for i386 from v2.4.10 onwards.
</span> compiler.blacklist-append *gcc-4.2*
# llvm-gcc-4.2 appears to be broken on old XCode (#35368)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,11 +181,16 @@ if {[variant_isset universal]} {
</span> -DENABLE_PRECOMPILED_HEADERS=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant avx description {Enable AVX (and SSE4*) support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant avx conflicts avx2 description {Enable AVX (and SSE4*) support} {
</span> configure.args-append -DENABLE_AVX=ON \
-DENABLE_SSE41=ON -DENABLE_SSE42=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant avx2 conflicts avx description {Enable AVX, AVX2 (and SSE4*) support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_AVX=ON -DENABLE_AVX2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SSE41=ON -DENABLE_SSE42=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant eigen description {Enable eigen support.} {
depends_lib-append port:eigen3
configure.args-replace -DWITH_EIGEN=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,14 +248,17 @@ variant java description {Add Java bindings.} {
</span> if {[variant_isset java] && ![variant_isset python27] && ![variant_isset python34]} {
configure.args-replace -DPYTHON_EXECUTABLE=OFF \
-DPYTHON_EXECUTABLE=/usr/bin/python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DBUILD_opencv_python2=OFF
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 description {Add Python 2.7 bindings.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description {Add Python 2.7 bindings.} {
</span> depends_lib-append port:python27 \
port:py27-numpy
patchfiles-delete patch-modules_python_CMakeLists.txt.diff
configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_opencv_python2=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPYTHON_EXECUTABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span> configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
-DPYTHON2_EXECUTABLE=${prefix}/bin/python2.7 \
-DPYTHON_LIBRARIES=${prefix}/lib/libpython2.7.dylib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,30 +267,36 @@ variant python27 conflicts python34 python35 description {Add Python 2.7 binding
</span> -DPYTHON2_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 description {Add Python 3.4 bindings.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py34-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_EXECUTABLE=${prefix}/bin/python3.4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_LIBRARY=${prefix}/lib/libpython3.4.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.4/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/3.4/lib/python3.4/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 description {Add Python 3.5 bindings.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python35 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_EXECUTABLE=${prefix}/bin/python3.5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_LIBRARY=${prefix}/lib/libpython3.5.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.5/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/3.5/lib/python3.5/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythonversions {3.4 3.5}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pdv ${pythonversions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pv [join [lrange [split ${pdv} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflist ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach v ${pythonversions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${v} ne ${pdv}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vv [join [lrange [split ${v} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflist "${conflist} python${vv}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${pv} conflicts ${conflist} description "Add bindings for Python ${pdv}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pv} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pv}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_PYTHON_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_opencv_python3=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${pdv}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_PYTHON_EXAMPLES=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON3_EXECUTABLE=${prefix}/bin/python${pdv} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON3_LIBRARY=${prefix}/lib/libpython${pdv}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${pdv}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${pdv}/lib/python${pdv}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant tbb description {Use Intel TBB.} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-modules-highgui-src-window_cocoa.mm.diff b/graphics/opencv/files/candidates/patch-modules-highgui-src-window_cocoa.mm.diff
</span>similarity index 100%
rename from graphics/opencv/files/patch-modules-highgui-src-window_cocoa.mm.diff
rename to graphics/opencv/files/candidates/patch-modules-highgui-src-window_cocoa.mm.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-modules_core_src_parallel.cpp.diff b/graphics/opencv/files/candidates/patch-modules_core_src_parallel.cpp.diff
</span>similarity index 100%
rename from graphics/opencv/files/patch-modules_core_src_parallel.cpp.diff
rename to graphics/opencv/files/candidates/patch-modules_core_src_parallel.cpp.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff b/graphics/opencv/files/candidates/patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
</span>similarity index 100%
rename from graphics/opencv/files/patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
rename to graphics/opencv/files/candidates/patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
</pre><pre style='margin:0'>
</pre>