[70430] trunk/dports/graphics/opencv
raphael at macports.org
raphael at macports.org
Mon Aug 9 10:00:45 PDT 2010
Revision: 70430
http://trac.macports.org/changeset/70430
Author: raphael at macports.org
Date: 2010-08-09 10:00:44 -0700 (Mon, 09 Aug 2010)
Log Message:
-----------
opencv: maintainer timeout; closes #24503
* update to 2.1.0
* add modeline
* use cmake portgroup
* add missing dependencies
* add universal variant
* add python26 variant
* add tbb variant
* build and install examples
* fix livecheck
Modified Paths:
--------------
trunk/dports/graphics/opencv/Portfile
Added Paths:
-----------
trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff
trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/graphics/opencv/files/patch-G4.diff
Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile 2010-08-09 16:47:25 UTC (rev 70429)
+++ trunk/dports/graphics/opencv/Portfile 2010-08-09 17:00:44 UTC (rev 70430)
@@ -1,10 +1,11 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
+PortGroup cmake 1.0
name opencv
-version 2.0.0
-revision 1
+version 2.1.0
categories graphics science
platforms darwin
maintainers gmail.com:stante
@@ -24,40 +25,68 @@
use_bzip2 yes
distname OpenCV-${version}
-checksums md5 ed27520514baacc5edad7b06ad24130e \
- sha1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 \
- rmd160 f46b993ded3d579dc52175131e5485476ac1f569
+checksums md5 1d71584fb4e04214c0085108f95e24c8 \
+ sha1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 \
+ rmd160 e31cdbd30e7925e3725f5957616ffc59c58db247
depends_build-append port:pkgconfig
-depends_lib-append port:gtk2 port:zlib port:jpeg \
- port:libpng port:tiff path:lib/libavcodec.dylib:ffmpeg
+depends_lib-append port:zlib \
+ path:lib/libavcodec.dylib:ffmpeg \
+ port:bzip2 \
+ port:dirac \
+ port:faac \
+ port:faad2 \
+ port:lame \
+ port:schroedinger \
+ port:liboil \
+ port:libtheora \
+ port:libvorbis \
+ port:libogg \
+ port:x264 \
+ port:libdc1394 \
+ port:orc
-# ffmpeg is not universal.
-# If universal support is to be added to opencv, careful consideration has
-# to be given to the 64-bit issues with QuickTime and Carbon.
-universal_variant no
+patchfiles patch-CMakeLists.txt.diff
+if {[variant_isset universal]} {
+ patchfiles-append patch-pch-CMakeLists.txt.diff
+}
-configure.args --without-python
+post-patch {
+ if {[variant_isset python26]} {
+ reinplace "s|@@PYTHON_PKGD@@|${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages|g" ${worksrcpath}/CMakeLists.txt
+ }
+}
-switch ${build_arch} {
- ppc64 -
- x86_64 {
- configure.args-append --without-quicktime \
- --without-carbon
+configure.args-append -DBUILD_NEW_PYTHON_SUPPORT=OFF \
+ -DBUILD_EXAMPLES=ON \
+ -DINSTALL_C_EXAMPLES=ON \
+ -DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib
+
+# use macros in /usr/include/stdint.h with C++ compiler; see <https://roundup.ffmpeg.org/issue2093>
+platform darwin {
+ if {${os.major} <= 9} {
+ configure.args-append -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS
}
- ppc {
- patchfiles-append patch-G4.diff
- }
}
-# For some reason the highgui module forgets to link against libavutil
-configure.ldflags-append -lavutil
+variant python26 description {Add Python 2.6 bindings} {
+ depends_lib-append port:python26
+ configure.args-delete -DBUILD_NEW_PYTHON_SUPPORT=OFF
+ configure.args-append -DINSTALL_PYTHON_EXAMPLES=ON \
+ -DPYTHON_LIBRARY=${prefix}/lib/libpython2.6.dylib \
+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/Headers
+}
-post-destroot {
- xinstall -m 644 ${worksrcpath}/cvconfig.h ${destroot}${prefix}/include/${name}
+variant tbb description {Use Intel TBB} {
+ depends_lib-append port:tbb
+ configure.args-append -DWITH_TBB=ON \
+ -DHAVE_TBB=ON \
+ -DTBB_INCLUDE_DIRS=${prefix}/include \
+ -DTBB_LIBRARY_DIRS=${prefix}/lib \
+ -DOPENCV_LINKER_LIBS="-ltbb -ltbbmalloc"
}
livecheck.type regex
livecheck.url http://sourceforge.net/projects/opencvlibrary/files/
-livecheck.regex {OpenCV-([0-9.]+)\.tar}
+livecheck.regex "OpenCV-(\\d+(?:\\.\\d+)*)${extract.suffix}/download"
Added: trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/graphics/opencv/files/patch-CMakeLists.txt.diff 2010-08-09 17:00:44 UTC (rev 70430)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2010-04-13 17:51:01.000000000 +0400
++++ CMakeLists.txt 2010-04-13 17:52:20.000000000 +0400
+@@ -468,7 +468,7 @@
+ string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
+ if(UNIX)
+ set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
++ set(PYTHON_PACKAGES_PATH @@PYTHON_PKGD@@)
+ endif()
+ if(WIN32)
+ get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
Deleted: trunk/dports/graphics/opencv/files/patch-G4.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-G4.diff 2010-08-09 16:47:25 UTC (rev 70429)
+++ trunk/dports/graphics/opencv/files/patch-G4.diff 2010-08-09 17:00:44 UTC (rev 70430)
@@ -1,11 +0,0 @@
---- work/OpenCV-2.0.0/configure.in.orig 2010-04-05 19:15:57.000000000 +0200
-+++ work/OpenCV-2.0.0/configure.in 2010-04-05 19:16:31.000000000 +0200
-@@ -310,7 +310,7 @@
- ;;
- powerpc-apple-*)
- # Mac OS X 10.4 runs on CPUs >= G4 only
-- OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G4 -mpowerpc-gpopt -mtune=G5 -fsched-interblock -fgcse-sm -g"
-+ OPTIMIZATION_CXXFLAGS="-O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ffast-math -fstrict-aliasing -funroll-loops -ftree-loop-linear -ftree-loop-memset -mcpu=G4 -fsched-interblock -fgcse-sm -g"
- ;;
- powerpc64-apple-*)
- # There are no 64bit Macs with a CPU that's not a G5
Added: trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/graphics/opencv/files/patch-pch-CMakeLists.txt.diff 2010-08-09 17:00:44 UTC (rev 70430)
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2010-06-08 16:23:51.000000000 +0400
++++ CMakeLists.txt 2010-06-11 17:52:57.000000000 +0400
+@@ -195,7 +195,6 @@
+ set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
+ endif()
+
+-include(OpenCVPCHSupport.cmake REQUIRED)
+
+ if(UNIX)
+ include(OpenCVFindPkgConfig.cmake OPTIONAL)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100809/1bb6d316/attachment.html>
More information about the macports-changes
mailing list