summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencv/ChangeLog5
-rw-r--r--media-libs/opencv/Manifest30
-rw-r--r--media-libs/opencv/opencv-3.0.0.ebuild3
3 files changed, 17 insertions, 21 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 95a3665d25ea..939ffdffbebb 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
# 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.131 2015/07/25 08:43:27 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.132 2015/08/06 09:21:03 amynka Exp $
+
+ 06 Aug 2015; Amy Winston <amynka@gentoo.org> opencv-3.0.0.ebuild:
+ Add dependency for qt5 bug #556376.
25 Jul 2015; Amy Winston <amynka@gentoo.org> opencv-2.4.10.ebuild,
opencv-2.4.9.ebuild, opencv-3.0.0.ebuild:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index e756db6b29da..3d29ed0bad56 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099 SHA512 b17466470a47876e1a8434367f47ce13ec989bdc35ec707d87188187e08b8ccca6af4c5563f20b3170758582b500323030cff22961a7fbbc6b4843d8bb808f1e WHIRLPOOL 5caf84c49efef118e1c90f6bd88237c6d91e9b37163248e5a6f6c135ae60f5f4f4328d83f061df2c4d5f81fdf68faa5b55828feaf67707956701c633614cc5fc
AUX opencv-2.4.10-pic-x86.patch 2036 SHA256 75db3a5f51264f65d5e294cff2329489a518d680559136fbf06ef25b77890ce6 SHA512 e1f0efe3a94e3be4331f82b65afc707a7e771f5f93fcd0816043daf13d830af2a4a0607915eab25b2dbe9becafe612d3e09d20d797cdb364fce35187dd899a6c WHIRLPOOL faff27d3e642a96b04294dc7126bb19494e34d740dee3955b8011edb60309060050bacfbe36dcd78a27b9243a7c37d8fde8d5e065ac8fc8941ec4fa12ab251e2
@@ -15,25 +15,17 @@ DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c294
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
EBUILD opencv-2.4.10.ebuild 6155 SHA256 7296a8472c31eb15cad2d0139b8929bd991771a68d56cf8887351eb53969ff48 SHA512 a148bb129a939a922c283e4b923063be27f457a890d208b3c14ca954e9b9ea10776af835081be0419df728cc17a5ca05d1e7a9b858899470d855ac96a5edd829 WHIRLPOOL 296ecc946d369384dc880dea9bbc08204a7dac984daaa3fe5dc89ba9148df7d3399603158620d0d529e9bf9d5de3e0dc21dd60da1e4cc49cc7e424f7bde8c875
EBUILD opencv-2.4.9.ebuild 6148 SHA256 3b2bec50d73e6fb6612f81d3c7e6bea6ea4560aed1101c91e02dfea58e0d18df SHA512 259d94d9d2f5990c5316535bc9ad1eb41df74666bf7cef8e561b03e8a05cfc824126ffe70b3f9bdac026c2aec50862b1df6d044ef398fb9a49c7e224e63a5de3 WHIRLPOOL 044419af14eb092b65cc07c4e35fe175f6eb4a4aa3c93193413d31601afc6791d4740429b6399bdb795895e9763f304b8ef41c3b9d9c15e27a392735335286b9
-EBUILD opencv-3.0.0.ebuild 5969 SHA256 93ec8b1d7a6fd041be1b4c74808e3aa84c284ab480281b6012baa2145ae77956 SHA512 545832b2e138d6edd98be62d8577187563edb8b349b24103d9401f15fab5343774a5aca6add0982ba57d32df84e7ebfa072caa4fbb975ff0a8b89cd6d17a00cc WHIRLPOOL 155df3b67aaf9d2f3f557c3354807395247591ccd1499a6c800bf4ff68cfb671a566277bb8974fb046fcf934fb75b9635436e92a5ffa2d511b25b3532835dd83
-MISC ChangeLog 21168 SHA256 d4460ca5b37dd66c626523ff54a398f4cc0c5c5a4752321161254537dda2d43c SHA512 70e9495d32737f3e1c87aa5e53567f942a28fbae1f9bdfd2a6babc18767151df21e5478a9da6a67158ac97279f59bd2831be5090dc1f8203acdd94bdaa27108f WHIRLPOOL 77e9c3ad1b3556552023fbe156d2791b06b949275a62816ede0e22ee6d4841952bacaeec6e0269ea098ca810d6447d2ff2f941315cb5db8e08acc0a3b2306158
+EBUILD opencv-3.0.0.ebuild 5993 SHA256 48aed5d653e9741679be1a3c6fcb6c127a269a1b246676459a89618e8f2d460a SHA512 35c31c133b5d306640ba6d6a5bad7cc2aed5a151fcad40d086298d04b5fd30f8cdbf617149168138ecd92d9d83733c38ba0e289c7ecfbd5f84fbeab33cabff93 WHIRLPOOL 7e0c9d73e4d5ccc6af066d8de72da7698b9c4dff0ddc1ad9d615749aa4da5f17b9b3fef457a39b2bc589aca9549f69c853a178323d8034935898d3c633d61eb8
+MISC ChangeLog 21275 SHA256 9d5de7197f2648bc03bc85cfa0837f1b9623623056b2ffdc2cab937024c5f8fe SHA512 3a919a75db6a02639f7f515f6bc136c78b30fe95ac2a54c3a11f24341ca56bc5e0072f696c9d08c2378c6719f13fc13d6724299f03a3c398c748573867678c7a WHIRLPOOL b6c575b9fe69e46cdbfee6f834fb6ac5e0bc66d0c537f096a95b8e46d2b340e57cc82f3dc08fda0da9eab34d372fa8aab60c4af90a1971509f740e31a3403758
MISC metadata.xml 1384 SHA256 c2dce5bde74ad9291964c3588412d0ae1c00ee9f82ddeb3cd9508c1892fb94c6 SHA512 0f919eefb9b4e534d536da88ee23837303f8eca6b7213766256b582c0e336098bb74d4a7df80c3d867e1276fd3408a5d8d31b8583e54bf6f48eb0ae51ea694bd WHIRLPOOL 106cff985b4a93b36b97512e610d3a67150640e5e99f27c03398f06f0b5e0a26c15c002e6ff774f411d4650ab156862ea1fc55c728e67706f55727bc21e237f3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
-iQJ8BAEBCgBmBQJVtgepXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDrkP/jAcOZ4rfuPYCAfocx2+SEVq
-MX3wCY2bTahooQW0jUEnaR9LZFRyzvnZkYPyyM2JDDOgpPF4/mAa37zmH4jiIGKN
-bIcCyQeUIYsr+x76KL6WupY9RBmfzE58NcU079fjHGMrSbIMLIJDXO8qaZ6Dy9JG
-Kv4AnfdjxpiwY9vzZdnLm2D/EYHvKDIR/h+V7wYWMK6BGJ/dLljffSxggr1FlxkZ
-DczKSWBPpPIqIqWUTlOucEp8p0X+8LGIihovhKm9yeIlby0R6D5HJKOEQRECWjwa
-zRCpvtEh+N719oOBkzuVDORdOWzS7SW4+GVZPhwMn0UdXP4h+jRXwZq9+/dWb/wk
-wm3S0BTPYbpO630ljyxAFjmwNEaUZZFPcX+w69xkONeo5gaxeSlyAkYmhtXpy2KA
-HZhihijARi19Eih/IxUI8saKmyPhr38trApPNMt5puvw7BPHeB6M3z2YJAGe1iBx
-5dRDMQw6JBjIV3tbN9uE5lf6z7nZ8qAnQ+eOEePYKDyrW+obZsPMEVjojWg7uRiJ
-BzUtYC3q+94Jynw05a+T2PWdMgtb+rMZAlRMuL/MTuAljj2WBQShbCN/cZcgvYKO
-VbQKmftxqZvXNQ+sqKPsnHpJgvPx7Mb4NQnUGfSt1ROE4VitfWfwM1bqGkj+cFng
-H1mb16KZj2pZEoe1McuX
-=t5wv
+iQEcBAEBCAAGBQJVwybjAAoJEDuJ1FA05peBeBsIANESde3x8COJabxqZhdCys4n
+vwI50UC+4Su5CoaXNT1+3C6IwT/k4s+6us0G7GS8/Wrza7lj61n1D5hXlP0GTisI
+DFsWqRJVBTENst7sIfFaPGZ93QtIDAPLss3MY/Lwku1PSiwxcrIKmQz3skjYXdi9
+EJ1mrpTqX776rUHD4WLhMbxiBQ+Kv2lsAYkoZMTxEDAr3aNVAVIvHk5f5INPYz0E
+2wZ9WVMjPbEYCJ4o0N+t8HOdIbKMlpTwv0jm7lfVgVqWTGCCTsIJzj5oCVqybBnw
++JaYlSkgzbzj3nck+l5T69k8WbDHuEbHrQNEDTr1EWV3EquHKwwV03rI9N7eukY=
+=2+RZ
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index 9e906abd9d60..e6e7a55cb182 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -1,6 +1,6 @@
# 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-3.0.0.ebuild,v 1.5 2015/07/25 08:43:27 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-3.0.0.ebuild,v 1.6 2015/08/06 09:21:03 amynka Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -69,6 +69,7 @@ RDEPEND="
qt5? (
dev-qt/qtgui:5
dev-qt/qttest:5
+ dev-qt/qtconcurrent:5
opengl? ( dev-qt/qtopengl:5 )
)
threads? ( dev-cpp/tbb )