Fix build with latest ffmpeg. Part of bug #450464.

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 62 insertions, 7 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index bcb146e1da6b..0dd7f15f8744 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.104 2013/01/15 13:57:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.105 2013/01/17 21:15:03 aballier Exp $
+
+  17 Jan 2013; Alexis Ballier <aballier@gentoo.org> vtk-5.10.1.ebuild,
+  +files/vtk-5.10.1-ffmpeg-1.patch:
+  Fix build with latest ffmpeg. Part of bug #450464.
 
   15 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild,
   +files/vtk-5.10.1-tcl8.6.patch:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 4dbaa613ce28..7162f8cfbe7e 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vtk-5.10.1-ffmpeg-1.patch 1626 SHA256 312402db11bbc47d1596a5c58ee127af6a5807dda2331df402ebcfe7e999ea7c SHA512 34a59c7229a9dbd63d2c346906536fc1d53965489ecb148b57fd2b4b71e7b428d3bd162aa008cc92d72c006720217bf9c72863f761b7cd9b7e2241be8c52f327 WHIRLPOOL 5319732317a82df89d37914f831bf516e66ff58cd5a4a7d2ae777d732590af6ec5f8dd9d90a59ac8f46c1e228483081ade46e0ee02c2bb6ce713fbfc4ce3c669
 AUX vtk-5.10.1-tcl8.6.patch 1855 SHA256 29cda5a7f2fc0e4ec466260681e3e69e4437a3d4ba9fcb52481ef78266722e7c SHA512 bbbfa49d52bbee89b0370a44b9b59d63dda592239475222a47bee6c530787bcc21cb839701328035bdc1d36bc6ae3e22cccdd1e5da67968947deb8e68a917aa0 WHIRLPOOL c13600ac044037399cd778d6c5c4262f094bf4a840674a5486a3b274968d12ef1b30eb4df1034f0fefea7ffeadd005b621dd1123f815040558a8358094f28272
 AUX vtk-5.2.0-tcl-install.patch 580 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6 SHA512 4accf428e5eecb785efd585ee3a8f45a81550b28450b0e3047be49548ad0336cfbcd5a09ccb05009603303db2c053b656b395f1cb1799c66c14f7bcf485802b7 WHIRLPOOL fd1abff4b81a8de87733b213b9bf984f95068ab4dd970dd1bb6897d10bf37fa9cb270fbc7d526949c7919e21b1c821da8097367c07c72d0b0ac8ce34112b3b56
 AUX vtk-5.4.2-boost-property_map.patch 7739 SHA256 5cbedc7afde2a3515a0bf580927c6a3a0d5b10efa39e649610b0f00a881a4119 SHA512 2e18fc8149f039db51af90e77461e9c6e50e92af98d0c50bd88012b7c688d621822c143c4f5b5d4e2e7ae9de4b320473478883e789ba56ae2e65f92579ff783d WHIRLPOOL 4bd2920895e492b47c6c2fc09bb95a1e007bad8259403252a22664124e3df090f622f66a50acd900a5a7e43f6fd81605f03e0684cb9b9f87659be038448b6e5f
@@ -25,13 +26,13 @@ DIST vtkDocHtml-5.10.1.tar.gz 178278963 SHA256 1447d7e07a615c0c6d66cce2bfc6b2f4a
 DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c
 DIST vtkdata-5.10.1.tar.gz 88642678 SHA256 c526a5eeb73693597043a89d401ef5b8f0c6f6eddb82e03ad205f013ee9edf7c SHA512 3655ecd4bd6f05e3266c19d67c59867e12d4681e159869b7673948a8ba3966f958bd1a1ef024321b66f3ad649b80fc62e5323f8bd700d34fdd95645e7fe5ef32 WHIRLPOOL b65e533dc3a092ae4944bfd1ca850ab3b7ba95c62c654e0c03ac8c689d4270eaf58ae91519200c00b94ad3108f4ce3bc16656bf62a7e10dc627dea736594831d
 EBUILD vtk-5.10.0.ebuild 7456 SHA256 0a8498310d4696e43a17ea5a10b313cdbe054cb4653fc2b49c6f6d19aa156cf4 SHA512 77084e58e99591259e745ba4f26836ae2bd22e8dc73ad69d8fbff4b2008e3e2de4ad0a751e2f4485c82ad961656a367fa2f8352b62d29613e385bebca8710f0e WHIRLPOOL 2187cb19aebe5b8eec92aac1b1a7acbd3fa3cdb04a93dffbc4badd70156ab8bf006264b08f7306e55ac1104bfb281cb14834354c65c5d71a20613851062c68c2
