<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc20d214240c56fc409d2332b9f0a00aa149f1bc">https://github.com/macports/macports-ports/commit/bc20d214240c56fc409d2332b9f0a00aa149f1bc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bc20d214240c56fc409d2332b9f0a00aa149f1bc
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Jan 2 20:19:51 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> opencv4: Update to version 4.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 4.2.0
</span><span style='display:block; white-space:pre;color:#404040;'> * Add opencv_contrib variant
</span><span style='display:block; white-space:pre;color:#404040;'> * Minor Portfile improvements
</span>---
graphics/opencv4/Portfile | 100 ++++++++++++++++++++++++++++++----------------
1 file changed, 65 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fae388..dc79162 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,10 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup opencv opencv 4.2.0
</span> name opencv4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.1
</span> revision 0
categories graphics science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,27 +15,53 @@ license BSD
</span> maintainers {stromnov @stromnov} openmaintainer
description Open Source Computer Vision Library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description OpenCV (Open Source Computer Vision Library) is an\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open source computer vision and machine learning\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ software library. OpenCV was built to provide a\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ common infrastructure for computer vision\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ applications and to accelerate the use of machine\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perception in the commercial products. Being a\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BSD-licensed product, OpenCV makes it easy for\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ businesses to utilize and modify the code.
</span>
homepage https://opencv.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://github.com/opencv/opencv/archive/:opencv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distname}.tar.gz:opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts opencv
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0e23d239058c9a08bd4aa9c67977951bd4bc93b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5de5d96bdfb9dad6e6061d70f47a0a91cee96bb35afb9afb9ecb3d43e243d217 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 88427411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.master_sites}:${github.project}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles [lindex ${distfiles} 0]:${github.project}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 81a44c106251695e65c6c9390568040569964883 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 865a1fa5b4339ec3a70ec75dbdc013e8801a891685c5518342e95e045f8bbd08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 87807189
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# modify from _resources/port1.0/group/github-1.0.tcl to avoid file tag issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc move_gh_repo {repo_dir_patt new_name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global distfiles workpath worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(![file exists ${worksrcpath}] || ![file exists ${workpath}/${new_name}]) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [llength ${distfiles}] > 0 && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [llength [glob -nocomplain ${workpath}/*]] > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists [glob -nocomplain ${workpath}/${repo_dir_patt}]] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file isdirectory [glob -nocomplain ${workpath}/${repo_dir_patt}]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move [glob ${workpath}/${repo_dir_patt}] ${workpath}/${new_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tarball is not "${repo_dir_patt}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\ngithub PortGroup: Error: \${worksrcpath} does not exist after extracting distfiles. This might indicate that the author or project is different than set in the Portfile due to a rename at GitHub. Please examine the extracted directory in ${workpath} and try to correct the Portfile by either changing the author or project or adding the worksrcdir option with the correct directory name.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unexpected github tarball extract."
</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;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only ${distname}.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move_gh_repo ${github.author}-${github.project}-* ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir opencv-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
compiler.blacklist-append *gcc* {clang < 900} {macports-clang-3.[0-9]} {macports-clang-[4-6].0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback-append macports-clang-8.0 macports-clang-7.0
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,26 +216,30 @@ variant nonfree description {Include nonfree algorithms} {
</span> -DOPENCV_ENABLE_NONFREE:BOOL=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant contrib description {Build OpenCV with extra modules (untested)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# master_sites-append https://github.com/opencv/opencv_contrib/archive/:opencv_contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# distfiles-append ${distname}.zip:opencv_contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# checksums-append ${distname}.zip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# rmd160 a0dac9a5fc1c95d056a7523a6f37b8d1f600dd2b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sha256 b4013495ac6c4dd05dcad1c90b6c731b488a1d775835175327f3c20884269715 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# size 61741612
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_extract-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:unzip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "${prefix}/bin/unzip -o '${distpath}/${distname}.zip' -d '${worksrcpath}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # less than ideal way for patchfiles to be applied to contrib directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ln -s ${workpath}/opencv_contrib-${version} ${worksrcpath}/opencv_contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant opencv_contrib description {Build OpenCV with extra modules (untested)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/${github.author}/${github.project}_contrib/tarball/${version}:${github.project}_contrib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${github.project}_contrib-${version}${extract.suffix}:${github.project}_contrib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${github.project}_contrib-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1959aad320fe27816a020bfafb9cd0903064be8d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e3d6e5f21de1ca47e698c2b7053825f753fb03235924eacf08d611714351e16c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60486260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move_gh_repo ${github.author}-${github.project}-* ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move_gh_repo ${github.author}-${github.project}_contrib-* ${github.project}_contrib-${version}
</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;'>+ pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/${github.project}_contrib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/${github.project}_contrib-${version} ${worksrcpath}/${github.project}_contrib
</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;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENCV_EXTRA_MODULES_PATH=${worksrcpath}/${github.project}_contrib/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type regex
livecheck.url https://opencv.org/releases.html
</pre><pre style='margin:0'>
</pre>