Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 326a9d4df335541bae6769ed6ab1025a9251eb39..29b23bfc832506e21fde6c40376f295582ca1753 100644 (file)
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.120 2015/04/08 17:59:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.121 2015/04/12 20:46:20 dilfridge Exp $
+
+*opencv-2.4.10 (12 Apr 2015)
+
+  12 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.4.10.ebuild:
+  Version bump
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> opencv-2.4.9.ebuild:
   Drop old Python implementations

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index e00d02134f40b3b7cdbabb1f6e880ce213f1a475..7fd8493f00028a82ab42bd99e52b2886062f406d 100644 (file)
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -8,26 +8,28 @@ AUX opencv-2.4.8-javamagic.patch 1165 SHA256 b13037b93683ee8e6f535cbbd8742005e67
 AUX opencv-2.4.9-cuda-pkg-config.patch 373 SHA256 18ef4f87f3effcc1306c81ff8134a5863a694988efddc16ac36b15892d403b76 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937 WHIRLPOOL c19c4b3acc6944a3218cba55b38875f417a8755e9616dc26a1541a189452bf7f01fcbbde3436290752d8fa75caebd39b3335eb8beca697e06a4a86cd8dfa0e27
 AUX opencv-2.4.9-cuda.patch 7247 SHA256 94f01e58038306a6f699d867936038c9815f965f31075c268e80ad30aab33cc2 SHA512 b8d7a18e00359a985f389eecf779b2d648ea88f2508c31f1895eb0d9ef9ce2924866054a2df0bb452ba161c3ba254e4cb9717c1275392a2e8691b9b34c245e9b WHIRLPOOL 6bc5b4afb724a6450228eae6e6920ee57d36f2d1bb50c09a6bd7230f870224d75367d3a9dbd0f02d1bacb1fa48d6e2d331d363716cc547fb85b67b48985dc5fb
 AUX opencv-2.4.9-libav10.patch 22417 SHA256 7c95f31c8242b239c2cb3259e2bdecad4a56d1dfd8d6087e71265ab6123aeb8c SHA512 e6ce98f788df2cfa32861d62c21296e4a3cea7a8b6747bc945cf80267a23aa207f94b30c000bddf6ccea69fc22edef635ee33cd3dd683a4b790bcca49e068a93 WHIRLPOOL 887a684bdc0994b8a5bf6a83aca4e94eca45c5a65ab5bfda873156b4cb8c9ab3b3bc6a5a75a8a2016f4416e47ab4f6f9a3b6776ac10af3ca57d9a4e2c3b08c9c
+DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
+EBUILD opencv-2.4.10.ebuild 6103 SHA256 9fa2d8b49609b33e8ee10d913c676efdb768f4fec57b3394d50f0be7d271482a SHA512 736891500627c77c3fa78f130c136b7a65ac2072afaf1def60ca538c4c9282912f4873b407198eeb00a51624037d91cdd7a701cabba9ff63abd854c0f428179e WHIRLPOOL 054e8e419d46bfcfe0d7f0048de08a3071dc3a8e9588f9385632f3ca1a225053cd0fe19d40fef37ec99b5f89d13aef14a5e5af39d9121475b92b461860ddc57e
 EBUILD opencv-2.4.9.ebuild 6135 SHA256 fcda8c5c8f92a4c66417a4a799952158767365fa9921cbce9fb59123a2757305 SHA512 70f53a9bafa014c0b9e9936f1c56f9c53e9d7eaf07004e3304785294081ae77f13347d4d55ee46e4faddd6e1ada29f3f3bb74f139e49461b6260f190c1964abf WHIRLPOOL 6fa2f37ade6ca2cc7afd7006717ac50f78dfb4f048ad27e4f4870a0ad873717e09f25ebe217e9d912867b5f96b49c674e4b5b99e5fa2cc00da2f2a3dce05edba
