Add debian patch for building against libav-0.8, #380681

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

5 files changed, 94 insertions, 22 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index c7faaf61ef40..60a3f8e5edf1 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.88 2011/09/13 12:51:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.89 2011/11/16 09:50:18 jlec Exp $
+
+  16 Nov 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.1.ebuild,
+  +files/vtk-5.6.1-libav-0.8.patch, metadata.xml:
+  Add debian patch for building against libav-0.8, #380681
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> vtk-5.6.1.ebuild,
   +files/vtk-5.6.1-libpng15.patch:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index fde927bee2e6..cad5beef5106 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
 AUX vtk-5.4.2-boost-property_map.patch 7739 RMD160 98e9bc2431264ad5692b73dc05e54afa697e4108 SHA1 f38f98e9e28a51bb0553b5792cdde39a2c319b3d SHA256 5cbedc7afde2a3515a0bf580927c6a3a0d5b10efa39e649610b0f00a881a4119
@@ -13,6 +13,7 @@ AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29
 AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA1 02022f5f345ccfe8a13d99201828edb0371d7cc5 SHA256 eca7a508fcd07eb6d40e609e3670d12ce2d2d39dda11b60f418acd279ca03c25
 AUX vtk-5.6.1-ffmpeg.patch 1230 RMD160 edfdd3aade2b5dc22db159ae4f111125546558d3 SHA1 54caa2517794f5bbaf82dbad07c41552c78ef062 SHA256 c505c9b1f30277e1b069dbd926dec0a48a9a2e2dad66f91102bfb152eeec78dc
 AUX vtk-5.6.1-gcc-46.patch 914 RMD160 89448f0dbb4c88cdc1dceb32c79085fde6c2dcd9 SHA1 16e8c5e4c85c4414dcfe816f4c1e61ff5945ceea SHA256 236186b47af0fa2e9fd0e96f815229d11a6c8c44bf2840a5f529ec6e49d7731c
+AUX vtk-5.6.1-libav-0.8.patch 2726 RMD160 a2032faf09e9dfe4f921b7b904c0874e679f8730 SHA1 ef710cfb99d77c909eb42ca17f04751191e5d536 SHA256 719ebdc579b51dff5586fd8157c764ca5a735b19ae03b777eb33afe69bbd25a9
 AUX vtk-5.6.1-libpng15.patch 686 RMD160 475a8a1c02c48950e268ae6a316948f7acd6e95c SHA1 98400b7caabb69ad96dcc80fa13fd5c3bb2bf478 SHA256 4d651b007b91882b676172e069a4d86479045a1087eba062212f787509d1a88e
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtk-5.6.0.tar.gz 20709970 RMD160 b7abf3b9bb14a3db81608c7aa2721935ae653295 SHA1 355209c485304f1b0feefcda3585d45217ffd230 SHA256 2987938ad906c5fd30ddbf60889f899d1dd8c61d80320c55ac1acadc00a95d3e
@@ -26,13 +27,13 @@ DIST vtkdata-5.6.1.tar.gz 77991728 RMD160 b77b5f6919beae406712b93cd333dd4fad5ff3
 EBUILD vtk-5.4.2-r1.ebuild 6379 RMD160 f796f2c974ca58fe7b34b62057d832e76950e6d8 SHA1 46c2fbe8ef5730744bb655e042661810e942d9f5 SHA256 966efe98dc9a1a48fd3faab5e1e0ec4eae636d45773f2f7bd49f455a4e30474d
 EBUILD vtk-5.6.0-r2.ebuild 7196 RMD160 c0e5497c113fffc6dc5ae543042f0abc0dd75cd0 SHA1 afb0f9565798ead6306f1a0a8e6ff955676de804 SHA256 9ebd57afe34faa0a5f1d9a9848cc88a22d1778eb526e68cfff385b8bc68bb7ee
 EBUILD vtk-5.6.0-r3.ebuild 7032 RMD160 1ab1e048e4472dcbb1a31a1f54ec1e5c8838aaae SHA1 0c1727eb6d5980cce1dbf4954eed6f6a80a615ff SHA256 ca7feddd527f9d8643ddb422ee112ece0507a5ba1b44eaef70d838cd5e96f174
