summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Mavrinac <mavrinac@gmail.com>2009-10-16 10:31:12 -0400
committerAaron Mavrinac <mavrinac@gmail.com>2009-10-16 10:31:12 -0400
commita79430611e9be33811278b0866f2e10b744662da (patch)
treed3d77576090114f1285bf3f93347b15c96cb6d1e /media-libs
parentmedia-libs/opencv: Updated with some new stuff from S. Suominen's ebuild (diff)
downloadezod-a79430611e9be33811278b0866f2e10b744662da.tar.gz
ezod-a79430611e9be33811278b0866f2e10b744662da.tar.bz2
ezod-a79430611e9be33811278b0866f2e10b744662da.zip
media-libs/opencv: More updates from ssuominen. This version is going in
the official tree.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencv/Manifest5
-rw-r--r--media-libs/opencv/files/opencv-2.0.0-multilib.patch120
-rw-r--r--media-libs/opencv/opencv-2.0.0.ebuild68
-rw-r--r--media-libs/opencv/opencv-9999.ebuild2
4 files changed, 162 insertions, 33 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index fddc90d..c337264 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,11 @@
AUX opencv-1.1.0_pre1-libtool.patch 425 RMD160 677c2dee8aba8b5170eabc39528f904f58ec9f43 SHA1 90fb1baa007e0137a6113fe526528198e0660445 SHA256 603b333a005fcf8dbd87d43264dbd67f10de740b92f1cabf70a01799b2e312c3
AUX opencv-1.1.0_pre1-link.patch 1264 RMD160 9b189456b9d7c089c61755368950e47f9e6bb716 SHA1 2430a3028c02729038b447f4a90fffa9c2bd86a9 SHA256 5535327774d5062ff24a6ac26d874db1377cbd64f1e1052b65e8f4557f8b145b
AUX opencv-1.1.0_pre1-stereorectify.patch 1409 RMD160 0b317df1cb2a2b61be6e673b1b52ecf836b0e7cf SHA1 2a4d841dac0882de2087bcf7c495045b4639d142 SHA256 2a25dd7b7cf968dfbac143a1cfbd1a5afaaafb2fceb62e60d51d21220139c8af
+AUX opencv-2.0.0-multilib.patch 5557 RMD160 f3b9114b3c69b74ec48cf399c0b4a091b888213b SHA1 9ef9e91d147e34325bf16aa70ac18af0ca2709ff SHA256 133bf0b2b757f422bbecf36c8273ac80e72d12c4063a8d818bffa9bb6f570e73
DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
DIST opencv-1.1pre1.tar.gz 22301291 RMD160 d105a97f211637edbbac1eb21dca2b140b1f37be SHA1 4bc4bda92a250adcb82b236161d364c059021a43 SHA256 7e4f0026e5543c38afcf8a4298b1da2bace977499f99b885c925fc784783d812
EBUILD opencv-1.1.0_pre1.ebuild 2199 RMD160 f550df98b58a352cf06772eda1cb094cb04fe03f SHA1 598b691bb5932df387b1f7f3bb9fec05c7310400 SHA256 3bf985bc9040c62311b25ae1372fb3f71c6148b6ce215982f2c27001a89c7699
-EBUILD opencv-2.0.0.ebuild 2117 RMD160 50cddd145f65c8432b68a7ede8e210372d90a4c4 SHA1 09dada4580162a71f28b2752beecee67869b72ed SHA256 bb83ef6c8dacff33f0b6309efd8f7df920ef714938bca597dcc516df08d1f5a4
-EBUILD opencv-9999.ebuild 1656 RMD160 2d3a4827a7ee3ec37cdefd33dea90e8809bf6b67 SHA1 96b2cfba7be4b9f2739bd5e0ee05827f3736392a SHA256 09225ba786c2648a17be9d3a29316681841a171cc487dd5f5baa94f91e6bbbcf
+EBUILD opencv-2.0.0.ebuild 2266 RMD160 57d5c50a3eba8744c3d4bbe65c7312ce87bddb2f SHA1 3e93a1618012dcaa5c9c37ee1caacd8726408e9e SHA256 314fb0dcf560548d2b785f0b2892588cf210a0b147a94b7378d777b1bb02d6ab
+EBUILD opencv-9999.ebuild 1640 RMD160 a32c3e8e8ecfc7d7881a6b6a058ec105c4dc75ab SHA1 0d49e75567fea8f7e951f84cf4993a4c6db0e4b0 SHA256 0630fcb45e20d40d7b1a92aa42cd58ce6b065f44942807346ff21b0e712cdc0d
MISC ChangeLog 1039 RMD160 74d58f3e7ed4ffade4efec2f9817964e0828c43e SHA1 0f05592c2f58189b01d76e3c3d631c79e72d54da SHA256 e409b431e786377ddd6039947fd07ac25e5498c4af398e1de7e478787c902b3b
MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea
diff --git a/media-libs/opencv/files/opencv-2.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
new file mode 100644
index 0000000..9df1373
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
@@ -0,0 +1,120 @@
+diff -Naur OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt 2009-09-30 20:21:00.000000000 -0400
++++ OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt 2009-10-16 08:51:29.000000000 -0400
+@@ -86,8 +86,8 @@
+ INSTALL (
+ TARGETS flann flann_s
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ )
+
+ # INSTALL (
+diff -Naur OpenCV-2.0.0.orig/CMakeLists.txt OpenCV-2.0.0/CMakeLists.txt
+--- OpenCV-2.0.0.orig/CMakeLists.txt 2009-09-30 20:21:05.000000000 -0400
++++ OpenCV-2.0.0/CMakeLists.txt 2009-10-16 10:28:51.000000000 -0400
+@@ -405,8 +405,8 @@
+
+ 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_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+ endif()
+ if(WIN32)
+ get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
+diff -Naur OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt 2009-09-30 20:20:57.000000000 -0400
++++ OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt 2009-10-16 08:54:26.000000000 -0400
+@@ -33,5 +33,5 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
+ )
+diff -Naur OpenCV-2.0.0.orig/src/cv/CMakeLists.txt OpenCV-2.0.0/src/cv/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/cv/CMakeLists.txt 2009-09-30 20:20:58.000000000 -0400
++++ OpenCV-2.0.0/src/cv/CMakeLists.txt 2009-10-16 08:52:46.000000000 -0400
+@@ -66,8 +66,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv
+diff -Naur OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.0.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
++++ OpenCV-2.0.0/src/cvaux/CMakeLists.txt 2009-10-16 08:52:29.000000000 -0400
+@@ -76,8 +76,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${aux_hdrs_ext}
+ DESTINATION include/opencv
+diff -Naur OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.0.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
++++ OpenCV-2.0.0/src/cxcore/CMakeLists.txt 2009-10-16 08:50:19.000000000 -0400
+@@ -66,8 +66,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ # install each module headers separately
+ install(FILES ${lib_hdrs}
+diff -Naur OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt OpenCV-2.0.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt 2009-09-30 20:20:58.000000000 -0400
++++ OpenCV-2.0.0/src/highgui/CMakeLists.txt 2009-10-16 08:53:18.000000000 -0400
+@@ -206,8 +206,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${highgui_ext_hdrs}
+ DESTINATION include/opencv
+diff -Naur OpenCV-2.0.0.orig/src/ml/CMakeLists.txt OpenCV-2.0.0/src/ml/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/ml/CMakeLists.txt 2009-09-30 20:20:59.000000000 -0400
++++ OpenCV-2.0.0/src/ml/CMakeLists.txt 2009-10-16 08:51:57.000000000 -0400
+@@ -61,8 +61,8 @@
+
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+
+ install(FILES ${lib_hdrs}
+ DESTINATION include/opencv
+diff -Naur OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.0.0/tests/cxts/CMakeLists.txt
+--- OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt 2009-09-30 20:20:56.000000000 -0400
++++ OpenCV-2.0.0/tests/cxts/CMakeLists.txt 2009-10-16 08:53:47.000000000 -0400
+@@ -63,6 +63,6 @@
+ if(WIN32)
+ install(TARGETS ${the_target}
+ RUNTIME DESTINATION bin COMPONENT main
+- LIBRARY DESTINATION lib COMPONENT main
+- ARCHIVE DESTINATION lib COMPONENT main)
++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ endif()
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index 826961e..02914d8 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
-inherit eutils cmake-utils
+EAPI=2
+inherit cmake-utils
-MY_P="OpenCV-${PV}"
+MY_P=OpenCV-${PV}
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
HOMEPAGE="http://opencv.willowgarage.com"
@@ -13,10 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg mmx openmp png sse sse2 tiff v4l xine zlib -oldpython -octave -unicap"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug examples test python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg mmx openmp png sse sse2 tiff v4l xine +deprecated ipp octave unicap"
-COMMON_DEPEND="python? ( >=dev-lang/python-2.5 )
+COMMON_DEPEND="sys-libs/zlib
+ ipp? ( sci-libs/ipp )
+ python? ( >=dev-lang/python-2.5
+ deprecated? ( >=dev-lang/swig-1.3.30 ) )
ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 )
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
gstreamer? ( media-libs/gstreamer )
@@ -26,41 +29,46 @@ COMMON_DEPEND="python? ( >=dev-lang/python-2.5 )
png? ( media-libs/libpng:1.2 )
tiff? ( media-libs/tiff )
xine? ( media-libs/xine-lib )
- zlib? ( sys-libs/zlib )
- oldpython? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )
octave? ( sci-mathematics/octave >=dev-lang/swig-1.3.30 )
unicap? ( media-libs/unicap )"
DEPEND="${COMMON_DEPEND}
- >=dev-util/cmake-2.6
dev-util/pkgconfig
openmp? ( >=sys-devel/gcc-4.2[openmp] )"
RDEPEND="${COMMON_DEPEND}"
-MAKEOPTS="${MAKEOPTS} -j1"
+S=${WORKDIR}/${MY_P}
-S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
src_configure() {
- mycmakeargs="${mycmakeargs} \
- $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) \
- $(cmake-utils_use_build oldpython SWIG_PYTHON_SUPPORT) \
- $(cmake-utils_use_build octave OCTAVE_SUPPORT) \
- $(cmake-utils_use_build examples) \
- $(cmake-utils_use_enable openmp) \
- $(cmake-utils_use mmx USE_MMX) \
- $(cmake-utils_use sse USE_SSE) \
- $(cmake-utils_use sse2 USE_SSE2) \
- $(cmake-utils_use_with ieee1394 1394) \
- $(cmake-utils_use_with ffmpeg) \
- $(cmake-utils_use_with gstreamer) \
- $(cmake-utils_use_with gtk) \
- $(cmake-utils_use_with jpeg2k jasper) \
- $(cmake-utils_use_with jpeg) \
- $(cmake-utils_use_with png) \
- $(cmake-utils_use_with tiff) \
- $(cmake-utils_use_with unicap) \
- $(cmake-utils_use_with v4l) \
+ mycmakeargs="${mycmakeargs}
+ -DUSE_O3=OFF
+ -DUSE_OMIT_FRAME_POINTER=OFF
+ -DCMAKE_SKIP_RPATH=ON
+ $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+ $(cmake-utils_use_build octave OCTAVE_SUPPORT)
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use_build test TESTS)
+ $(cmake-utils_use_enable openmp)
+ $(cmake-utils_use mmx USE_MMX)
+ $(cmake-utils_use sse USE_SSE)
+ $(cmake-utils_use sse2 USE_SSE2)
+ $(cmake-utils_use ipp USE_IPP)
+ $(cmake-utils_use_with ieee1394 1394)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with jpeg2k jasper)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with unicap)
+ $(cmake-utils_use_with v4l)
$(cmake-utils_use_with xine)"
+ if use python; then
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)"
+ fi
cmake-utils_src_configure
}
diff --git a/media-libs/opencv/opencv-9999.ebuild b/media-libs/opencv/opencv-9999.ebuild
index 48ee714..ea5802d 100644
--- a/media-libs/opencv/opencv-9999.ebuild
+++ b/media-libs/opencv/opencv-9999.ebuild
@@ -12,7 +12,7 @@ ESVN_REPO_URI="https://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/t
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
IUSE="debug python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg png tiff v4l xine zlib"
COMMON_DEPEND="python? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )