[143876] trunk/dports/graphics/opencv
stromnov at macports.org
stromnov at macports.org
Thu Dec 24 03:18:42 PST 2015
Revision: 143876
https://trac.macports.org/changeset/143876
Author: stromnov at macports.org
Date: 2015-12-24 03:18:42 -0800 (Thu, 24 Dec 2015)
Log Message:
-----------
opencv: update to version 3.1.0
Modified Paths:
--------------
trunk/dports/graphics/opencv/Portfile
trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff
Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- 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)
@@ -6,8 +6,8 @@
PortGroup compiler_blacklist_versions 1.0
name opencv
-version 3.0.0
-revision 1
+version 3.1.0
+revision 0
categories graphics science
platforms darwin
license BSD
@@ -33,11 +33,11 @@
use_zip yes
checksums ${distname}${extract.suffix} \
- rmd160 7b4dff26502e71e6570c2452c35fd03a1982bc7e \
- sha256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 \
+ rmd160 d7a811c67cfb16243470822150760252d5770165 \
+ sha256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 \
${version}.zip \
- rmd160 b257895ab529db2354f17c87b9f02d53625bb5e2 \
- sha256 77b28692b9e477a8554dd5b2180211dd86b6fd69d98e6896b6a7e1753e5f7e8f
+ rmd160 91266cae464ab0f9c00f0f764ba9025a6765d83a \
+ sha256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4
depends_build-append \
port:pkgconfig
@@ -48,17 +48,18 @@
port:jpeg \
port:jasper \
port:tiff \
+ port:webp \
port:ilmbase \
port:openexr \
path:lib/libavcodec.dylib:ffmpeg
patchfiles-append patch-install_name.diff \
patch-modules_python_CMakeLists.txt.diff \
- patch-modules_java_CMakeLists.txt.diff \
- patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
+ patch-modules_java_CMakeLists.txt.diff
# TODO: check and adapt those patches
-# patch-modules_core_src_parallel.cpp.diff \
+# patch-modules_imgcodecs_src_grfmt_tiff.cpp.diff
+# patch-modules_core_src_parallel.cpp.diff
# patch-modules-highgui-src-window_cocoa.mm.diff
cmake.out_of_source yes
@@ -79,7 +80,7 @@
-DWITH_IPP=OFF \
-DWITH_JASPER=ON \
-DWITH_JPEG=ON \
- -DWITH_WEBP=OFF \
+ -DWITH_WEBP=ON \
-DWITH_OPENEXR=ON \
-DWITH_OPENGL=ON \
-DWITH_OPENNI=OFF \
@@ -106,7 +107,11 @@
-DWITH_OPENCLAMDBLAS=OFF \
-DWITH_INTELPERC=OFF \
-DWITH_IPP_A=OFF \
+ -DWITH_VA=OFF \
+ -DWITH_VA_INTEL=OFF \
-DWITH_GDAL=OFF \
+ -DWITH_GPHOTO2=OFF \
+ \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_opencv_apps=ON \
-DBUILD_DOCS=OFF \
@@ -115,6 +120,7 @@
-DBUILD_PERF_TESTS=OFF \
-DBUILD_TESTS=OFF \
-DBUILD_WITH_DYNAMIC_IPP=OFF \
+ \
-DBUILD_ZLIB=OFF \
-DBUILD_TIFF=OFF \
-DBUILD_JASPER=OFF \
@@ -122,6 +128,7 @@
-DBUILD_PNG=OFF \
-DBUILD_OPENEXR=OFF \
-DBUILD_TBB=OFF \
+ \
-DPYTHON_EXECUTABLE=OFF \
-DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
@@ -168,7 +175,7 @@
configure.args-append -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
}
-variant opencl description {Enable OpenCL support.} {
+variant opencl description {Enable OpenCL support (broken).} {
pre-configure {
if {${os.platform} eq "darwin" && ${os.major} < 11} {
ui_error "The OpenCL variant only works with OS X 10.7 Lion or later."
@@ -274,6 +281,12 @@
-DWITH_VTK=ON
}
+variant gdal description {Include GDAL support.} {
+ depends_lib-append port:gdal
+ configure.args-replace -DWITH_GDAL=OFF \
+ -DWITH_GDAL=ON
+}
+
variant contrib description {Build OpenCV with extra modules.} {
distfiles-append ${version}.zip:opencv_contrib
configure.args-append -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules
Modified: trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff
===================================================================
--- 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)
@@ -1,12 +1,11 @@
---- 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 @@
+--- 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 @@
# ----------------------------------------------------------------------------
# CMake file for java support
# ----------------------------------------------------------------------------
-+
+ocv_module_disable(java)
+
- 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))
+ 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))
OR BUILD_opencv_world
- )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151224/c8ffe54e/attachment.html>
More information about the macports-changes
mailing list