-EBUILD vtk-5.6.1.ebuild 7120 RMD160 d71075b76d4156d895c4cfde682a00284a6d8f1c SHA1 9d14bde4ee332febc8f907d6c98468af0cdab054 SHA256 5c412a3adcccb9e8f6919ea2a0a207304f169b63499ec20f37e4aba8420d39ad
-MISC ChangeLog 14892 RMD160 5a911da85cd67375332e7a7596857856da139430 SHA1 a32766c671ab64b67f7dd2085b552fd50e1e3339 SHA256 703f5b31718c8d0d0572a8590e7ea633481ee2bed515144aa0f38d248f5e9287
-MISC metadata.xml 479 RMD160 dc6cec04eacde4d39c022bfec517773b2f19da0d SHA1 cdfce8db7bf37f6770cebd95df56ee81afe41d22 SHA256 7957d86eb3506ad56885d75cbec7235e2cb66b5733dffe666b6b545e2d05d443
+EBUILD vtk-5.6.1.ebuild 7154 RMD160 566b4d64fd0dfaea6c0c27b2d437c785cda05e24 SHA1 69e8b9e970439ef6e7decb100e1b8e601f64f577 SHA256 4778a4d79b6db8bccf7e07823415df6678fb2c1710a6f5bce225d94d2b850f9d
+MISC ChangeLog 15062 RMD160 64a8c75e076a7f4660a0013d94883f3315ffa790 SHA1 64965db2365a74f934e958dad52fd7fffac7dd15 SHA256 6c224313fc54402e78a36ac29805c6f2b77febf957d691ce82a7f2445cf9c485
+MISC metadata.xml 489 RMD160 1bf8f7af20c7e220d6ac248966c4b4eca7f807ac SHA1 cc32ba8468c91494fcbaccdd0f8373259ca6e74b SHA256 16006ed96a705ea53dd5839112d5f9556c00cf830a058bdb2492f8aa55439de6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5vUfMACgkQXkR9YqOcLPHHJwD/WpBGQUq/NanHn3dmZdLQY+ZS
-bwmmoVJXw+/t0xdEGNkA/jnafeCJKVdCOUz6/48q02Iywz30K8v9GWxoJkklSLAG
-=7Q7R
+iEYEAREKAAYFAk7Dh2AACgkQgAnW8HDreRY2VACfXGFLYBNWtg/1JBubguR05bJA
+RNUAoL49gjxdkBqrmzRkdErIcHhFwMSg
+=B4Hm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch
new file mode 100644
index 000000000000..523919d6f676
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch
@@ -0,0 +1,66 @@
+Description: Upstream changes introduced in version 5.6.1-6.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ vtk (5.6.1-6.1) unstable; urgency=low
+ .
+   [ Michael Schutte ]
+   * Non-maintainer upload.
+   * Remove absolute paths to required libraries from
+     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
+     #506992.  Due to the multiarch transition, the original behavior
+     frequently causes reverse build-deps to FTBFS.  This change should
+     probably be reverted once all required libraries are multiarched.
+ .
+   [ Steve M. Robbins ]
+   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
+   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
+     0.7.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Steve M. Robbins <smr@debian.org>
+Bug-Debian: http://bugs.debian.org/506992
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
+@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
+     }
+ 
+   //choose avi media file format
+-  this->avOutputFormat = guess_format("avi", NULL, NULL);
++  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
+   if (!this->avOutputFormat) 
+     {
+     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
+@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
+-  c->codec_type = CODEC_TYPE_VIDEO;
++  c->codec_type = AVMEDIA_TYPE_VIDEO;
+   c->width = this->Dim[0];
+   c->height = this->Dim[1];
+   c->pix_fmt = PIX_FMT_YUVJ420P;
+@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+     pkt.stream_index = this->avStream->index;
+     if (cc->coded_frame->key_frame) //treat keyframes well
+       {
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+       }
+     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
+     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 5b44574c063a..2c3119e68af3 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>java</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-  <name>Justin Lecher</name>
-</maintainer>
-<use>
-	<flag name='boost'>Add support for boost</flag>
-	<flag name='cg'>Use nvidia's cg shaders</flag>
-	<flag name='patented'>Build patented classes</flag>
-	<flag name='R'>Enable support for dev-lang/R</flag>
-</use>
+	<herd>sci</herd>
+	<herd>java</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<use>
+		<flag name="boost">Add support for boost</flag>
+		<flag name="cg">Use nvidia's cg shaders</flag>
+		<flag name="patented">Build patented classes</flag>
+		<flag name="R">Enable support for dev-lang/R</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
index 656c28ac5406..af6ff2a8bafb 100644
--- a/sci-libs/vtk/vtk-5.6.1.ebuild
+++ b/sci-libs/vtk/vtk-5.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.1.ebuild,v 1.5 2011/09/13 12:51:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.1.ebuild,v 1.6 2011/11/16 09:50:18 jlec Exp $
 
 EAPI="3"
 
@@ -84,7 +84,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
 		"${FILESDIR}"/${P}-ffmpeg.patch \
 		"${FILESDIR}"/${P}-gcc-46.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-libav-0.8.patch
 
 	# Fix sure buffer overflow on some processors as reported by Flameyes in #338819
 	sed -e "s:CHIPNAME_STRING_LENGTH    (48 + 1):CHIPNAME_STRING_LENGTH    (79 + 1):" \