diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/opencv/Manifest | 9 | ||||
-rw-r--r-- | media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch | 11 | ||||
-rw-r--r-- | media-libs/opencv/files/opencv-1.1.0_pre1-link.patch | 26 | ||||
-rw-r--r-- | media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch | 40 | ||||
-rw-r--r-- | media-libs/opencv/files/opencv-2.0.0-multilib.patch | 120 | ||||
-rw-r--r-- | media-libs/opencv/opencv-1.1.0_pre1.ebuild | 80 | ||||
-rw-r--r-- | media-libs/opencv/opencv-9999.ebuild | 52 |
7 files changed, 0 insertions, 338 deletions
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest deleted file mode 100644 index 92cc2ae..0000000 --- a/media-libs/opencv/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -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-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-9999.ebuild 1640 RMD160 a32c3e8e8ecfc7d7881a6b6a058ec105c4dc75ab SHA1 0d49e75567fea8f7e951f84cf4993a4c6db0e4b0 SHA256 0630fcb45e20d40d7b1a92aa42cd58ce6b065f44942807346ff21b0e712cdc0d -MISC ChangeLog 1173 RMD160 671403715ed2d7e733ac23ae0ca9d1db5544e00b SHA1 9988a99aa9ecacb44cec8dc2d68a51081807e270 SHA256 84e2682b7f86604070d00922e94d8e7b1803da31e6a8582949d7ff602b7006e6 -MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch deleted file mode 100644 index 63c725f..0000000 --- a/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- opencv-1.1.0/configure.in.orig -+++ opencv-1.1.0/configure.in -@@ -37,7 +37,7 @@ - AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@lists.sourceforge.net]) - AC_CONFIG_SRCDIR([opencv.pc.in]) - AC_CONFIG_AUX_DIR([autotools]) --AC_CONFIG_MACRO_DIR([autotools/aclocal]) -+#AC_CONFIG_MACRO_DIR([autotools/aclocal]) - - # put CVS revision of this configure.in into the resulting configure script - AC_REVISION($Revision: 1.60 $) diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch deleted file mode 100644 index a72c2c8..0000000 --- a/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- interfaces/swig/python/Makefile.am.orig -+++ interfaces/swig/python/Makefile.am -@@ -122,20 +122,17 @@ - cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i - _cv_la_CXXFLAGS = $(PYTHON_CSPEC) - _cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la --_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ -- -L$(SWIG_PYTHON_LIBS) -+_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) - - _ml_la_SOURCES = _ml.cpp pyhelpers.cpp pyhelpers.h - _ml_la_CXXFLAGS = $(PYTHON_CSPEC) - _ml_la_LIBADD = $(top_builddir)/ml/src/libml.la --_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ -- -L$(SWIG_PYTHON_LIBS) -+_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) - - _highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \ - highgui.i - _highgui_la_CXXFLAGS = $(PYTHON_CSPEC) - _highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la --_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \ -- -L$(SWIG_PYTHON_LIBS) -+_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) - - endif diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch deleted file mode 100644 index 0c16cbe..0000000 --- a/media-libs/opencv/files/opencv-1.1.0_pre1-stereorectify.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- opencv-1.1.0/cv/src/cvcalibration.cpp.orig -+++ opencv-1.1.0/cv/src/cvcalibration.cpp -@@ -2337,20 +2337,28 @@ - - fc = cvmGet(A,idx^1,idx^1); - if( dk1 < 0 ) -- fc *= 1 + 0.2*dk1*(nx*nx + ny*ny)/(8*fc*fc); -+ fc *= 1 + dk1*(nx*nx + ny*ny)/(4*fc*fc); - fc_new = MIN(fc_new, fc); - - for( i = 0; i < 4; i++ ) - { -- _pts[i].x = (float)(((i % 2) + 0.5)*nx*0.5); -- _pts[i].y = (float)(((i / 2) + 0.5)*ny*0.5); -- } -+ int j = (i<2) ? 0 : 1; -+ _pts[i].x = (float)((i % 2)*(nx-1)); -+ _pts[i].y = (float)(j*(ny-1)); -+ } - cvUndistortPoints( &pts, &pts, A, Dk, 0, 0 ); - cvConvertPointsHomogeneous( &pts, &pts_3 ); -- cvProjectPoints2( &pts_3, k == 0 ? _R1 : _R2, &Z, A, 0, &pts ); -+ //Change camera matrix to have cc=[0,0] and fc = fc_new -+ double _a_tmp[3][3]; -+ CvMat A_tmp = cvMat(3, 3, CV_64F, _a_tmp); -+ _a_tmp[0][0]=fc_new; -+ _a_tmp[1][1]=fc_new; -+ _a_tmp[0][2]=0.0; -+ _a_tmp[1][2]=0.0; -+ cvProjectPoints2( &pts_3, k == 0 ? _R1 : _R2, &Z, &A_tmp, 0, &pts ); - CvScalar avg = cvAvg(&pts); -- cc_new[k].x = avg.val[0]; -- cc_new[k].y = avg.val[1]; -+ cc_new[k].x = (nx-1)/2 - avg.val[0]; -+ cc_new[k].y = (ny-1)/2 - avg.val[1]; - } - - // vertical focal length must be the same for both images to keep the epipolar constraint - - diff --git a/media-libs/opencv/files/opencv-2.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch deleted file mode 100644 index 9df1373..0000000 --- a/media-libs/opencv/files/opencv-2.0.0-multilib.patch +++ /dev/null @@ -1,120 +0,0 @@ -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-1.1.0_pre1.ebuild b/media-libs/opencv/opencv-1.1.0_pre1.ebuild deleted file mode 100644 index fe51931..0000000 --- a/media-libs/opencv/opencv-1.1.0_pre1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="1" -inherit eutils flag-o-matic autotools - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems." -HOMEPAGE="http://www.intel.com/technology/computing/opencv/index.htm" -SRC_URI="mirror://sourceforge/${PN}library/${PN}-1.1pre1.tar.gz" - -##If video for linux is enabled, add GPL-2, since it will need to use GPL-2 -##stuff, same for v4l -LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) Intel" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug demos ffmpeg gtk ieee1394 jpeg jpeg2k openexr png python tiff xine v4l zlib" - -COMMON_DEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) - gtk? ( x11-libs/gtk+:2 ) - ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 ) - jpeg? ( media-libs/jpeg ) - jpeg2k? ( media-libs/jasper ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng:1.2 ) - python? ( >=dev-lang/python-2.3 >=dev-lang/swig-1.3.30 ) - tiff? ( media-libs/tiff ) - xine? ( media-libs/xine-lib ) - zlib? ( sys-libs/zlib )" - -DEPEND="${COMMON_DEPEND} - gtk? ( dev-util/pkgconfig )" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${PN}-1.1.0" - -src_unpack() { - unpack ${A} - cd "${S}" - - # remove the install-hook that runs ldconfig. - sed -i '/install-hook:/,/^$/d' Makefile.am - - epatch "${FILESDIR}"/${P}-libtool.patch - epatch "${FILESDIR}"/${P}-link.patch - epatch "${FILESDIR}"/${P}-stereorectify.patch - - eautoreconf || die "eautoreconf failed" -} - -src_compile() { - use debug && filter-ldflags -O1 -Wl --enable-new-dtags -s - filter-ldflags -L - - local myconf="--without-quicktime" - use python && myconf="${myconf} --with-swig --with-python" \ - || myconf="${myconf} --without-swig --without-python" - - econf \ - ${myconf} \ - $(use_with gtk) \ - $(use_with xine) \ - $(use_with ffmpeg) \ - $(use_with ieee1394 1394libs) \ - $(use_with v4l) \ - $(use_enable debug) \ - $(use_enable demos apps) - emake || die "Emake failed" -} - -src_test() { - emake check || die "Tests failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS ChangeLog README NEWS TODO - insinto /usr/share/doc/${P} - doins -r docs/ -} diff --git a/media-libs/opencv/opencv-9999.ebuild b/media-libs/opencv/opencv-9999.ebuild deleted file mode 100644 index ea5802d..0000000 --- a/media-libs/opencv/opencv-9999.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit eutils cmake-utils subversion - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems." -HOMEPAGE="http://opencv.willowgarage.com" - -ESVN_REPO_URI="https://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk/opencv" - -LICENSE="GPL-2" -SLOT="0" -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 ) - ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 ) - ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) - gstreamer? ( media-libs/gstreamer ) - gtk? ( x11-libs/gtk+:2 ) - jpeg2k? ( media-libs/jasper ) - jpeg? ( media-libs/jpeg ) - png? ( media-libs/libpng:1.2 ) - tiff? ( media-libs/tiff ) - xine? ( media-libs/xine-lib ) - zlib? ( sys-libs/zlib )" - -DEPEND="${COMMON_DEPEND} - >=dev-util/cmake-2.6 - dev-util/pkgconfig" -RDEPEND="${COMMON_DEPEND}" - -MAKEOPTS="${MAKEOPTS} -j1" - -src_configure() { - use python && mycmakeargs="${mycmakeargs} -DBUILD_PYTHON_SUPPORT=ON" \ - || mycmakeargs="${mycmakeargs} -DBUILD_PYTHON_SUPPORT=OFF" - mycmakeargs="${mycmakeargs} \ - $(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 v4l) \ - $(cmake-utils_use_with xine)" - cmake-utils_src_configure -} |