-MISC ChangeLog 19976 SHA256 f0198e54ed133c34022964e4ffa5998caa5ec2a8f784fc7b0c5b8ba7af948d10 SHA512 1f87565b7cb32777b4dc9cf9d314b139a58876c48c93732128b883a5876e905942cb530ff174752d4b02f5659567fddfcce1ccc0be41500fa9d38582239b7a08 WHIRLPOOL f7ecea3e3e3cbcad1f90ec5597c2ef1f0e4762e827d0f8a9ba79dbaa2e4ec5ec79f773c8da17dd03c413e909a72ea0014c2bef6b9e92140af891585e9692f17a
+MISC ChangeLog 20105 SHA256 867b6456e18cff1f7253baa2489a89f9b6a1d314fdb1efa2491807df7f4decbb SHA512 b382db0bceabe724b072a4010e48edc00f2d4768fb67a1d1c4dbe98fa223c1fd3397f63acada8466ec41619e0b20cec5f49d80cb353cb0a368c41c3e68afc9d6 WHIRLPOOL 30aa35cc60c424a94e08294901ff5ffd542175ca21baf4f66a1c038a4c629f7ea7c85290ecddbed224b45b6b66eb55b472144b619f7a15a532dac13d3d966670
 MISC metadata.xml 1230 SHA256 8ac77d1094c6a1d2f83c13693a34e3c7745e4b55d99d44d7471ed0d847bae369 SHA512 4a3191076a5e9c211ffbff7ea6870214c1533193d7a26d0937f78b00d80f4874561dbe76d05c63dbde820db2e49603d048fcb6a34cb704bb0f5e7cb33f645be0 WHIRLPOOL 87825beff89509383be4fc077471c3c91e0b3956ea19b2f7373310404f0e27c1d394309d996ce3763f63f611a61b9d8e7e6c3b82c50a0cf4c56b399accc396a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWygXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeR4QANVXpT8PkDHGU0MKDJ6CPWzK
