| 1 |
commit: 914ef4d7983a4a73f270afaeb6cd7a9c5b21c03a |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 18 18:42:32 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 18 18:42:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=914ef4d7 |
| 7 |
|
| 8 |
Flann is more and more integrated, not worth patching it out imho |
| 9 |
|
| 10 |
(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key 7887F787) |
| 11 |
|
| 12 |
--- |
| 13 |
media-libs/opencv/ChangeLog | 4 ++++ |
| 14 |
media-libs/opencv/Manifest | 32 ++++++++++++++++---------------- |
| 15 |
media-libs/opencv/opencv-2.3.0.ebuild | 1 - |
| 16 |
media-libs/opencv/todo.txt | 2 -- |
| 17 |
4 files changed, 20 insertions(+), 19 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog |
| 20 |
index 78aba60..87fa48d 100644 |
| 21 |
--- a/media-libs/opencv/ChangeLog |
| 22 |
+++ b/media-libs/opencv/ChangeLog |
| 23 |
@@ -3,6 +3,10 @@ |
| 24 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $ |
| 25 |
|
| 26 |
18 Sep 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.0.ebuild, |
| 27 |
+ todo.txt: |
| 28 |
+ Flann is more and more integrated, not worth patching it out imho |
| 29 |
+ |
| 30 |
+ 18 Sep 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.0.ebuild, |
| 31 |
+files/opencv-2.3.0-ffmpeg.patch, todo.txt: |
| 32 |
Ported the ffmpeg patch |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest |
| 36 |
index aad3f0c..a1efd9f 100644 |
| 37 |
--- a/media-libs/opencv/Manifest |
| 38 |
+++ b/media-libs/opencv/Manifest |
| 39 |
@@ -26,25 +26,25 @@ DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81 |
| 40 |
EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f |
| 41 |
EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7 |
| 42 |
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc |
| 43 |
-EBUILD opencv-2.3.0.ebuild 4113 RMD160 0cef49e16f56bc18c1b367105d5233b250d15f85 SHA1 2544dbf1664a6d509e0fc40251f59c02adb65bb5 SHA256 7eb3713d83e79fea7cd1c1a699005b77974e1f6232e595818683d124037a9d45 |
| 44 |
-MISC ChangeLog 8177 RMD160 c8ac1a1b433706781e3379a49893464d137c62e1 SHA1 418b1d2a0dcbe13cba7cfca52b32c51fb7f8e593 SHA256 ce54b19e69bc494c84c5d11f0e4bac0e38ab053d1f193906136a946c7d1448db |
| 45 |
+EBUILD opencv-2.3.0.ebuild 4097 RMD160 20bbbf8a7d11422ac502ee02cd71982eb154c87c SHA1 a75a8e8971354218e129ede6375f443b8f8c02e6 SHA256 c9574b85c274f51a7eb570f4cd2a75ed8a75318df7c6799d2bdb157ad5f7bd8d |
| 46 |
+MISC ChangeLog 8336 RMD160 3e0340c271a5559950e0a831b7625e5e08080769 SHA1 d85a91d178f6264692eb95322f598f3fba7b2078 SHA256 52cb33b7b453cadee29475964ec25ffc0abf3cee5a804252c1a86edeb7f2612c |
| 47 |
MISC files.txt 8003 RMD160 379913921e732f45f0a6b5c8ba43100379b45406 SHA1 7fa828e529e2381f6ae50dc7f62168afe38e7bd5 SHA256 11971a7b7d61adad4da7e26c8312118629e5fa61161f2c3e2f79419f137aa8f2 |
| 48 |
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 |
| 49 |
-MISC todo.txt 134 RMD160 0a9994311d9446ee0437f5558a530c8480c8fd08 SHA1 1ede24c3f222f617f1895864752bd201608ed699 SHA256 89b382e4b13b9db752bb3afd6783be59f95af4a5bee44158036ae1773801515a |
| 50 |
+MISC todo.txt 95 RMD160 c3d402c54445a62c5547e60fab95f032545177b6 SHA1 3fefad7ed7d2377c6d11de3a8a524b9de628bf3a SHA256 74bae1c6b0b24bd57f44c3476186dd73a3041e39e80a509541a57dc689d26b5a |
| 51 |
-----BEGIN PGP SIGNATURE----- |
| 52 |
Version: GnuPG v2.0.17 (GNU/Linux) |
| 53 |
|
| 54 |
-iQIcBAEBCgAGBQJOdjo/AAoJEEb+UGWnxTyHFY8QAL7k4jHHGeYoiBrg0cBWSits |
| 55 |
-qh1G21F12CpbxdgMgVoA8M9ntQ455aFjbMMWI4Ire2fSWOHyCbDe/ft+f47ta/a4 |
| 56 |
-q3OTflSRrZpl+aNaAI5/va9VcTXQmvunNgR1/PxOr1VKQnwCd7YUJrhmo6p2cDHs |
| 57 |
-9W6M56uqLhtxG88D8STlL+vtgwycTWPOFoDLVet6tQVlcTq2t+k92WKfwoJV8ZjQ |
| 58 |
-d1Px7XlDdRd/LML15xJD5RSwa4RdeaIwWMTPyTcOMkvKbSQuqwYjkY+oNQrrQB9x |
| 59 |
-QXjwCElP3qsXFizqv0Yjs+RGtEpsstuGDUq542YfxGpFEeePnlJWzCP6xl7L9D8W |
| 60 |
-sNSy19IABCmrkosApM69nML3UcdoK8nPazjS6gEAm7aZrOozi6amt4RO8VR6///v |
| 61 |
-75dUKBzfTQ6KqQFGxkQRIUWDtZ7KCSnqob/N78pcYXwDB1jxOCbA1lN+SJl49IIb |
| 62 |
-V8d4szjTLEZVeXKCCi5kviox6Keu8/QCHdIo7LySkJcA5Hi7RsfS/yq//7KBycdb |
| 63 |
-jda1TdGOugJlyOXzNiEbLgPj66ltw67ntttQ22+H16GF4cgCygyVHjELE4sjzOgG |
| 64 |
-qNu5Ylr+WRGH3fVJoqphFdpKwUcdoR2OOM0YHEuK30zZ2q3AomsZKMxk9jKesIra |
| 65 |
-j7Eg4AEKM6Fut7v130Li |
| 66 |
-=jcT6 |
| 67 |
+iQIcBAEBCgAGBQJOdjuYAAoJEEb+UGWnxTyHV7MP/iIpTFOWiE3iSm+tel9ZPuS/ |
| 68 |
+l7SFpYxKTuvLNwetRhZFei/xliNApPcYHUKzndlaZC7ZUEBMrByosfoeZZQnjb5i |
| 69 |
+LZ2EtOEEmVk52+ERX1RZ6Vw1c0r+1KmqZH5Zdxyqf9v4b00q71lOWwNJemd3caEL |
| 70 |
+qaN2QxKcLeZ8yRFR3W3LMwp4306EYQTbJQTLF1MCg/m5IFVhaCzeU9qo5Gs+NTJj |
| 71 |
+9pxDhSluKnW6pqJCTAQABMxfoZY1Fzyk1JLMKaEf8xuAhv8BPxChdSJdg88pRUEM |
| 72 |
+2xAbjU667TfTGsx0RSitbZGS+1AL2RYuqGsf7AUZTTINoC/Z5LLinFI2P/9XtufF |
| 73 |
+GF9eSd+XUNHfGR+qlEqlIaFfyeBjmUYGO48jHuzZDhhAzIgwEgGhjIcovie7Y/3s |
| 74 |
+tTLsjjEZmF6odQHWr+PRcUEoMRmEW9bm0/FScTkqB6hHR0OYRglHdShUlAwaw/WJ |
| 75 |
+PpGv7uqqtYbOL0cRXBEptnvEV7vQo3MuY9OA/qCcUqoMPvrobYD+8Hj8yDCPUuNQ |
| 76 |
+KFyeFhGOm7VhT+JDb129PXUknFip8y9dFmhxoawMefjbKetgV8NPDhnAcTkdiDN/ |
| 77 |
+NRtkSLtYWCbwxM/EIiqJcVIpYqNs6Atjvmo1pQsoHmlSoYvXyerZ2OuaYYDsXTFu |
| 78 |
+or1d/ElzGeXqdV8yEYV6 |
| 79 |
+=gsLg |
| 80 |
-----END PGP SIGNATURE----- |
| 81 |
|
| 82 |
diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild |
| 83 |
index fc126af..7fa7b64 100644 |
| 84 |
--- a/media-libs/opencv/opencv-2.3.0.ebuild |
| 85 |
+++ b/media-libs/opencv/opencv-2.3.0.ebuild |
| 86 |
@@ -25,7 +25,6 @@ RESTRICT=test |
| 87 |
RDEPEND=" |
| 88 |
app-arch/bzip2 |
| 89 |
sys-libs/zlib |
| 90 |
- sci-libs/flann |
| 91 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) |
| 92 |
eigen? ( dev-cpp/eigen:2 ) |
| 93 |
ffmpeg? ( virtual/ffmpeg ) |
| 94 |
|
| 95 |
diff --git a/media-libs/opencv/todo.txt b/media-libs/opencv/todo.txt |
| 96 |
index cf7a635..0897da2 100644 |
| 97 |
--- a/media-libs/opencv/todo.txt |
| 98 |
+++ b/media-libs/opencv/todo.txt |
| 99 |
@@ -3,8 +3,6 @@ TODO |
| 100 |
|
| 101 |
* send the set-to-option conversion upstream |
| 102 |
|
| 103 |
-* try to unbundle flann again cleanly |
| 104 |
- |
| 105 |
* test building against new cuda |
| 106 |
|
| 107 |
:| |
Archives