[137653] trunk/dports/graphics/opencv
stromnov at macports.org
stromnov at macports.org
Tue Jun 16 02:50:44 PDT 2015
Revision: 137653
https://trac.macports.org/changeset/137653
Author: stromnov at macports.org
Date: 2015-06-16 02:50:44 -0700 (Tue, 16 Jun 2015)
Log Message:
-----------
opencv: update to version 3.0.0
Modified Paths:
--------------
trunk/dports/graphics/opencv/Portfile
trunk/dports/graphics/opencv/files/patch-install_name.diff
trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff
trunk/dports/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/graphics/opencv/files/patch-fix_dirname_case.diff
Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
PortGroup compiler_blacklist_versions 1.0
name opencv
-version 2.4.11
+version 3.0.0
revision 0
categories graphics science
platforms darwin
@@ -29,8 +29,8 @@
use_zip yes
-checksums rmd160 793391b05b571859005b98612cb176c02352a94f \
- sha256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea
+checksums rmd160 7b4dff26502e71e6570c2452c35fd03a1982bc7e \
+ sha256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001
depends_build-append \
port:pkgconfig
@@ -45,61 +45,75 @@
port:openexr \
path:lib/libavcodec.dylib:ffmpeg
-patchfiles patch-fix_dirname_case.diff \
- patch-install_name.diff \
- patch-modules_java_CMakeLists.txt.diff \
+patchfiles-append patch-install_name.diff \
patch-modules_python_CMakeLists.txt.diff \
- patch-modules_core_src_parallel.cpp.diff \
- patch-modules-highgui-src-window_cocoa.mm.diff
+ patch-modules_java_CMakeLists.txt.diff
+# TODO: check and adapt those patches
+# patch-modules_core_src_parallel.cpp.diff \
+# patch-modules-highgui-src-window_cocoa.mm.diff
+
cmake.out_of_source yes
configure.args-append \
-DWITH_1394=OFF \
-DWITH_CARBON=OFF \
- -DWITH_CUBLAS=OFF \
+ -DWITH_VTK=OFF \
-DWITH_CUDA=OFF \
- -DWITH_VTK=OFF \
-DWITH_CUFFT=OFF \
-DWITH_CUBLAS=OFF \
+ -DWITH_NVCUVID=OFF \
-DWITH_EIGEN=OFF \
-DWITH_FFMPEG=ON \
-DWITH_GSTREAMER=OFF \
-DWITH_GTK=OFF \
- -DWITH_IMAGEIO=ON \
+ -DWITH_GTK_2_X=OFF \
-DWITH_IPP=OFF \
-DWITH_JASPER=ON \
-DWITH_JPEG=ON \
+ -DWITH_WEBP=OFF \
-DWITH_OPENEXR=ON \
-DWITH_OPENGL=ON \
-DWITH_OPENNI=OFF \
+ -DWITH_OPENNI2=OFF \
-DWITH_PNG=ON \
-DWITH_PVAPI=OFF \
-DWITH_GIGEAPI=OFF \
-DWITH_QT=OFF \
-DWITH_QUICKTIME=OFF \
-DWITH_TBB=OFF \
+ -DWITH_OPENMP=OFF \
-DWITH_CSTRIPES=OFF \
+ -DWITH_PTHREADS_PF=OFF \
-DWITH_TIFF=ON \
-DWITH_UNICAP=OFF \
-DWITH_V4L=OFF \
- -DWITH_VIDEOINPUT=OFF \
+ -DWITH_LIBV4L=OFF \
-DWITH_XIMEA=OFF \
-DWITH_XINE=OFF \
+ -DWITH_CLP=OFF \
-DWITH_OPENCL=OFF \
+ -DWITH_OPENCL_SVM=OFF \
-DWITH_OPENCLAMDFFT=OFF \
-DWITH_OPENCLAMDBLAS=OFF \
+ -DWITH_INTELPERC=OFF \
+ -DWITH_IPP_A=OFF \
+ -DWITH_GDAL=OFF \
-DBUILD_SHARED_LIBS=ON \
+ -DBUILD_opencv_apps=ON \
-DBUILD_DOCS=OFF \
-DBUILD_EXAMPLES=OFF \
+ -DBUILD_PACKAGE=OFF \
-DBUILD_PERF_TESTS=OFF \
-DBUILD_TESTS=OFF \
+ -DBUILD_WITH_DYNAMIC_IPP=OFF \
-DBUILD_ZLIB=OFF \
-DBUILD_TIFF=OFF \
-DBUILD_JASPER=OFF \
-DBUILD_JPEG=OFF \
-DBUILD_PNG=OFF \
-DBUILD_OPENEXR=OFF \
+ -DBUILD_TBB=OFF \
-DPYTHON_EXECUTABLE=OFF \
-DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
@@ -135,8 +149,8 @@
# PCH broken when universal
if {[variant_isset universal]} {
- configure.args-delete -DENABLE_PRECOMPILED_HEADERS=ON
- configure.args-append -DENABLE_PRECOMPILED_HEADERS=OFF
+ configure.args-replace -DENABLE_PRECOMPILED_HEADERS=ON \
+ -DENABLE_PRECOMPILED_HEADERS=OFF
}
# Video Decode Acceleration Framework is not available
@@ -146,9 +160,9 @@
variant eigen description {Enable eigen support.} {
depends_lib-append port:eigen3
- configure.args-delete -DWITH_EIGEN=OFF
- configure.args-append -DWITH_EIGEN=ON \
- -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
+ configure.args-replace -DWITH_EIGEN=OFF \
+ -DWITH_EIGEN=ON
+ configure.args-append -DEIGEN_INCLUDE_PATH=${prefix}/include/eigen3
}
variant opencl description {Enable OpenCL support.} {
@@ -158,15 +172,15 @@
return -code error "incompatible OS X version"
}
}
- configure.args-delete -DWITH_OPENCL=OFF
- configure.args-append -DWITH_OPENCL=ON
+ configure.args-replace -DWITH_OPENCL=OFF \
+ -DWITH_OPENCL=ON
}
variant openni description {Enable OpenNI support.} {
depends_lib-append port:openni
patchfiles-append patch-cmake_OpenCVFindOpenNI.cmake.diff
- configure.args-delete -DWITH_OPENNI=OFF
- configure.args-append -DWITH_OPENNI=ON
+ configure.args-replace -DWITH_OPENNI=OFF \
+ -DWITH_OPENNI=ON
post-patch {
reinplace "s,@@PREFIX@@,${prefix},g" ${worksrcpath}/cmake/OpenCVFindOpenNI.cmake
@@ -175,21 +189,21 @@
variant dc1394 description {Use libdc1394 for FireWire camera. Breaks compatibility with Apple iSight FireWire camera.} {
depends_lib-append port:libdc1394
- configure.args-delete -DWITH_1394=OFF
- configure.args-append -DWITH_1394=ON \
- -DHAVE_DC1394_2=ON
+ configure.args-replace -DWITH_1394=OFF \
+ -DWITH_1394=ON
+ configure.args-append -DHAVE_DC1394_2=ON
}
variant qt4 conflicts qt5 description {Build with Qt4 Backend support.} {
PortGroup qt4 1.0
- configure.args-delete -DWITH_QT=OFF
- configure.args-append -DWITH_QT=ON
+ configure.args-replace -DWITH_QT=OFF \
+ -DWITH_QT=ON
}
variant qt5 conflicts qt4 description {Build with Qt5 Backend support.} {
PortGroup qt5 1.0
- configure.args-delete -DWITH_QT=OFF
- configure.args-append -DWITH_QT=ON
+ configure.args-replace -DWITH_QT=OFF \
+ -DWITH_QT=ON
}
variant java description {Add Java bindings.} {
@@ -197,50 +211,51 @@
patchfiles-delete patch-modules_java_CMakeLists.txt.diff
}
-if {[variant_isset java] && ![variant_isset python26] && ![variant_isset python27]} {
- configure.args-delete -DPYTHON_EXECUTABLE=OFF
- configure.args-append -DPYTHON_EXECUTABLE=/usr/bin/python
+if {[variant_isset java] && ![variant_isset python27] && ![variant_isset python34]} {
+ configure.args-replace -DPYTHON_EXECUTABLE=OFF \
+ -DPYTHON_EXECUTABLE=/usr/bin/python
}
-variant python26 conflicts python27 description {Add Python 2.6 bindings.} {
- depends_lib-append port:python26 \
- port:py26-numpy
+variant python27 conflicts python34 description {Add Python 2.7 bindings.} {
+ depends_lib-append port:python27 \
+ port:py27-numpy
patchfiles-delete patch-modules_python_CMakeLists.txt.diff
configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
-DPYTHON_EXECUTABLE=OFF
configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
- -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
+ -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
}
-variant python27 conflicts python26 description {Add Python 2.7 bindings.} {
- depends_lib-append port:python27 \
- port:py27-numpy
+variant python34 conflicts python27 description {Add Python 3.4 bindings.} {
+ depends_lib-append port:python34 \
+ port:py34-numpy
patchfiles-delete patch-modules_python_CMakeLists.txt.diff
configure.args-delete -DINSTALL_PYTHON_EXAMPLES=OFF \
-DPYTHON_EXECUTABLE=OFF
configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
- -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
+ -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
}
variant tbb description {Use Intel TBB.} {
depends_lib-append port:tbb
- configure.args-delete -DWITH_TBB=OFF
- configure.args-append -DWITH_TBB=ON \
- -DHAVE_TBB=ON \
+ configure.args-replace -DWITH_TBB=OFF \
+ -DWITH_TBB=ON
+ configure.args-append -DHAVE_TBB=ON \
-DTBB_INCLUDE_DIRS=${prefix}/include
lappend opencv_linker_libs "-ltbb" "-ltbbmalloc"
}
variant vtk description {Include VTK support.} {
depends_lib-append port:vtk
- configure.args-delete -DWITH_VTK=OFF
- configure.args-append -DWITH_VTK=ON
+ configure.args-replace -DWITH_VTK=OFF \
+ -DWITH_VTK=ON
}
pre-configure {
@@ -253,6 +268,7 @@
reinplace {/Libs: /s:\.a::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
reinplace {/Libs: /s:\.dylib::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
reinplace {s|Libs: |Libs: -L\${exec_prefix}/lib |g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
+ reinplace {s:-l-framework|-framework::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
}
livecheck.type sourceforge
Deleted: trunk/dports/graphics/opencv/files/patch-fix_dirname_case.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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())
Modified: trunk/dports/graphics/opencv/files/patch-install_name.diff
===================================================================
--- 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)
@@ -1,28 +1,38 @@
---- 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 @@
+--- apps/annotation/CMakeLists.txt
++++ apps/annotation/CMakeLists.txt
+@@ -21,7 +21,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
- )
+ OUTPUT_NAME "opencv_annotation")
- # -----------------------------------------------------------
---- 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 @@
+ if(ENABLE_SOLUTION_FOLDERS)
+--- apps/createsamples/CMakeLists.txt
++++ apps/createsamples/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
+ 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
OUTPUT_NAME "opencv_traincascade")
-
+
if(ENABLE_SOLUTION_FOLDERS)
---- 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}"
+--- cmake/OpenCVModule.cmake
++++ cmake/OpenCVModule.cmake
+@@ -754,7 +754,6 @@ macro(_ocv_create_module)
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
- INSTALL_NAME_DIR lib
)
Modified: trunk/dports/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- 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
+--- 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 @@
# ----------------------------------------------------------------------------
# CMake file for java support
@@ -7,6 +7,6 @@
+
+ocv_module_disable(java)
+
- 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()
+ 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
+ )
Modified: trunk/dports/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff
===================================================================
--- 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)
@@ -1,11 +1,12 @@
---- 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 @@
+--- 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 @@
# CMake file for python support
# ----------------------------------------------------------------------------
-+ocv_module_disable(python)
++ocv_module_disable(python2)
++ocv_module_disable(python3)
+
- if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
- ocv_module_disable(python)
- endif()
+ if((WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+ OR BUILD_opencv_world
+ )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150616/12f0fb27/attachment-0001.html>
More information about the macports-changes
mailing list