<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63e2fa243f81911c233249374562c099e3993b54">https://github.com/macports/macports-ports/commit/63e2fa243f81911c233249374562c099e3993b54</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 63e2fa2 opencv: update version 3.3.1->3.4.1
</span>63e2fa2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63e2fa243f81911c233249374562c099e3993b54
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 21 12:01:48 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> opencv: update version 3.3.1->3.4.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53543
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53562
</span>---
graphics/opencv/Portfile | 153 ++++++++++++++++++----
graphics/opencv/files/patch-32bit_accelerate.diff | 20 +--
graphics/opencv/files/patch-dylib_suffix.diff | 16 +--
3 files changed, 146 insertions(+), 43 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 be31831..c470149 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;'>@@ -3,10 +3,11 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name opencv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +33,13 @@ distfiles ${distname}.zip:opencv
</span> use_zip yes
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2ec36bda0facee5546eba7edf98c17949373d9b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d9f6de36b3d43e0ec5ce7dcfe752a7529f1c4daa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24bda432eaace9e992322dcc3d30144cefa5314c2424d4aa02e5fe3fa9dd17bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 90982898 \
</span> ${version}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 79a231b9a428732e8405292fe1099675c89af912 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4140441557a2d5ab0c4bb8cd891e00c4dd27618f8d310d344ee470dc7790fc48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6581d0d190bdcf43de542e8f4c2a263ec1e741c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 77c86ff2c422744193eae27f7c7b6851b50e3407fbbf3118486f37262b06f5a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 58319978
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +73,7 @@ post-patch {
</span> # candidates/patch-modules_core_src_parallel.cpp.diff
# candidates/patch-modules-highgui-src-window_cocoa.mm.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# # not currently used in the cmake build system:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# not currently used in the cmake build system:
</span> # -DWITH_GTK_2_X=OFF
# -DWITH_NVCUVID=OFF
# -DCMAKE_VERBOSE=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +117,7 @@ configure.args-append \
</span> -DWITH_OPENCLAMDFFT=OFF \
-DWITH_OPENCLAMDBLAS=OFF \
-DWITH_INTELPERC=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MATLAB=OFF \
</span> -DWITH_IPP_A=OFF \
-DWITH_VA=OFF \
-DWITH_VA_INTEL=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,6 +137,7 @@ configure.args-append \
</span> -DBUILD_TIFF=OFF \
-DBUILD_JASPER=OFF \
-DBUILD_JPEG=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_WEBP=OFF \
</span> -DBUILD_PNG=OFF \
-DBUILD_OPENEXR=OFF \
-DBUILD_TBB=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,7 +150,8 @@ configure.args-append \
</span> -DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DENABLE_PRECOMPILED_HEADERS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SSSE3=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CXX11=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
configure.args-append \
-DZLIB_LIBRARY=${prefix}/lib/libz.dylib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,6 +165,14 @@ platform darwin {
</span> -DLAPACK_CBLAS_H=Accelerate/Accelerate.h \
-DLAPACK_LAPACKE_H=Accelerate/Accelerate.h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # AVFoundation was introduced in 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/documentation/avfoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/53562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_AVFOUNDATION=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${build_arch} eq "i386" || ${build_arch} eq "ppc" || [variant_isset universal] } {
#The Accelerate ABI requires 32-bit signed integers.
#In clapack.h, __CLPK_integer is a typedef for either
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,6 +183,12 @@ platform darwin {
</span> # on 32-bit systems.
patchfiles-append patch-32bit_accelerate.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no thread-local storage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/53543
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -DGOOGLE_PROTOBUF_NO_THREADLOCAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if { !${configure.ccache} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,18 +198,6 @@ if { !${configure.ccache} } {
</span>
set opencv_linker_libs ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc-4.0 exits with a bus error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append gcc-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 for i386 from v2.4.10 onwards.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc-4.2*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# llvm-gcc-4.2 appears to be broken on old XCode (#35368)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {llvm-gcc-4.2 < 2336.11}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Older clang also don't work (#36956)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 318}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # TODO: Actually fix this
if {[string match "*clang*" ${configure.compiler}]} {
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +284,6 @@ if {[variant_isset java] && ![variant_isset python27] && ![variant_isset python3
</span> variant python27 description {Add Python 2.7 bindings.} {
depends_lib-append port:python27 \
port:py27-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span> configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
-DBUILD_opencv_python2=OFF
configure.args-replace -DPYTHON_EXECUTABLE=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,7 +308,6 @@ foreach pdv ${pythonversions} {
</span> }
}
variant python${pv} conflicts {*}${conflist} description "Add bindings for Python ${pdv}" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-modules_python_CMakeLists.txt.diff
</span> configure.args-delete \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DBUILD_opencv_python3=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,12 +353,110 @@ variant gdal description {Include GDAL support.} {
</span>
variant contrib description {Build OpenCV with extra modules.} {
distfiles-append ${version}.zip:opencv_contrib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:protobuf-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PROTOBUF=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:${prefix}/lib/libprotobuf.dylib:protobuf-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
# less than ideal way for patchfiles to be applied to contrib directory
ln -s ${workpath}/opencv_contrib-${version} ${worksrcpath}/opencv_contrib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${version}.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dnn_modern:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://github.com/tiny-dnn/tiny-dnn/archive/:tiny-dnn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append v1.0.0a3.tar.gz:tiny-dnn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append v1.0.0a3.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1d44a0f0c3b0a6f31a333afdfb246526c42336ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12885646
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENCV_TINY_DNN_URL=file://${distpath}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xfeatures2d/boostdesc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26:boostdesc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append boostdesc_bgm.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_bgm_bi.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_bgm_hd.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_binboost_064.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_binboost_128.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_binboost_256.i:boostdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_lbgm.i:boostdesc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append boostdesc_bgm.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a090147b1ff8cdb23cbb3898cb5cd9cdb181f000 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c441a027f15b9b8ff6c006b0775cd86781169ebd5b6257a94bdce668010d5df5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14852 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_bgm_bi.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a4f858f29a638286065aba9a7cbddf25323b35b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d54b2934f0de963abbce985da303254ee78eebd05eb2af517105f9b0e670566 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14864 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_bgm_hd.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 92cadac9bd2c73ffa014fb552480ee33bf252568 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4b068631287f9914c3aa5bbdab76368b01493cea494ab47f7a70d2fa4f1c3e1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7832 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_binboost_064.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6567930c5f8839bb8c877201ffed07b91edbdec3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 090c9cc50663df3a91f2d7c704fa664493c96c39749b4cee9ebc29a20eb680d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 138093 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_binboost_128.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5c9f9171ecb5100ab7390119a02d7dd072dd35de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f3622c1f3c0a14b1f1b7b955c518e97f7ccd0e9796e1dd9e7a975aad9bb2a22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 275322 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_binboost_256.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 27a39257b04cad5143f369fccbea5dd495c219c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a1c778059332b4904c9ce30ed888e9dd2e44621579362e6deb20ef4f4b0cf819 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 549754 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boostdesc_lbgm.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 35efe18cb9449a41af2166255a23e29822aae4e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 42f6091199242fb6d96aec2f25644cd6f5e5f2fdddd1720f3422282e88cf3cd8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 426280
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENCV_BOOSTDESC_URL=file://${distpath}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #xfeatures2d/vggdesc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:vggdesc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append vgg_generated_48.i:vggdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vgg_generated_64.i:vggdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vgg_generated_80.i:vggdesc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vgg_generated_120.i:vggdesc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append vgg_generated_48.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fdb2d976ec287c4989e9d3b6f95104a0bef9c9a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 71274a67ab0896865e27de830eda0065e387d75fe071dab4a887e2430ccb8a35 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 773330 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vgg_generated_64.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1e4cbba9038c165d53d5e9c9bdd299cde54dbd3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2746c272af82b9a839a69de151c262be55d9ef8464b268001c33f99f9f5cebbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 915012 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vgg_generated_80.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d950552c95026ae80c6fe5b9e30037104081cca2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 08fbc8cb1686b6c45032a08c98f3857ead4755116410e16c68713f4dea4cbf5c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1012932 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vgg_generated_120.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a8e2a8e88102871c4e7d75c1f8a474a006e90aaa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f05e7eb7183ecbc788bfc26cea9db7dad8585178175411b93e444acdc8fb2048 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1257733
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENCV_VGGDESC_URL=file://${distpath}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #face:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12:face
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append face_landmark_model.dat:face
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append face_landmark_model.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3a4e4a80f2c74a6af2b36b4d74e3c6d59c347ce0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eeab592db2861a6c94d592a48456cf59945d31483ce94a6bc4d3a4e318049ba3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 72368157
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENCV_FACE_ALIGNMENT_URL=file://${distpath}/
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,7 +475,6 @@ post-destroot {
</span> # http://trac.macports.org/ticket/42702
if {[variant_isset qt4] || [variant_isset qt5]} {
reinplace "s|-L//System/Library/Frameworks ||g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lAGL.framework|-framework AGL|g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span> reinplace "s|-lOpenGL.framework|-framework OpenGL|g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-32bit_accelerate.diff b/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c4bfb6..dd58c47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- modules/core/src/hal_internal.cpp.orig 2017-10-23 08:41:12.000000000 -0700
+++ modules/core/src/hal_internal.cpp 2017-12-16 09:06:29.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,9 +108,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,9 +109,9 @@
</span> if(n == 1 && b_step == sizeof(fptype))
{
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> }
else
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,9 +120,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,9 +121,9 @@
</span> transpose(b, ldb, tmpB, m, m, n);
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span>
transpose(tmpB, m, b, ldb, n, m);
delete[] tmpB;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,9 +131,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,9 +132,9 @@
</span> else
{
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> }
if(*info == 0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,9 +161,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,9 +162,9 @@
</span> if(n == 1 && b_step == sizeof(fptype))
{
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@
</span> }
else
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,9 +172,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,9 +173,9 @@
</span> transpose(b, ldb, tmpB, m, m, n);
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@
</span>
transpose(tmpB, m, b, ldb, n, m);
delete[] tmpB;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,9 +183,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,9 +184,9 @@
</span> else
{
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@
</span> }
if(lapackStatus == 0) *info = true;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,17 +225,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,17 +226,17 @@
</span> }
if(typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,7 @@
</span>
if(!(flags & CV_HAL_SVD_NO_UV))
transpose_square_inplace(vt, ldv, n);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,18 +286,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,18 +287,18 @@
</span> if (k == 1 && b_step == sizeof(fptype))
{
if (typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +117,7 @@
</span> }
else
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -307,18 +307,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -308,18 +308,18 @@
</span> transpose(b, ldb, tmpB, m, m, k);
if (typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@
</span>
transpose(tmpB, m, b, ldb, k, m);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,18 +326,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,18 +327,18 @@
</span> else
{
if (typeid(fptype) == typeid(float))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-dylib_suffix.diff b/graphics/opencv/files/patch-dylib_suffix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f9aa3e..984e76f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-dylib_suffix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-dylib_suffix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/OpenCVUtils.cmake.orig 2017-12-17 09:16:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/OpenCVUtils.cmake 2017-10-23 08:41:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1025,7 +1025,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/OpenCVUtils.cmake.orig 2018-02-23 01:38:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/OpenCVUtils.cmake 2018-04-20 06:20:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1244,7 +1244,7 @@
</span> macro(ocv_get_libname var_name)
get_filename_component(__libname "${ARGN}" NAME)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- string(REGEX REPLACE "^lib(.+).(a|so)(.[.0-9]+)?$" "\\1" __libname "${__libname}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(REGEX REPLACE "^lib(.+).(a|so|dylib)(.[.0-9]+)?$" "\\1" __libname "${__libname}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libopencv_core.so.3.3 -> opencv_core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string(REGEX REPLACE "^lib(.+)\\.(a|so|dll)(\\.[.0-9]+)?$" "\\1" __libname "${__libname}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string(REGEX REPLACE "^lib(.+)\\.(a|so|dll|dylib)(\\.[.0-9]+)?$" "\\1" __libname "${__libname}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacOSX: libopencv_core.3.3.1.dylib -> opencv_core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REGEX REPLACE "^lib(.+[^.0-9])\\.([.0-9]+\\.)?dylib$" "\\1" __libname "${__libname}")
</span> set(${var_name} "${__libname}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>