-SISfyxqeXtlNELBO2xlw5St6M1uJO0ODAo66WEWCYtoRsa4JC+fS2K/ezGxrkgVa
-oSsQQ+r6eESLlBMDsz++HX/vlqVcAJPqMVHYw9qlfUWKaShVVOGS/ozO6/XjvYTI
-urFFIXuF6ZUM19AenCwoLmBB7pr+gC9cFjZhFzxiN+j3NNt3v2gqQPWDnufm4feP
-5Z8aQYppuZ40NCeEK7kYr2l1RPCiteK5I8cb8LpQP9JP2Lo7WWFgn6voF+Y+KRBP
-o5s9xsiQkFtXUuYJklJn2vldpDmLgjWb3yddlZOMpbwTacRwixvQh/0W6QZR/Qyj
-a3StBM5+rM4aSfiG05ACo0eIdENvd86SdwIVwSr+Hwfsl4ruqfATaDNlbxqWuOdA
-Cz1ySx1Jy9JzRzIlNdQcN8yXxNgavh5NMf0UtBvHTKWw30er5tf0rng64U6ZCgS3
-vqnD9joZTnCPK436aRT9iK1sx9WYSfyA4tczetjPPMGhhV57PMjwKPXrsnOH+2Oz
-ReV05uUliDUucjxOU8irLqHf68QuUBsBoYSle+hrtZCmn4aUn9QAjM56ty2ejdlY
-XLIDgsqT51EFCVCWNZ3LxhYSSvhrxqLi080Icf+IPdtXQfBN36t1DphJgdfp0jqJ
-FI2sZi9mgQvnD81twYY5
-=GpXa
+iQJ8BAEBCABmBQJVKtmdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d50pkP+gNvRjmsjLG9EffQfnTRDkDS
+YbOLaAK/K6OOaVgXBwd70BzQ1il/7baBogGgVAyyUushcXpZfiwPqrOAy+k3lG2p
+VboQ9cMFtQ11EfIdkcTejkyfG44nxXP+s7xgzjICb9Lj6BnYXhRGr2xSErSGePUR
+L2nVnWjBXKwdhkGjoEWoIdXJVD8xYQNurkvhn6n1BiTbuVd5SW0Uk7Egz556S7hR
+HuBNd1K4d7/su11gjKIGNfYcfzE8T695QPzP8ETUZ1oUyCaIGMp5CY7XfoMBIzIy
++HC4bT7PuuHubLt/P+96wzV0t/HYzeYHv7zARRtN6CBuC3GZ0NQviH8rOsgBo/Ut
+2G9ikovHEq8XYLsAhc1xhA8om7UQZD7EY7/F+FqyD12QfmvfMIrY+a/gw+Ua241X
+dv/zb+JQkaO5ktCXNg9HTKRGb2zQEWQwBqC4Cb2cyZZsbblSWKi5EIH1PsZuHK+W
+dDSNieWCcly5Xk8LsiPcxVMCnHYIXxajIq+XEBIoD+oIwllqBGkvt+i+pkO8vV4H
+SlXML4SxU6LClHaL2poe8NGr3OndYEe8sl/WZbTi0lRBB+taBEObmuNi2zssqAwa
+/qsihWK1NgpqDAk0DXJTBa0lbTZowZDOmmxHHyjSMqd3bdk5tW9HHgcji0Pvou8r
+UyUgX67wOQdWMcxUDRxw
+=fLoI
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/opencv-2.4.10.ebuild b/media-libs/opencv/opencv-2.4.10.ebuild
new file mode 100644 (file)
index 0000000..5a05983
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.10.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.10.ebuild,v 1.1 2015/04/12 20:46:20 dilfridge Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+
+SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0/2.4"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux"
+IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
+REQUIRED_USE="
+       python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#      gtk? ( !qt4 )
+#      opengl? ( || ( gtk qt4 ) )
+#      openmp? ( !threads )
+
+RDEPEND="
+       app-arch/bzip2
+       sys-libs/zlib
+       cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
+       gstreamer? (
+               media-libs/gstreamer:0.10
+               media-libs/gst-plugins-base:0.10
+       )
+       gtk? (
+               dev-libs/glib:2
+               x11-libs/gtk+:2
+               opengl? ( x11-libs/gtkglext )
+       )
+       java? ( >=virtual/jre-1.6 )
+       jpeg? ( virtual/jpeg )
+       jpeg2k? ( media-libs/jasper )
+       ieee1394? (
+               media-libs/libdc1394
+               sys-libs/libraw1394
+       )
+       ipp? ( sci-libs/ipp )
+       opencl? ( virtual/opencl )
+       openexr? ( media-libs/openexr )
+       opengl? ( virtual/opengl virtual/glu )
+       png? ( media-libs/libpng:0= )
+       python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+       qt4? (
+               dev-qt/qtgui:4
+               dev-qt/qttest:4
+               opengl? ( dev-qt/qtopengl:4 )
+       )
+       threads? ( dev-cpp/tbb )
+       tiff? ( media-libs/tiff )
+       v4l? ( >=media-libs/libv4l-0.8.3 )
+       vtk? ( sci-libs/vtk[rendering] )
+       xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       eigen? ( dev-cpp/eigen:3 )
+       java? ( >=virtual/jdk-1.6 )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
+       "${FILESDIR}/${PN}-2.4.3-gcc47.patch"
+       "${FILESDIR}/${PN}-2.4.2-cflags.patch"
+       "${FILESDIR}/${PN}-2.4.8-javamagic.patch"
+       "${FILESDIR}/${PN}-2.4.9-libav10.patch"
+       "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+)
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       base_src_prepare
+
+       # remove bundled stuff
+       rm -rf 3rdparty
+       sed -i \
+               -e '/add_subdirectory(3rdparty)/ d' \
+               CMakeLists.txt || die
+
+       java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+       if use openmp; then
+               tc-has-openmp || die "Please switch to an openmp compatible compiler"
+       fi
+
+       JAVA_ANT_ENCODING="iso-8859-1"
+       # set encoding so even this cmake build will pick it up.
+       export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+       java-ant-2_src_configure
+
+       # please dont sort here, order is the same as in CMakeLists.txt
+       local mycmakeargs=(
+       # the optinal dependency libraries
+               $(cmake-utils_use_with ieee1394 1394)
+               -DWITH_AVFOUNDATION=OFF
+               -DWITH_CARBON=OFF
+               $(cmake-utils_use_with eigen)
+               $(cmake-utils_use_with ffmpeg)
+               $(cmake-utils_use_with gstreamer)
+               $(cmake-utils_use_with gtk)
+               $(cmake-utils_use_with ipp)
+               $(cmake-utils_use_with java)
+               $(cmake-utils_use_with jpeg2k JASPER)
+               $(cmake-utils_use_with jpeg)
+               $(cmake-utils_use_with opencl)
+       #       $(cmake-utils_use_with opencl OPENCLAMDFFT)
+       #       $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+               $(cmake-utils_use_with openexr)
+               $(cmake-utils_use_with opengl)
+               $(cmake-utils_use_with openmp)
+               -DWITH_OPENNI=OFF                                       # not packaged
+               $(cmake-utils_use_with png)
+               $(cmake-utils_use_build python opencv_python)
+               -DWITH_PVAPI=OFF                                        # not packaged
+               -DWITH_QUICKTIME=OFF
+               $(cmake-utils_use_with threads TBB)
+               $(cmake-utils_use_with tiff)
+               -DWITH_UNICAP=OFF                                       # not packaged
+               $(cmake-utils_use_with v4l V4L)
+               $(cmake-utils_use_with vtk VTK)
+               -DWITH_LIBV4L=ON
+               -DWITH_VIDEOINPUT=OFF                                   # windows only
+               -DWITH_XIMEA=OFF                                        # windows only
+               $(cmake-utils_use_with xine)
+       # the build components
+               -DBUILD_SHARED_LIBS=ON
+               -DBUILD_ANDROID_EXAMPLES=OFF
+               $(cmake-utils_use_build doc DOCS)
+               $(cmake-utils_use_build examples)
+               -DBUILD_PERF_TESTS=OFF
+               $(cmake-utils_use_build testprograms TESTS)
+       # install examples, tests etc
+               $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+               $(cmake-utils_use testprograms INSTALL_TESTS)
+       # build options
+               $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+               -DENABLE_OMIT_FRAME_POINTER=OFF                         #
+               -DENABLE_FAST_MATH=OFF                                  #
+               -DENABLE_SSE=OFF                                        # these options do nothing but
+               -DENABLE_SSE2=OFF                                       # add params to CFLAGS
+               -DENABLE_SSE3=OFF
+               -DENABLE_SSSE3=OFF
+               -DENABLE_SSE41=OFF
+               -DENABLE_SSE42=OFF
+               -DOPENCV_EXTRA_FLAGS_RELEASE=""                         # black magic
+       )
+
+       if use qt4; then
+               mycmakeargs+=( "-DWITH_QT=4" )
+       else
+               mycmakeargs+=( "-DWITH_QT=OFF" )
+       fi
+
+       if use cuda; then
+               if [[ "$(gcc-version)" > "4.7" ]]; then
+                       ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
+                       mycmakeargs+=( "-DWITH_CUDA=OFF" )
+                       mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+                       mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+               else
+                       mycmakeargs+=( "-DWITH_CUDA=ON" )
+                       mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+                       mycmakeargs+=( "-DWITH_CUFFT=ON" )
+               fi
+       else
+               mycmakeargs+=( "-DWITH_CUDA=OFF" )
+               mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+               mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+       fi
+
+       if use examples && use python; then
+               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+       else
+               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+       fi
+
+       # things we want to be hard off or not yet figured out
+       mycmakeargs+=(
+               "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+               "-DBUILD_LATEX_DOCS=OFF"
+               "-DBUILD_PACKAGE=OFF"
+               "-DENABLE_PROFILING=OFF"
+       )
+
+       # things we want to be hard enabled not worth useflag
+       mycmakeargs+=(
+               "-DCMAKE_SKIP_RPATH=ON"
+               "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+       )
+
+       # hardcode cuda paths
+       mycmakeargs+=(
+               "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+       )
+
+       # workaround for bug 413429
+       tc-export CC CXX
+
+       cmake-utils_src_configure
+}