Version bump. Fixed compilation with >=media-video/ffmpeg-2 and >=media-video/libav-9 (bug #443206)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 541 insertions, 9 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 274384eaecce..3bd3f0966ae5 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.100 2014/04/03 10:10:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.101 2014/04/29 09:02:05 polynomial-c Exp $
+
+*opal-3.10.11 (29 Apr 2014)
+
+  29 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> +opal-3.10.11.ebuild,
+  +files/opal-3.10.11-libav9-gentoo.patch:
+  Version bump. Fixed compilation with >=media-video/ffmpeg-2 and
+  >=media-video/libav-9 (bug #443206).
 
   03 Apr 2014; Tom Wijsman <TomWij@gentoo.org> opal-3.10.10.ebuild,
   opal-3.6.8-r2.ebuild:
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 46b49059f6dd..8c7ad3ab0d08 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX opal-2.1.1-notrace.diff 263 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0 SHA512 279ebd4821af25ba1ef795aad66d1ae20489337ab2d78c174b4caa4dbbf02b4f8c7f6fdc5e2822e1c6441e2850d0924f108dcaf06beaf238be58b44daee91b71 WHIRLPOOL b71b6bf51eda7d9a5c24a9bcff85c41c3017e92c6be4f1fed5022ccbfac0ea0f3b66a4cc9b501810b5e342b8f8cf8110c698deca9ed71661a3f5fe40184040da
+AUX opal-3.10.11-libav9-gentoo.patch 8068 SHA256 d48e23242c1d588bdb75277697a8ad8e69513dd2c9588b18065ba92885e072af SHA512 b99d9c91bed8537d12b145053e7796e2acbb42a99bb6d415a5a02dbfc6a37e26582d076e92a032ee537071cf367e9dae3af5aa2819a1a715d062a5256665a1d2 WHIRLPOOL 3ed367fc41bb6b6c0447dbadac53d889ca5d76aa826ea682f153213c07cff062140b6d8dedff9126b07f061c8bf70b9bfb96a0bf8680638132714d18679faad4
 AUX opal-3.10.9-avoid_cflags_mixup.patch 5378 SHA256 80a41d81a1caeaee31c43c7b71bac9943692eed3e6a5f7f5c4a1bf837cd391e7 SHA512 fdc6b52db3bd299d2235ebdb917921d3c9d01a03ffed65e8e4b833e66da21bde4c1497740a38a41f3d7393a6c65969a64587612a11c9590904b66c9fb86e1e7e WHIRLPOOL fc1d97a7180d50748b521cb345b58487e2183506b68d5d952f004d3f382cd77171b222187fa4bd92510026781012d601c23ec23f5df8023ad3e9ec73c5e98b0c
 AUX opal-3.10.9-disable-h323-workaround.patch 498 SHA256 b1d943f7eb33c1828bf5a086abe1256dac55ce7f9a9cd16cbe9fa72b00d7ede2 SHA512 58e8ef12c39bce3a4d386b2b6033e1e242852bbf78371c58e91bd020cfcd95b40a9831db91fa76da431a9f8c4bb40c846b420e3a462dad77658a37c2281a9d39 WHIRLPOOL 6c590b837ebdcb11491aa3b9759d6c7e5930aa07d294bcfd473327f37866df97400bf1de588da853b6c807a233c23388359ac5a1e27c05ae1d4cc361585b98ae
 AUX opal-3.10.9-ffmpeg.patch 7084 SHA256 194a95dbb0905f37c6778f628baddc962249c6cbc0b000197ebd8233b1d9c6ad SHA512 109c41fd92793bafdbbf066d5f7e33175be4034fe2a1ce2bd1df8f569e86101d04617151df851025da17c7b46bb345022200990c36bbb47f940afcea306a6701 WHIRLPOOL adb1f24df323f85ea9be1349ce238705cfa656137f96fcd7a45278e4aebfd774f70c8b38e9efa05576fb6be460e32af90ec7e5666ab2050986c959c75b6551fb
@@ -16,6 +17,8 @@ AUX opal-3.6.8-ldflags.patch 7345 SHA256 c7ecb726688eadbb24d09238c86de8874edc488
 AUX opal-3.6.8-lid-plugins-ldflags.patch 1146 SHA256 d4c8662afa93b5651f132280edd56ab87253ce91b829cfeff6ac0f322dffbd9b SHA512 ac10efaaa1323ea6f0fdcf54f46fb1a7c6c0c5f3c3d2e7f96ce19a9fe37105d1799842b7dcee07d64b4dca96bc852b80acd6c4d6af380757ec128c1f9c288390 WHIRLPOOL 97fab41a4c5b1c5a36933f154d4aa1b2c6d16ed9d90a7e9bba23850df503164641540a118b2379718c0572ee187c4f4e331051f7fd75df3804c66dcc74824cb9
 DIST opal-3.10.10-htmldoc.tar.bz2 3164570 SHA256 3f535ced87022e2ef53598d79611b3ab1a95f8336b36f8529d0aa9a960e37a62 SHA512 ac39b6ef3228b0b27ffce54a72c0af37612ff9e28c0a6e80ab78decadc7192360cb91793b9397dbbc5553343352856ffc85d8607990654369fbebd40ad8113b8 WHIRLPOOL efec7a3ad777d6e0ab49fbdc2cdf936d019298f144546bf7e17a694276c7b1466177c314f722112ab1573634377bdb3bc0cb4a966184f0a13c6992ae853dc41b
 DIST opal-3.10.10.tar.bz2 8592083 SHA256 95f1ad3a823d58b3fa945f40b2a50cc5f2ccd5c376bf2a1e624f4013f2473801 SHA512 b279c78dc8c88d113f0a146013c3a57c13d9d01c511ed3df7496f296b88157a59178cd72b8ed61d61198685ebd74dafa139f1c3952cf5aca47f4dec9a52ceddb WHIRLPOOL 12ee687263156eb3151a91bf36a3b0c0acb7ac7c4cc04eddf8fc9fb60c6121433727d007bb78beaa7bda3285c3384ee8f9de9e36c6c354c0decca1d6263342dd
+DIST opal-3.10.11-htmldoc.tar.bz2 2944338 SHA256 66708e69f1bea6a1160f3aa904643f49b2e2679822c1446d5aeb1f29dd973cea SHA512 6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5 WHIRLPOOL a23aafd7da85d00db2c285641ab75f1c0850c6eaaaa649c8278891282d86312d062be7ac4d89ec3955eac11eb91c018c7b05a89282b35f1b129af90f36e34033
+DIST opal-3.10.11.tar.bz2 8590616 SHA256 f38e7969e88a28dd9a10a6051315aceecde79d0bbd1a35676868dc5787aed706 SHA512 970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1 WHIRLPOOL b4387f8a664c2763f1e62dc16772ce869dee6d5aaac271ef0013d1e7f207d19c5e3578c26215ce246c278bc4de9aa538dabae8a3b6a794b250a5f30f9be7d206
 DIST opal-3.10.9-htmldoc.tar.bz2 3163056 SHA256 c7d2b66415cdcc0544e92dfefdbe0cc03b37e498410e3ea524941f1b7080d6d8 SHA512 7c3f959dbf6b8622b4e36c050e6e66fbfd527d5ce852b441dc0325e74e0f622d025225dc0619d08d2bb3afafe434206a82b52dd52a1ae943dcc12efc8719292e WHIRLPOOL e5c7e7af60523935b255b578369231fe510a27137e58d894377728ff9e69230bbcde4d88cb0b60681480279087c1bf5fe4c69a5b947c387deb3a0b9f4f879da1
 DIST opal-3.10.9.tar.bz2 8591506 SHA256 f6a1c380df5c82c24ff6cc82c5c6a94868b112d5914395ad8265e30b0005bf2e SHA512 11e67bbbb7903aa176c0563d48c444d6c3df399dc9f1c7cf1ff9124a96fd719e5608d0e091346de3aa2087e04d28116b14c2c60bb92f2fc83584695e2e61ebcc WHIRLPOOL 5790274802f909f428950d3c249abcdfae03f5046381b631c25c7ccc23a34efd07bfd26d77de755741b786ed69cac8c411d7ec9e70286c828595eac4e00d8c4c
 DIST opal-3.12.4-htmldoc.tar.bz2 3094840 SHA256 858cd14bf2de54a6aeb5397d8627a7e50ea6b63e18b0f47c057386d079b07fbc SHA512 c80ed1b0df9fffbfc07ea590a0e80afd9b985ed2971deb640e92776723f12e6a544eaf3441261d34df0ad0bbca6b03a983f7a7b0b92fbf333f1a8688d2ca735d WHIRLPOOL e2d5ba8e4429c60003dd995add2aea12b22a2f23da8dd3ed0025fa451752412805d4f25160809542dd8d61684edca35d73174037650b3546cedc97495faa29b9
@@ -23,19 +26,26 @@ DIST opal-3.12.4.tar.bz2 9694052 SHA256 2786bc27f83c59d74165e318656ada230164ebcb
 DIST opal-3.6.7-htmldoc.tar.bz2 5842269 SHA256 d6c11b162b4b26cfc3df2c2c12b5d8a0e1b2dfa5c6869995b0fafa2f2a716e7b
 DIST opal-3.6.8.tar.bz2 6837993 SHA256 8cbfabb33e5c5563fdafacf1adde536c78638d6d020fae496a52e19e2be6a90c SHA512 bc9ce66af9fc7a82fc33403139f138d732b4f3e013b91b711533572036f0d965b19961aa1dcec63efb0ed906e7525eebc972cd106e6011e40d80ae0a0b7e8a51 WHIRLPOOL 031a98a0e0e6c6b51271898cf836dc805a7341b04f018a6604560572054e00402f1cf092d2a8828ba476ba1bb0331cbd34e7bd2b078ecd3cd0a3b51b7adbd5d5
 EBUILD opal-3.10.10.ebuild 7575 SHA256 97aaa8326679e412531c2f6942dda02d63300910a8fb40ecc657af361a77af5e SHA512 a932e59c0d2b31d829be3d7abf007e26e0a201157dae4924d16807a8dba901b6e285e1c6eb5f5814a1acbe696a0cc78a183ff16a635da9f2324710d537137eb0 WHIRLPOOL 3aa5ed1ff207b3ade0328dfb7bb80ee8fb47a78d01a03a974f2feaaf1700545eb84ae2043b19ef2dab6d6a2466f0601d801516ce79575edfddbf3abc4b413a39
+EBUILD opal-3.10.11.ebuild 7626 SHA256 480ce9be7e942466469ef5da3f2d7faa61e212b3fa4827e94c49419929023c7a SHA512 cfdd4ebcfdd679f85dbf2adeb9308c1c0c7549126feeda9be8da9a3aeec0613a4a0688778603a36f8d8231554bd44f4b0ab142e6e2c87ea6588ed2f2faa1642e WHIRLPOOL efe22213283a3bf2784af1dafdb858dafcc4f2f0e8680daf57cc602e3cb6ac764fb5c56f5ac0ae5a46291965c0e897d2184194f292af909a655a4b4da00b93eb
 EBUILD opal-3.10.9.ebuild 7499 SHA256 a848325025549d7d03120018307c932d56e49d4b4f69241dc2d6f08da01d2a87 SHA512 2ec660c2e210439aee9d07dbe963aee0352c724d791244d3deaa0209a9e01cd6a8eae01ffda543ffed6879b0fffa5dceb4822f127278f8b67e405283dca4868e WHIRLPOOL 8983c174c7864b50ee4d523d41d7bf34ef5c0ba4efbc11367f236a6b7f8171a8031df8597eb954487ff8ef1547a1557394252cdb52f85f74a6e8a77b9e5e35f6
 EBUILD opal-3.12.4.ebuild 7038 SHA256 efeeb3db5056c1df69fbccd2fa97d214d5cb257e72fa3617c9a7dcb94fdf504c SHA512 4b0951eaadf2ecb50481510eb81e3ab1188f0206ab85528ce5e449efbf66974bd6dd2b9304753d7da2e2c70572401f176d270b63b4c9ebdc7412d73fc401403a WHIRLPOOL 882d5838d030d128d6fcb39cc7754eb0120a5f8b2594929f016041c2fa4272318d241d78146b5acdf7c54564c896778a853cd9621aa21db1d53995e4cfa93165
 EBUILD opal-3.6.8-r2.ebuild 8585 SHA256 c6c1ef36127128af903bab827af9461a9356f6b9d142c85983ccc1534abbb615 SHA512 8e48150a179a5cbdba9fc9bb5802057727d11929f84ebe6e9e6fe9299dde2d53a8c4bb8f23d5d5a333c96d2056e1d44240c32a25b6fd03fcd08134356f297c34 WHIRLPOOL c7ce0b8f6d64eb62e8681651d90efe85a26351403fadd43c1a474df3dbfb8c641e92986900d6b79ea524aaeaf3a256c902a41d09355e38b0e074ad933bf3c605
-MISC ChangeLog 14860 SHA256 b2e4dae3e7a7ba16a2b96dd8a54d90ac946c1bd39f5f34ac76fa250c7e786d08 SHA512 1fb0acbed5f44480d5464d8ce51b2c6186a16801090e1abcafddf28b12f2a53cdf117d8d9b06d4310056b82a8e0b9e5aeb474e6caf9cec20c316e2e37dccf54d WHIRLPOOL d9ea3425498e647d4c97043bba8c4772219db8171bc249c1777fb4dd2acccbfc0c64bd5064fda420e005a15939a59ad5d9b1bad08005005dd5021f2ef138931e
+MISC ChangeLog 15120 SHA256 e5c7a3ff49aee47ea3c46d8feb47dd39d640083563131541739a66cb246c6105 SHA512 8c6a7b1301007a0583614c96fd2f501afd24c9969978d87290f4b800548f36f82cd76ac1176eac8d8904000e55b69e0bf7c4432300248e7c39b7f14c1aff22fb WHIRLPOOL 553bdf437993c7683bab14f02e4298f49bd86cac5df4a8e5fd65a528b86622960d121fd7c2c9d4fbb6a8eafc6b8d8db7c433293691bcfbf18bb47812b6fd5d96
 MISC metadata.xml 1983 SHA256 f969f663ec04d6d49561f82dcee92da943f4ac35c9db43e61e0e6475837e73e5 SHA512 91798e7a3581515ecb1beea68c5021e3dc9674792d695e46181b2dc055968ff06536a7e0a7a4c39015f330b4d7132df7c405a20e467f1ff753292f8b3d62fe76 WHIRLPOOL e9d062f3d78057bee270f365187212bede3b1906e74aaf7498fd3bcbd2133813b7f7cfbf01e791fa11e031771f6c1d44f4041431d45729ea38b584815ca86072
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPTNyAAoJEJWyH81tNOV9WncIAJY8VEMQUpJ1vF6ql6g9Osca
-v7KNvCNj1d45m0Twhx4Fd/jpMZhx72ClSpOJWkntjAOgry4xlSxVyMLBXsdtmtoF
-Hw0JMvqP3gm9ynsmDFVpelrKNKedzYazRDkzQQA627pn810rsvD3+jXEk5jZguRU
-Gxc4ULhz3dIbTrygAjoDQOxhSga4bSdwfElYMHed+i0YbY9/NEKodNPafS46uHa9
-o2jfhZfSEa/8Mc58hp1RdCUFqvXIZwBtarjUSUvtWwNzTdGCKLS/vE/FlyTKctbC
-bKypmvnyzzz9rvNYlfHA5Ex8oEvSYab8nNa699FxvKU49l3x4Dzs1qR85YSiKQk=
-=w2w2
+iQIcBAEBCAAGBQJTX2qQAAoJEPiazRVxLXTFLawQAM/L0nC5eQkXw5Gl6WCNGHLz
+ZNZOSXyQcsklROOG3plPzpZISzzGwVv0MwuBzdAVyrmt/Ix7K6x6v5DpLwkyHPW8
+6iGguSuScOPiZcCXoiD2mEG1U22Zqe39ab6qDW+00XI7HunfPASJBiwF0fHSLP+B
+hbbCBUAwQDEIGqc/Gtx0+ozXKojVM+/J0oAd4a4d3/c5frFIN/Jevh64nC5uPZzQ
+F0yP2wYc4A25ruFJTcM3Y7k8PGESbBaCV1j2gtHfggGyqEwt2MwlV08sCOOuQ82+
+D1Z0wneNhysJlJ+/VVbLw3u4U8lSq6J6zXeYsyqXqg80Lz6twDlmUrtTRYfmO7pq
+MbrqYFXwDnUvJUixEleE+WHECH30MeLQ2rSakZ52sOm8AOMTaZQus7RfAe47IwL0
+XxpHOYYuzvCrKsgXn83YDto7pXgs5I0//tjNcSx1ZYXfX0xWQ+5e+uV3JfkP6Gg/
+in8g5IfaWIxcH/ocOYvi/hLbsRRWFTyGzeUyQix27yl++U3nDRje1gfnu5ehBhXX
+pUAgpdvKtpIi1PWIADvajui6YXQ8BJaWgs1K82V0t7Y/HBQLBZwaDs4t9mNiPGe0
+zQqsIVU/Jv6PRjEFt6GmDVQmaIKSHiTOWSQ6kTqgoJAhz2Ji4VdulzdN8SFE1ZnB
+B6NfhGSiuNY/TcAauehg
+=s1rz
 -----END PGP SIGNATURE-----
diff --git a/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch b/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch
new file mode 100644
index 000000000000..6288866262d2
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch
@@ -0,0 +1,262 @@
+--- plugins/video/common/dyna.cxx
++++ plugins/video/common/dyna.cxx
+@@ -37,6 +37,7 @@
+  *                 Craig Southeren (craigs@postincrement.com)
+  *                 Matthias Schneider (ma30002000@yahoo.de)
+  */
++#include <stdio.h>
+ #include "dyna.h"
+ 
+ bool DynaLink::Open(const char *name)
+@@ -210,14 +211,14 @@
+ #endif
+ 
+ 
+-FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
+ {
+   m_codec = codec;
+-  if (m_codec==CODEC_ID_H264)
++  if (m_codec==AV_CODEC_ID_H264)
+       snprintf( m_codecString, sizeof(m_codecString), "H264");
+-  if (m_codec==CODEC_ID_H263P)
++  if (m_codec==AV_CODEC_ID_H263P)
+       snprintf( m_codecString, sizeof(m_codecString), "H263+");
+-  if (m_codec==CODEC_ID_MPEG4)
++  if (m_codec==AV_CODEC_ID_MPEG4)
+       snprintf( m_codecString, sizeof(m_codecString), "MPEG4");
+   m_isLoadedOK = false;
+ }
+@@ -348,12 +349,12 @@
+   return true;
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
+ {
+   return Favcodec_find_encoder(id);
+ }
+ 
+-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
+ {
+   WaitAndSignal m(processLock);
+ 
+--- plugins/video/common/dyna.h
++++ plugins/video/common/dyna.h
+@@ -88,13 +88,13 @@
+ class FFMPEGLibrary 
+ {
+   public:
+-    FFMPEGLibrary(CodecID codec);
++    FFMPEGLibrary(AVCodecID codec);
+     ~FFMPEGLibrary();
+ 
+     bool Load();
+ 
+-    AVCodec *AvcodecFindEncoder(enum CodecID id);
+-    AVCodec *AvcodecFindDecoder(enum CodecID id);
++    AVCodec *AvcodecFindEncoder(enum AVCodecID id);
++    AVCodec *AvcodecFindDecoder(enum AVCodecID id);
+     AVCodecContext *AvcodecAllocContext(void);
+     AVFrame *AvcodecAllocFrame(void);
+     int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
+@@ -117,15 +117,15 @@
+     DynaLink m_libAvcodec;
+     DynaLink m_libAvutil;
+ 
+-    CodecID m_codec;
++    AVCodecID m_codec;
+     char m_codecString[32];
+ 
+     void (*Favcodec_init)(void);
+     void (*Fav_init_packet)(AVPacket *pkt);
+ 
+     void (*Favcodec_register_all)(void);
+-    AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
+-    AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
++    AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
++    AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
+     AVCodecContext *(*Favcodec_alloc_context)(void);
+     AVFrame *(*Favcodec_alloc_frame)(void);
+     int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
+--- plugins/video/H.263-1998/h263-1998.cxx
++++ plugins/video/H.263-1998/h263-1998.cxx
+@@ -43,6 +43,12 @@
+  * $Date: 2014/04/29 09:02:06 $
+  */
+ 
++#define CODEC_FLAG_H263P_UMV      0x02000000
++#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
++#define CODEC_FLAG_H263P_AIV      0x00000008
++#define CODEC_FLAG_OBMC           0x00000001
++#define FF_I_TYPE  1
++
+ #ifndef PLUGIN_CODEC_DLL_EXPORTS
+ #include "plugin-config.h"
+ #endif
+@@ -94,7 +100,7 @@
+   { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI },
+ };
+ 
+-static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P);
++static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P);
+ 
+ 
+ /////////////////////////////////////////////////////////////////////////////
+@@ -203,7 +209,7 @@
+   PTRACE(4, m_prefix, "Encoder closed");
+ }
+ 
+-bool H263_Base_EncoderContext::Init(CodecID codecId)
++bool H263_Base_EncoderContext::Init(AVCodecID codecId)
+ {
+   PTRACE(5, m_prefix, "Opening encoder");
+ 
+@@ -616,7 +622,7 @@
+ 
+ bool H263_RFC2190_EncoderContext::Init()
+ {
+-  if (!H263_Base_EncoderContext::Init(CODEC_ID_H263))
++  if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263))
+     return false;
+ 
+ #if LIBAVCODEC_RTP_MODE
+@@ -661,7 +667,7 @@
+ 
+ bool H263_RFC2429_EncoderContext::Init()
+ {
+-  return H263_Base_EncoderContext::Init(CODEC_ID_H263P);
++  return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P);
+ }
+ 
+ 
+@@ -685,7 +691,7 @@
+   if (!FFMPEGLibraryInstance.Load())
+     return;
+ 
+-  if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) {
++  if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) {
+     PTRACE(1, m_prefix, "Codec not found for decoder");
+     return;
+   }
+--- plugins/video/H.263-1998/h263-1998.h
++++ plugins/video/H.263-1998/h263-1998.h
+@@ -115,7 +115,7 @@
+     virtual ~H263_Base_EncoderContext();
+ 
+     virtual bool Init() = 0;
+-    virtual bool Init(CodecID codecId);
++    virtual bool Init(AVCodecID codecId);
+ 
+     virtual bool SetOptions(const char * const * options);
+     virtual void SetOption(const char * option, const char * value);
+--- plugins/video/H.263-1998/Makefile.in
++++ plugins/video/H.263-1998/Makefile.in
+@@ -34,7 +34,7 @@
+              $(COMMONDIR)/mpi.cxx \
+              $(COMMONDIR)/dyna.cxx
+ 
+-CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -fpermissive
+ LIBS   += @DL_LIBS@
+ 
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+--- plugins/video/H.264/h264-x264.cxx
++++ plugins/video/H.264/h264-x264.cxx
+@@ -36,6 +36,15 @@
+  * $Date: 2014/04/29 09:02:06 $
+  */
+ 
++#define FF_ER_AGGRESSIVE      3
++#define CODEC_FLAG2_BRDO          0x00000400 
++#define CODEC_FLAG2_MEMC_ONLY     0x00001000
++#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000
++#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
++#define FF_IDCT_H264          11
++
++#include <stdio.h>
++
+ #ifndef PLUGIN_CODEC_DLL_EXPORTS
+ #include "plugin-config.h"
+ #endif
+@@ -104,7 +113,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264);
++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264);
+ 
+ PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF
+ 
+@@ -1064,7 +1073,7 @@
+          allows you to fail the create operation (return false), which cannot
+          be done in the normal C++ constructor. */
+ 
+-      if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL)
++      if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H264)) == NULL)
+         return false;
+ 
+       if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL)
+@@ -1072,7 +1081,7 @@
+ 
+       m_context->workaround_bugs = FF_BUG_AUTODETECT;
+ #ifdef FF_ER_AGGRESSIVE
+-      m_context->error_recognition = FF_ER_AGGRESSIVE;
++      m_context->err_recognition = FF_ER_AGGRESSIVE;
+ #endif
+       m_context->idct_algo = FF_IDCT_H264;
+       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+ 
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -53,6 +53,11 @@
+ 
+  */
+ 
++#define CODEC_FLAG_H263P_UMV      0x02000000
++#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
++#define FF_I_TYPE  1
++#define CODEC_FLAG_PART   0x0080
++
+ // Plugin specific
+ #define _CRT_SECURE_NO_DEPRECATE
+ 
+@@ -205,7 +210,7 @@
+     { 0 }
+ };
+ 
+-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4);
++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4);
+ 
+ 
+ static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen )
+@@ -701,7 +706,7 @@
+     return false;
+   }
+ 
+-  if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){
++  if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){
+     PTRACE(1, "MPEG4", "Encoder not found");
+     return false;
+   }
+@@ -1391,7 +1396,7 @@
+ 
+ bool MPEG4DecoderContext::OpenCodec()
+ {
+-    if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) {
++    if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) {
+         PTRACE(1, "MPEG4", "Decoder not found for encoder");
+         return false;
+     }
+--- plugins/video/MPEG4-ffmpeg/Makefile.in
++++ plugins/video/MPEG4-ffmpeg/Makefile.in
+@@ -30,7 +30,7 @@
+ SRCDIR    := .
+ SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+ 
+-CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -fpermissive
+ LIBS   += @DL_LIBS@
+ 
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
diff --git a/net-libs/opal/opal-3.10.11.ebuild b/net-libs/opal/opal-3.10.11.ebuild
new file mode 100644
index 000000000000..68576fa744c2
--- /dev/null
+++ b/net-libs/opal/opal-3.10.11.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.11.ebuild,v 1.1 2014/04/29 09:02:05 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+audio capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax
+ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+stats swig theora +video vpb vxml wav x264 x264-static xml"
+
+REQUIRED_USE="x264-static? ( x264 )
+	h281? ( h224 )
+	sip? ( sipim )"
+
+RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,audio?,dtmf,http,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+	>=media-libs/speex-1.2_beta
+	fax? ( net-libs/ptlib[asn] )
+	h323? ( net-libs/ptlib[asn] )
+	ivr? ( net-libs/ptlib[http,xml,vxml] )
+	java? ( >=virtual/jre-1.4 )
+	plugins? (
+		media-sound/gsm
+		capi? ( net-dialup/capi4k-utils )
+		celt? ( media-libs/celt )
+		ffmpeg? ( virtual/ffmpeg[encode] !!>=media-libs/libav-9 )
+		ixj? ( sys-kernel/linux-headers )
+		ilbc? ( dev-libs/ilbc-rfc3951 )
+		sbc? ( media-libs/libsamplerate )
+		theora? ( media-libs/libtheora )
+		x264? (	virtual/ffmpeg
+			media-libs/x264 ) )
+	srtp? ( net-libs/libsrtp )
+	vxml? ( net-libs/ptlib[http,vxml] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/gcc-3
+	java? ( swig? ( dev-lang/swig )
+		>=virtual/jdk-1.4 )"
+
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
+#   herited from ptlib: feature is enabled if ptlib has enabled it
+#   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
+#   forcing ptlib to disable it for opal is not a solution too
+#   atm, accepting the "auto-feature" looks like a good solution
+#   (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+	# workaround for bug 282838
+	append-cxxflags "-fno-visibility-inlines-hidden"
+	append-cxxflags "-fno-strict-aliasing"
+
+	# need >=gcc-3
+	if [[ $(gcc-major-version) -lt 3 ]]; then
+		eerror "You need to use gcc-3 at least."
+		eerror "Please change gcc version with 'gcc-config'."
+		die "You need to use gcc-3 at least."
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+
+	epatch "${FILESDIR}/${PN}-3.10.9-svn_revision_override.patch" \
+		"${FILESDIR}/${PN}-3.10.9-labs_is_in_stdlib.patch" \
+		"${FILESDIR}/${PN}-3.10.9-avoid_cflags_mixup.patch" \
+		"${FILESDIR}/${PN}-3.10.9-ffmpeg.patch" \
+		"${FILESDIR}/${PN}-3.10.11-libav9-gentoo.patch"
+
+	if ! use h323; then
+		# Without this patch, ekiga wont compile, even with
+		# USE=-h323.
+		epatch "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
+	fi
+
+	epatch "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
+
+	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+		|| die "sed failed"
+
+	eaclocal
+	eautoconf
+
+	# in plugins
+	cd plugins/
+	eaclocal
+	eautoconf
+	cd ..
+
+	# disable celt if celt is not enabled (prevent auto magic dep)
+	# already in repository
+	if ! use celt; then
+		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+			|| die "sed failed"
+	fi
+
+	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
+	if ! use swig; then
+		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+	fi
+
+	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local forcedconf=""
+
+	# fix bug 277233, upstream bug 2820939
+	if use fax; then
+		forcedconf="${forcedconf} --enable-statistics"
+	fi
+
+	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+	# versioncheck: check for ptlib version
+	# shared: should always be enabled for a lib
+	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+	# samples: only build some samples, useless
+	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+	# default-to-full-capabilties: default enable by upstream
+	# aec: atm, only used when bundled speex, so it's painless for us
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# 	http://zfoneproject.com/ wich is not in portage
+	# msrp: highly experimental
+	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
+	# g711plc: force enable
+	# rfc4103: not really used, upstream bug 2795831
+	# t38, spandsp: merged in fax
+	# h450, h460, h501: merged in h323 (they are additional features of h323)
+	econf \
+		--enable-versioncheck \
+		--enable-shared \
+		--disable-zrtp \
+		--disable-localspeex \
+		--disable-localspeexdsp \
+		--disable-localgsm \
+		--disable-localilbc \
+		--disable-samples \
+		--disable-libavcodec-stackalign-hack \
+		--enable-default-to-full-capabilties \
+		--enable-aec \
+		--disable-msrp \
+		--disable-spandsp \
+		--enable-g711plc \
+		--enable-rfc4103 \
+		$(use_enable debug) \
+		$(use_enable capi) \
+		$(use_enable fax) \
+		$(use_enable fax t38) \
+		$(use_enable h224) \
+		$(use_enable h281) \
+		$(use_enable h323) \
+		$(use_enable h323 h450) \
+		$(use_enable h323 h460) \
+		$(use_enable h323 h501) \
+		$(use_enable iax) \
+		$(use_enable ivr) \
+		$(use_enable ixj) \
+		$(use_enable java) \
+		$(use_enable lid) \
+		$(use_enable plugins) \
+		$(use_enable sbc) \
+		$(use_enable sip) \
+		$(use_enable sipim) \
+		$(use_enable stats statistics) \
+		$(use_enable video) $(use_enable video rfc4175) \
+		$(use_enable vpb) \
+		$(use_enable x264 h264) \
+		$(use_enable x264-static x264-link-static) \
+		${forcedconf}
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Get rid of static libraries if not requested
+	# There seems to be no easy way to disable this in the build system
+	if ! use static-libs; then
+		rm -v "${D}"/usr/lib*/*.a || die
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
+	fi
+
+	# ChangeLog is not standard and does not exist on 3.10.10
+#	dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
+
+	if use examples; then
+		local exampledir="/usr/share/doc/${PF}/examples"
+		local basedir="samples"
+		local sampledirs="`ls ${basedir} --hide=configure* \
+			--hide=opal_samples.mak.in`"
+
+		# first, install files
+		insinto ${exampledir}/
+		doins ${basedir}/{configure*,opal_samples*} \
+			|| die "doins failed"
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/* || die "doins failed"
+		done
+
+		# some examples need version.h
+		insinto "/usr/share/doc/${PF}/"
+		doins version.h || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	if use examples; then
+		ewarn "All examples have been installed, some of them will not work on your system"
+		ewarn "it will depend of the enabled USE flags in ptlib and opal"
+	fi
+
+	if ! use plugins || ! use audio || ! use video; then
+		ewarn "You have disabled audio, video or plugins USE flags."
+		ewarn "Most audio/video features or plugins have been disabled silently"
+		ewarn "even if enabled via USE flags."
+		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+	fi
+}