-EBUILD vtk-5.10.1.ebuild 7495 SHA256 701ecf45a667a816b53044ca9d35ef652d259ff988ef3e557440af1b781a4ec6 SHA512 06e399ee7e4ed467050192494d8b95db020bfc443de9e5865ed4724de2c7614fddd3c5c1dd100b68bbc793febd0a890e19224ed5908fa97696095fb693b62e14 WHIRLPOOL 64d5ca54a8267d68276d4c37cbbee3c68b4701cdc7dbda95dce9c53ff35aabbf8f933a3ab2316e73f9d49d9e412ba0b6dd711609ccf117f44e2d02e061634e20
-MISC ChangeLog 17067 SHA256 432dcea08dc7a98289ec4acf03eb7108ca85e2fe8b8421cd9f873c07f0d27b14 SHA512 16a919ab6c939f601cd9d12e59be2eb01daf494a7e4b7eaff45b24db7332eef05bcbc23b811a15333fd4321261e8010b2da466ee9cd7603af0e9fa676093881a WHIRLPOOL 523837345bdc69dc12a68fc5f22ff5bd2f4379825a2c9078b48664fb0a5a9bf4f6266ce49e1eeebbe2f544fd53015987985fc6ed7883ef82749263682d3adc50
+EBUILD vtk-5.10.1.ebuild 7534 SHA256 586444c0aa7d206e2ae4cb106ae76dcd1bf37f701591d39f14bb9c813800ec74 SHA512 9039fdeabd62f694268c9fa0920e94d3503929bce22edb97c7e786d669a6a050447d95ba7ca3bd743ac3e2928209d6116e9d586463ba5750b1494f368adbe183 WHIRLPOOL fcdc8a8f06a208ef2e39e435f59d8c3f7462304dbe5d3bd9d6d1763b82179469da8a44a76697660688fe3aaca654e6e20aef58b9f6c5ed67670aba6ad47334e8
+MISC ChangeLog 17232 SHA256 d4118ecf792347c70152d8a13df814bb69d38f89ec281bc2bdeae6d0c798bc52 SHA512 bc9e4418da5137238c0a73f297a1fb354375778cc676f42b539102156d72185b28a0cc57a00adebe83595762f8bfbbe81baa1247ae7003fb5d5bfe83a884deaf WHIRLPOOL 9ef208347dd91bca25817169fd1e64531a4dd7b6d8377c9713a9c8ebbf5ff7b4c5963bf5052547b09d29ca929adf818600cf613c92dbd2131e1b72a93dbf1d1c
 MISC metadata.xml 563 SHA256 2fedd09c2e8b8c709641c6490e9b4ea9190d4c98cafa958386ed957bc8687ce9 SHA512 cb5a7f2db34a3e35a7115240ad21fce20bf771613dc42fe57c8e0ea1d004ea40e06fb57970285ebcca290bb390b29c10d7aa5d20a3df7e8dfeb314db152c3152 WHIRLPOOL 2540838d0c619af440b8269a46c58045cb6c79e73525b75ea891af381f7561c106712a1881c62cd0d4de7ddd7cc6926ab7c5a7ea59adfa7ebfb312dd1712ec45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD1YF4ACgkQgAnW8HDreRZAIACfRaVtxafnsmDocLbQk7gfJZMb
-k4wAoLtrU5DwoTK20f03pjdTLwAsHZLb
-=hwR9
+iEYEAREIAAYFAlD4adkACgkQvFcC4BYPU0qswwCbBowR2wnfUXL0GNIqFbCG66dv
++dUAoLTAox0clA9I+F8z682UrtT5zNvf
+=W5Jq
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch
new file mode 100644
index 000000000000..2cefb12591a5
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/show_bug.cgi?id=450464
+
+Index: VTK5.10.1/IO/vtkFFMPEGWriter.cxx
+===================================================================
+--- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx
++++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx
+@@ -192,13 +192,6 @@ int vtkFFMPEGWriterInternal::Start()
+     c->bit_rate_tolerance = this->Writer->GetBitRateTolerance();
+     }
+ 
+-  //apply the chosen parameters
+-  if (av_set_parameters(this->avFormatContext, NULL) < 0)
+-    {
+-    vtkGenericWarningMacro (<< "Invalid output format parameters." );
+-    return 0;
+-    }
+-
+   //manufacture a codec with the chosen parameters
+   AVCodec *codec = avcodec_find_encoder(c->codec_id);
+   if (!codec) 
+@@ -259,14 +252,17 @@ int vtkFFMPEGWriterInternal::Start()
+ 
+ 
+   //Finally, open the file and start it off.
+-  if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) 
++  if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0) 
+     {
+     vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." );
+     return 0;
+     }
+   this->openedFile = 1;
+ 
+-  av_write_header(this->avFormatContext);
++  if(avformat_write_header(this->avFormatContext, NULL) < 0) {
++    vtkGenericWarningMacro (<< "Failed to write header." );
++    return 0;
++  }
+   return 1;
+ }
+ 
+@@ -391,7 +387,7 @@ void vtkFFMPEGWriterInternal::End()
+ #ifdef VTK_FFMPEG_OLD_URL_FCLOSE
+       url_fclose(&this->avFormatContext->pb);
+ #else
+-      url_fclose(this->avFormatContext->pb);
++      avio_close(this->avFormatContext->pb);
+ #endif
+       this->openedFile = 0;
+       }
diff --git a/sci-libs/vtk/vtk-5.10.1.ebuild b/sci-libs/vtk/vtk-5.10.1.ebuild
index 2f20984444b8..af88a06312de 100644
--- a/sci-libs/vtk/vtk-5.10.1.ebuild
+++ b/sci-libs/vtk/vtk-5.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.4 2013/01/15 13:57:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.5 2013/01/17 21:15:03 aballier Exp $
 
 EAPI=3
 
@@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
 	"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
 	"${FILESDIR}"/${P}-tcl8.6.patch
+	"${FILESDIR}"/${P}-ffmpeg-1.patch
 	)
 
 pkg_setup() {