1 |
commit: 0f5654f82e98598dd30b469567af75e003e07ff8 |
2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Tue Nov 29 22:44:05 2011 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 22:44:05 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0f5654f8 |
7 |
|
8 |
Resync with main tree |
9 |
|
10 |
(Portage version: 2.1.10.37/git/Linux x86_64, signed Manifest commit with key B6C5F7DE) |
11 |
|
12 |
--- |
13 |
media-libs/opencv/ChangeLog | 4 ++ |
14 |
media-libs/opencv/Manifest | 31 ++++++++++--------- |
15 |
.../opencv/files/opencv-2.3.1a-libav-0.7.patch | 10 ++++++ |
16 |
media-libs/opencv/opencv-2.3.1a.ebuild | 3 +- |
17 |
4 files changed, 32 insertions(+), 16 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog |
20 |
index 02d4a19..8eed7ea 100644 |
21 |
--- a/media-libs/opencv/ChangeLog |
22 |
+++ b/media-libs/opencv/ChangeLog |
23 |
@@ -2,6 +2,10 @@ |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $ |
26 |
|
27 |
+ 29 Nov 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.1a.ebuild, |
28 |
+ +files/opencv-2.3.1a-libav-0.7.patch: |
29 |
+ Resync with main tree |
30 |
+ |
31 |
13 Nov 2011; Andreas K. Huettel <dilfridge@g.o> opencv-2.3.1a.ebuild, |
32 |
files/opencv-2.3.1a-convert_sets_to_options.patch, |
33 |
+files/opencv-2.3.1a-libsuffix.patch, +files/opencv-2.3.1a-nocaps.patch: |
34 |
|
35 |
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest |
36 |
index 70fa480..62d0198 100644 |
37 |
--- a/media-libs/opencv/Manifest |
38 |
+++ b/media-libs/opencv/Manifest |
39 |
@@ -22,6 +22,7 @@ AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb2 |
40 |
AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378 |
41 |
AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448 |
42 |
AUX opencv-2.3.1a-convert_sets_to_options.patch 9798 RMD160 6265ae4e223def1b5e199f665c740951bdabc78e SHA1 64142f43079ef5d5a4cf91f8ad58f9a744ea6de9 SHA256 fef051756bac47ec68fed3468a5d7d339ab21ae325a21482554f34f9b19f1e08 |
43 |
+AUX opencv-2.3.1a-libav-0.7.patch 415 RMD160 cc9ae832bb72e0ecb09ad25356cb6bcc9ee5e084 SHA1 b1021d451c0949edd0da8dd05c88e2a433c33bbb SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099 |
44 |
AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be186141e SHA1 7dc609754bbf0de85e0b48ff4622b80b9a70f4c7 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44 |
45 |
AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207 |
46 |
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f |
47 |
@@ -33,23 +34,23 @@ EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb |
48 |
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc |
49 |
EBUILD opencv-2.3.0-r1.ebuild 4195 RMD160 46b13021e73b963663d136602ef024bbff53e080 SHA1 047df422d2f2d622ba55cb0efc03cccec31d8d00 SHA256 588aa6f79a4aa89af558cd9e527a341836b079c6e69886620baa280c8e307ff7 |
50 |
EBUILD opencv-2.3.0.ebuild 4147 RMD160 e554d1fd86ab5c143f6249bf5d33b75397a1cbf8 SHA1 f6166a850f807e40ee7e879145584eb746d6f8b8 SHA256 db1dfb92e5006f4bb8f0b4ea7297ad8bd22f1191e2a5f5e9444747790b22b7f7 |
51 |
-EBUILD opencv-2.3.1a.ebuild 4147 RMD160 7c2286a36878004567cd0026b9b2ac93805da650 SHA1 76f7bdf339f766b755aeb78ecb660654f25dc520 SHA256 000adcefd886d5e02334851cb9aa1a7e100df20d41ff016257ba4729ed0ff1a6 |
52 |
-MISC ChangeLog 9251 RMD160 4c4d4f092c915b5f6485a87de366d020f566f9a7 SHA1 541e7225fcafa0ef3bb3e3ebcd4d1360811744c5 SHA256 177456ce6a5dc8acbc8ecd5b05286e388e80fde1579040c8d1acac1f6c10806e |
53 |
+EBUILD opencv-2.3.1a.ebuild 4179 RMD160 0ba8dbaa4ac15f06ac41fdd76cf8ae41ace4bb03 SHA1 dd2e9163aee5e402154eaae66a410c175e8c4dca SHA256 44497a217fe2cee268c51e1341ee0e1daff5b5a8fe7aa7cbc3c2be1c163896f8 |
54 |
+MISC ChangeLog 9395 RMD160 25a6765d81f73c7d25c6bf53852881dfe833aa43 SHA1 047c741ec1ab0b9680d6ed791f0882bcb555ebcb SHA256 97a6879854c5223107dbd4b4a1a2a1e93c55f0fb186a500505cc1fd0a8da538c |
55 |
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 |
56 |
-----BEGIN PGP SIGNATURE----- |
57 |
Version: GnuPG v2.0.17 (GNU/Linux) |
58 |
|
59 |
-iQIcBAEBCgAGBQJOv8pzAAoJEEb+UGWnxTyH2boQAJ8vSIVVSqA8ZKXtjDRBi9J/ |
60 |
-bpJF+G3PuUU/d4ilXDBYZ5Nqlbj80/SfAvhTNfxE1XRRwCAFw3nVPElolDgo+ywF |
61 |
-Odn7zHFS6YBzDSkNAcqZ6XX+02jMjy5AyUPCQEsIdXdWOIcBohYeeCyCKBxx4c+U |
62 |
-KhgPm75Dj11mLS6+XYqJA8mU2FDT+xfrI5gXeD/DxJbm+/GTDIab/1FYf97hOlbd |
63 |
-jK8IyV963jnMU96QX+JavuVwXNxGH0GSiBAdS1m2Tk6aektXxceCc+PG4+bM1vlp |
64 |
-/H6Xhw7P7PC7SCaqiWVCBQFMnSUKz77SVyNJmqvQ7MfegLiOj8xtJcZp0bWrjoHU |
65 |
-1CVP8REYJpRU9JpLq4yFXwWlj+4F6YiBqVfBND5Ti2LiyhsJI7NwvY2SAD/cVJKi |
66 |
-Jd489DokqR8jmHaCCIqbEhBuUADKjfz3NGrnK7UB9CL2CnHMVBWz3FWIsNf/qZJb |
67 |
-PCmr2eHpYuVE7lN/hOMZdzoLaBtJKeFQV/xVg+lc+Y02ygBoIFA0mbA6kUZ4h3Jc |
68 |
-JUNgSJs6d5ITw2FTpPayVs95kHVSVoCYQr5DPVrH9jZlirzHnjyWdQhgC8pkSph4 |
69 |
-RXADKqpJCS2Ce8Kh5Fvf1TrTqbN5HHczTJuiXRCVxkO3Q4BPf7sTNWckmCM3900h |
70 |
-f5Nfs9W7s9voDZy8r9Rg |
71 |
-=lyAB |
72 |
+iQIcBAEBCgAGBQJO1WA1AAoJENwGBM22xffeR6wP/R74YpBAZCsFc/JqGVKI9i1G |
73 |
+6rbvaUhy/gQ+PXtVOUTB3AS9A1wMiIKEmZDzIgF2wrYONfFajvyUPmL4XBQUZ3br |
74 |
+og1cd6g3ycTy38XDKkc4lEDsJQmdA3hGey9zBmo6mX/czJWTRK+9Tra0MyPoyvts |
75 |
+pSTzEMk7oewbBmmpZ3X+S2DUryYMfglX012tu0N8dBaR/IJKrSmUjK7g4ptO8IFN |
76 |
+vjMyW6ob7g8AaNxT/Yq7QnTNmJxaNfUA6KQ1EkWSCCGGSULOa7NPBEa63v9z6sFs |
77 |
+vDtQnUMRJXlqv6ziUhZIF3LPwJd14HRv90O69PhRTL0m3GrDxX8bxxL0Ehn9qOrE |
78 |
+gMDHUce7rNdrMV3ptRMgS5rvc3JzBjoeQT8QL0cSmxb2YMzY6lZ0KhH+suhVzgFu |
79 |
+Bu4Fd5usIsMuRi7ADkfdZSlBeH4gyVbc8aMERir719Sr9Rlt2o1aaAR+1kGRhg1x |
80 |
+jfpqIvrbj5J6GsrfWL+TzhBU2jx92t+iQjResWTQNiZ2iZI4Ex+4eCx+1jbinHWe |
81 |
+66A417TEXpsShCUkAjZKGNfFEwUL2k4kyjQWAbIWK3n5E6mSia3lOuhcynyQElTR |
82 |
+xQ5cnSDu3f9UHaYs/6Tys5RKC2e0if/vYcoeTmiJT6mkn1EzRqNPFbLQ515p8j1Q |
83 |
+UF8zTCUCYs/IjV/txM92 |
84 |
+=EOEX |
85 |
-----END PGP SIGNATURE----- |
86 |
|
87 |
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch |
88 |
new file mode 100644 |
89 |
index 0000000..5909070 |
90 |
--- /dev/null |
91 |
+++ b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch |
92 |
@@ -0,0 +1,10 @@ |
93 |
+--- OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:37.000000000 +0100 |
94 |
++++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-11-14 05:33:18.000000000 +0100 |
95 |
+@@ -104,6 +104,7 @@ |
96 |
+ #endif |
97 |
+ #if defined(HAVE_LIBAVCODEC_AVCODEC_H) |
98 |
+ #include <libavcodec/avcodec.h> |
99 |
++ #include <libavutil/mathematics.h> |
100 |
+ #endif |
101 |
+ #if defined(HAVE_LIBSWSCALE_SWSCALE_H) |
102 |
+ #include <libswscale/swscale.h> |
103 |
|
104 |
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild |
105 |
index e895b86..b30e15a 100644 |
106 |
--- a/media-libs/opencv/opencv-2.3.1a.ebuild |
107 |
+++ b/media-libs/opencv/opencv-2.3.1a.ebuild |
108 |
@@ -1,6 +1,6 @@ |
109 |
# Copyright 1999-2011 Gentoo Foundation |
110 |
# Distributed under the terms of the GNU General Public License v2 |
111 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0-r1.ebuild,v 1.3 2011/10/15 14:29:46 ssuominen Exp $ |
112 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.3 2011/11/14 04:53:45 lu_zero Exp $ |
113 |
|
114 |
EAPI=3 |
115 |
|
116 |
@@ -61,6 +61,7 @@ PATCHES=( |
117 |
"${FILESDIR}/${P}-convert_sets_to_options.patch" |
118 |
"${FILESDIR}/${P}-libsuffix.patch" |
119 |
"${FILESDIR}/${P}-nocaps.patch" |
120 |
+ "${FILESDIR}/${P}-libav-0.7.patch" |
121 |
) |
122 |
|
123 |
CMAKE_BUILD_TYPE="Release" |