diff options
Diffstat (limited to 'net-libs/opal')
| -rw-r--r-- | net-libs/opal/ChangeLog | 9 | ||||
| -rw-r--r-- | net-libs/opal/Manifest | 11 | ||||
| -rw-r--r-- | net-libs/opal/files/opal-3.10.9-ffmpeg.patch | 189 | ||||
| -rw-r--r-- | net-libs/opal/opal-3.10.9.ebuild | 5 |
4 files changed, 205 insertions, 9 deletions
diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog index 2f0233cce037..08e057ebe0a5 100644 --- a/net-libs/opal/ChangeLog +++ b/net-libs/opal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/opal -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.85 2012/12/16 14:58:35 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.86 2013/02/08 20:29:32 aballier Exp $ + + 08 Feb 2013; Alexis Ballier <aballier@gentoo.org> opal-3.10.9.ebuild, + +files/opal-3.10.9-ffmpeg.patch: + backport upstream fix to build with recent ffmpeg versions, part of bug + #443206 16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Cleanup due retirement, #260683 diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest index df5ef0239f79..589705357d08 100644 --- a/net-libs/opal/Manifest +++ b/net-libs/opal/Manifest @@ -4,6 +4,7 @@ Hash: SHA256 AUX opal-2.1.1-notrace.diff 263 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0 SHA512 279ebd4821af25ba1ef795aad66d1ae20489337ab2d78c174b4caa4dbbf02b4f8c7f6fdc5e2822e1c6441e2850d0924f108dcaf06beaf238be58b44daee91b71 WHIRLPOOL b71b6bf51eda7d9a5c24a9bcff85c41c3017e92c6be4f1fed5022ccbfac0ea0f3b66a4cc9b501810b5e342b8f8cf8110c698deca9ed71661a3f5fe40184040da 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 AUX opal-3.10.9-java-ruby-swig-fix.patch 874 SHA256 f813a831ac8d8c6c47f951125c1c8e971849d21a9cd7403e2bd72d39a5718930 SHA512 a7132cd6ad61d143cc11e00a048aaf66e1802890ac5fbde7ff964f99dc45a3abc79a081572cbdae5a84a50eee8af11266695a5de9c2691385c6f849e27105022 WHIRLPOOL ea85ac9c3603ff0a9eaf955f232c0197c35bb39ddce9a7d28c0f682e16e3660534eab0c5106bc8395ed2ac2445fb8f615d567e5ad607b5089331c116c4ae16db AUX opal-3.10.9-labs_is_in_stdlib.patch 532 SHA256 c6d7613fc79d7f1134a4ff9246591d96ab9c264f0c8250b1cf51a33cdafa1fc7 SHA512 f1342804fec2e6422d499f776a39dff2e36e5604e2d43084322c9fd0b4bf7d511852c3ca02dc072d133b9204b4984b4400f56846f58cc2edfc0446176cdbfcf5 WHIRLPOOL 271170a5a2adcffac9d49e146a9a3e947790b155d224cc64800eb773b31a11c34309bfa8c28083534f8e230cc3aa3ae83a6a912a266cbb681b3c120e8ae794aa AUX opal-3.10.9-svn_revision_override.patch 456 SHA256 78e84456c02f9a8c51f60dfff4882875c2fbefc2ac7953ed96a0dba30ed0e450 SHA512 b78843500d1d90ce11e8620fdad9f4a97184ee603a839828c39aad85d5f33bb08bd776f2faaf7c86e364cd4dc4d3166485d74dd66551ce508c9bee22a336d2ee WHIRLPOOL c82b0ffeba8315d1e0e3e7250dba1c3de17e095b68dcd110539920fb6f99ba9f4a4e5ccf3e97e785b15696c5703a546f08c999dda4d71614a0fdf13074e20197 @@ -17,14 +18,14 @@ DIST opal-3.10.9.tar.bz2 8591506 SHA256 f6a1c380df5c82c24ff6cc82c5c6a94868b112d5 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-2.2.11.ebuild 2604 SHA256 8595bd00d707830cfc52f7de3b8993c0658f50306ddef296dea97c74d0285ba7 SHA512 11f89579a269aac28afadf7888d858718ff3852f00df949ee563ef2565ea92a34c2711c9a7cb598d4f23dddbb20a5ae64348a237664122be28931803065a3c54 WHIRLPOOL 28f015d31702f2193233cb9ad24627dc327f6e4798ae926fcc976231d468137e798a79e15fd42690578fd05c6c21f1f2100649ec49892b1c0ab0585f4515eb9e -EBUILD opal-3.10.9.ebuild 7437 SHA256 c90a8690cac6823735192ffbbebcf84ddb9366566a0bc1f112773c0ac9b0393e SHA512 8828baceb146a776281367d7b10753b765deb39796e90199c0b9ea63af601819a34627d5c50be60c49fc28efcbaee9fad4dc40dcc33e26c0a6a756307c00b045 WHIRLPOOL 74a5ef0d0edf8bdfff29deada9ad7f5e5e1617a143b1bd2ec400c7e740595e44d3020f4b2939ea301badbeda51b3b0f73b24a05f574452fe903299bda964b082 +EBUILD opal-3.10.9.ebuild 7476 SHA256 00e4214bfaaaae1e92c485a22ed83b685f54f1b1a6070345282b17c24edca471 SHA512 56e895ad3811fed06626eb837c1c54e57d701c256a2db781a4ddead5f2b09f8e706d725597905cd56e455723d15d4ef4cd9fee857a13712aa86b2acf5e8b51f6 WHIRLPOOL 3f0374448e490d2bd95ebcb691549de53ec94ee813ab1a5bded97cd596b14019c462ec5b090cca077952c8e5950bfc8af9d9a565265cde015cc277af5a503fd9 EBUILD opal-3.6.8-r2.ebuild 8564 SHA256 163e8a0de3af0b0fc998b4f5f44175e961471c0e2def8d0fafcd450eaa30ee84 SHA512 41ec6c5205fd04d8408ccaac83588222eeb969d6db5af412f1f29a174fd58114dfc6b954e366b5afe443b682e707c9682517722cb79fb90a5e8951718d471622 WHIRLPOOL a7d9f3af5448d546919ee56bcc5da31d1b576e184f290fe71f37ee39265369668f5aebc5b8c01ab45ebad3e94a8f1c17df43f809ce7df722b72d7b119c4b796d -MISC ChangeLog 12671 SHA256 bffdcb6eb220537eed2e5ee983b06f937a6e9e20aba0b9bfce87960a78902364 SHA512 7f8c9984519dd156486d3496d272cddd94be6514842fb1c71e718c921b0f6e476d8b994bbd264cefa7e10ac8842c2170cc6e699412aee0876a7f0c2b103d65dc WHIRLPOOL 001c69b1e9bf1f99714d8be68e4ebe3073bdb4d0468dc920fe3e4fa81a4e9eeb75812f9917e88b0b1037d364066e784287d98ebc56e935e02bc456f0dd8b5df1 +MISC ChangeLog 12866 SHA256 4e11a34e64abb0410fdc55d8c06f331bd006c7b043a0cb93fd3730e9efbeacfb SHA512 5afb2ce0bdbe19dc57a2cd4156e94a2981000f6f61ee285f83ad4ad454fe2f0009f9a00937addee7f3dfdcdfab72cfcca1cddca39aa7bf25d7bd5d59ab955efb WHIRLPOOL 8b0bcbc37e7ddbabfcea26289d7b100de9932674678de691f277d73c4bc3bb26e731ea019e1c2ef94f14cbb0032424176ef922b357bb510b4ac9b97161834b83 MISC metadata.xml 2175 SHA256 e3d7c35d326798477da494de953c9fcf81bc61663a32571c665d0b83905bd195 SHA512 e5288f68dbac4331d9d7ccfa37539c75daa44ccaea27d421d88c9093c7d3071a0d8941bfe98aaf879b57c01d5c0ea1c62deef77df8893c55b90dfde9ee393440 WHIRLPOOL f153469f1e7a9a0c08433e716628d31be74d5a1fea61a6d20215631e375fcccb6b48ca66067457abbaea19a21593bad4d11e02a2454c417a94391247d0831651 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDN4ZwACgkQCaWpQKGI+9Qw0gCffsecNj2oVCy2OxAGVlBPqmTW -iCAAn12SJ+aitaVYv4D+8f7MwHkndj1u -=u+Mw +iEYEAREIAAYFAlEVYC0ACgkQvFcC4BYPU0qmpwCfalqs9RPitGDd4t1plofzoFza +thkAoIRCGGi/diwr6k7xlPZs6bDwHNy+ +=O2LF -----END PGP SIGNATURE----- diff --git a/net-libs/opal/files/opal-3.10.9-ffmpeg.patch b/net-libs/opal/files/opal-3.10.9-ffmpeg.patch new file mode 100644 index 000000000000..18608651eaeb --- /dev/null +++ b/net-libs/opal/files/opal-3.10.9-ffmpeg.patch @@ -0,0 +1,189 @@ +Note: This is not optimal but is backported from what is in the 3.12 branch. + + +r28871 | rjongbloed | 2013-01-13 02:18:43 -0300 (Sun, 13 Jan 2013) | 2 lines + +Fixed compile against latest FFMPEG, specifically Mac OS-X "port" version. Have no idea what all the deprecated symbols are replaced by! + +Index: opal-3.10.9/plugins/video/H.263-1998/h263-1998.cxx +=================================================================== +--- opal-3.10.9.orig/plugins/video/H.263-1998/h263-1998.cxx ++++ opal-3.10.9/plugins/video/H.263-1998/h263-1998.cxx +@@ -312,6 +312,7 @@ void H263_Base_EncoderContext::SetOption + return; + } + ++#ifdef CODEC_FLAG_H263P_UMV + if (STRCMPI(option, H263_ANNEX_D) == 0) { + // Annex D: Unrestructed Motion Vectors + // Level 2+ +@@ -322,7 +323,9 @@ void H263_Base_EncoderContext::SetOption + m_context->flags &= ~CODEC_FLAG_H263P_UMV; + return; + } ++#endif + ++#ifdef CODEC_FLAG_OBMC + #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET + if (STRCMPI(option, H263_ANNEX_F) == 0) { + // Annex F: Advanced Prediction Mode +@@ -334,7 +337,9 @@ void H263_Base_EncoderContext::SetOption + return; + } + #endif ++#endif + ++#ifdef CODEC_FLAG_AC_PRED + if (STRCMPI(option, H263_ANNEX_I) == 0) { + // Annex I: Advanced Intra Coding + // Level 3+ +@@ -345,7 +350,9 @@ void H263_Base_EncoderContext::SetOption + m_context->flags &= ~CODEC_FLAG_AC_PRED; + return; + } ++#endif + ++#ifdef CODEC_FLAG_LOOP_FILTER + if (STRCMPI(option, H263_ANNEX_J) == 0) { + // Annex J: Deblocking Filter + // works with eyeBeam +@@ -355,7 +362,9 @@ void H263_Base_EncoderContext::SetOption + m_context->flags &= ~CODEC_FLAG_LOOP_FILTER; + return; + } ++#endif + ++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT + if (STRCMPI(option, H263_ANNEX_K) == 0) { + // Annex K: Slice Structure + // does not work with eyeBeam +@@ -365,7 +374,9 @@ void H263_Base_EncoderContext::SetOption + m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; + return; + } ++#endif + ++#ifdef CODEC_FLAG_H263P_AIV + if (STRCMPI(option, H263_ANNEX_S) == 0) { + // Annex S: Alternative INTER VLC mode + // does not work with eyeBeam +@@ -375,6 +386,7 @@ void H263_Base_EncoderContext::SetOption + m_context->flags &= ~CODEC_FLAG_H263P_AIV; + return; + } ++#endif + + if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 || + STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) { +@@ -452,12 +464,24 @@ bool H263_Base_EncoderContext::OpenCodec + + #define CODEC_TRACER_FLAG(tracer, flag) \ + PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); ++#ifdef CODEC_FLAG_H263P_UMV + CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); ++#endif ++#ifdef CODEC_FLAG_OBMC + CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); ++#endif ++#ifdef CODEC_FLAG_AC_PRED + CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); ++#endif ++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT + CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) ++#endif ++#ifdef CODEC_FLAG_LOOP_FILTER + CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); ++#endif ++#ifdef CODEC_FLAG_H263P_AIV + CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); ++#endif + + return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; + } +@@ -521,7 +545,7 @@ bool H263_Base_EncoderContext::EncodeFra + + // Need to copy to local buffer to guarantee 16 byte alignment + memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); +- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; ++ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; + + /* + m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; +@@ -603,13 +627,21 @@ bool H263_RFC2190_EncoderContext::Init() + m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; + m_context->opaque = this; // used to separate out packets from different encode threads + ++#ifdef CODEC_FLAG_H263P_UMV + m_context->flags &= ~CODEC_FLAG_H263P_UMV; ++#endif ++#ifdef CODEC_FLAG_4MV + m_context->flags &= ~CODEC_FLAG_4MV; +-#if LIBAVCODEC_RTP_MODE ++#endif ++#if LIBAVCODEC_RTP_MODE && defined(CODEC_FLAG_H263P_AIC) + m_context->flags &= ~CODEC_FLAG_H263P_AIC; + #endif ++#ifdef CODEC_FLAG_H263P_AIV + m_context->flags &= ~CODEC_FLAG_H263P_AIV; ++#endif ++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT + m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; ++#endif + + return true; + } +Index: opal-3.10.9/plugins/video/H.264/h264-x264.cxx +=================================================================== +--- opal-3.10.9.orig/plugins/video/H.264/h264-x264.cxx ++++ opal-3.10.9/plugins/video/H.264/h264-x264.cxx +@@ -1071,13 +1071,13 @@ class MyDecoder : public PluginCodec<MY_ + return false; + + m_context->workaround_bugs = FF_BUG_AUTODETECT; ++#ifdef FF_ER_AGGRESSIVE + m_context->error_recognition = FF_ER_AGGRESSIVE; ++#endif + m_context->idct_algo = FF_IDCT_H264; + m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; + m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; +- m_context->flags2 = CODEC_FLAG2_BRDO | +- CODEC_FLAG2_MEMC_ONLY | +- CODEC_FLAG2_DROP_FRAME_TIMECODE | ++ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE | + CODEC_FLAG2_SKIP_RD | + CODEC_FLAG2_CHUNKS; + +Index: opal-3.10.9/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +=================================================================== +--- opal-3.10.9.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ++++ opal-3.10.9/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +@@ -594,12 +594,10 @@ void MPEG4EncoderContext::SetStaticEncod + #else + m_avcontext->max_b_frames=0; /*don't use b frames*/ + m_avcontext->flags|=CODEC_FLAG_AC_PRED; +- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; + /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ + m_avcontext->flags|=CODEC_FLAG_4MV; + m_avcontext->flags|=CODEC_FLAG_GMC; + m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; +- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; + #endif + m_avcontext->opaque = this; // for use in RTP callback + } +@@ -804,7 +802,7 @@ int MPEG4EncoderContext::EncodeFrames(co + // Should the next frame be an I-Frame? + if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) + { +- m_avpicture->pict_type = FF_I_TYPE; ++ m_avpicture->pict_type = AV_PICTURE_TYPE_I; + } + else // No IFrame requested, let avcodec decide what to do + { +@@ -1325,7 +1323,6 @@ void MPEG4DecoderContext::SetFrameHeight + + void MPEG4DecoderContext::SetStaticDecodingParams() { + m_avcontext->flags |= CODEC_FLAG_4MV; +- m_avcontext->flags |= CODEC_FLAG_PART; + m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations + } + diff --git a/net-libs/opal/opal-3.10.9.ebuild b/net-libs/opal/opal-3.10.9.ebuild index 15b566ebbd3b..9fa4e4bfa5af 100644 --- a/net-libs/opal/opal-3.10.9.ebuild +++ b/net-libs/opal/opal-3.10.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.9.ebuild,v 1.1 2012/12/03 23:25:27 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.9.ebuild,v 1.2 2013/02/08 20:29:32 aballier Exp $ EAPI=4 @@ -84,6 +84,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-svn_revision_override.patch" epatch "${FILESDIR}/${P}-labs_is_in_stdlib.patch" epatch "${FILESDIR}/${P}-avoid_cflags_mixup.patch" + epatch "${FILESDIR}/${P}-ffmpeg.patch" if ! use h323; then # Without this patch, ekiga wont compile, even with |