Correct patch for USE=ffmpeg, 327957; Fix for gcc-4.6

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

7 files changed, 56 insertions, 18 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 43fcad59dcdd..f4a6072c7e2d 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.84 2011/04/17 13:50:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.85 2011/04/25 09:51:24 jlec Exp $
+
+  25 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r2.ebuild,
+  vtk-5.6.0-r3.ebuild, vtk-5.6.1.ebuild, files/vtk-5.6.1-ffmpeg.patch,
+  +files/vtk-5.6.1-gcc-46.patch:
+  Correct patch for USE=ffmpeg, 327957; Fix for gcc-4.6
 
   17 Apr 2011; Justin Lecher <jlec@gentoo.org> vtk-5.6.0-r3.ebuild,
   vtk-5.6.1.ebuild:
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 2dbcd8b4c8d1..42dedf8d942d 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -11,7 +11,8 @@ AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6
 AUX vtk-5.6.0-ffmpeg.patch 1230 RMD160 50288650daec6834ff099d4af4b739297a1ea943 SHA1 592d2c73e5fda8845007766f7e7c1d5a63ebbec2 SHA256 18d4cbdb1c04b2d5e1fc0d350f653b15c4d1978a4ad601242f173c2282d6dd01
 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9
 AUX vtk-5.6.0-odbc.patch 328 RMD160 888680f3e503f8ce624c73df9bb0402309c1384b SHA1 02022f5f345ccfe8a13d99201828edb0371d7cc5 SHA256 eca7a508fcd07eb6d40e609e3670d12ce2d2d39dda11b60f418acd279ca03c25
-AUX vtk-5.6.1-ffmpeg.patch 1227 RMD160 0de6b2a6510f7afbe625527e8b7c5b7e259f6829 SHA1 01bc4d42894926f7e61bff7fa2270b1a6eac8ffc SHA256 9bb10f76b0499139272546e1dd089a9ed9410b1ddbccbca700ba526206f17f59
+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
 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
 DIST vtk-5.6.1.tar.gz 20780311 RMD160 ac1864c9604d843ab9c654c67109f4f1487acaee SHA1 6d4d0de3b468828f21f70c5af5e37f9412ee59c5 SHA256 007be00bae6c7c96f78ca9709516c993a4e3221d0b1762a7fe70e2abe407e86d
@@ -22,15 +23,15 @@ DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc975540
 DIST vtkdata-5.6.0.tar.gz 76716069 RMD160 8499816f6d714408c0f7f584fb4d781f4426e444 SHA1 e0aa26dafd653da1db21fc97ce15aa0599d9c5ad SHA256 e6eed8e5c8d8410d7c7cf007de8c5b56bde77d38fa0522c1ac7751138323c9cf
 DIST vtkdata-5.6.1.tar.gz 77991728 RMD160 b77b5f6919beae406712b93cd333dd4fad5ff3d1 SHA1 7350863d6351a961c4813ad6e73f74428307cd35 SHA256 ad2f8c99940f07f3edcbf71d838717c5c55d252cc8a67e705620858adaaa66f2
 EBUILD vtk-5.4.2-r1.ebuild 6379 RMD160 f796f2c974ca58fe7b34b62057d832e76950e6d8 SHA1 46c2fbe8ef5730744bb655e042661810e942d9f5 SHA256 966efe98dc9a1a48fd3faab5e1e0ec4eae636d45773f2f7bd49f455a4e30474d
-EBUILD vtk-5.6.0-r2.ebuild 7152 RMD160 7ae37103759500ae82b2b3aa7356ca393d411db1 SHA1 daa8a9be15b6dd5878b69df702b7beaa2495aa99 SHA256 1ca8bb7f7017b724cc3f5f26e6ec58125aaca336a1b4d10f75d4b2090c8e7f9d
-EBUILD vtk-5.6.0-r3.ebuild 6989 RMD160 1a1a9652950d996591b9d2ce5c2d462113abdb80 SHA1 2c1666f44b68b60e19fb47dd410431bf5cee448a SHA256 b67296afbd9a6855aa3f0a8decd4f1e45a8339c9ec2280f4a872a140839d15f9
-EBUILD vtk-5.6.1.ebuild 7021 RMD160 c5511476c8407c9b291f5a335c83048380276ebf SHA1 56b6a93c4b8a61b0a0d637acad0d1f573c015ae1 SHA256 d90dec9d903cace0a1fe326abb6662a7afc0efea544c3ef551f79eb256b19f3b
-MISC ChangeLog 14261 RMD160 42efa23cc56a9a4372c16ab0409897f0ef711115 SHA1 e5d5fd37f39fa09180a3094ee2bbf85866a965fd SHA256 45680c6cd611f08250619718bd10311bf8c707c1bdfa44d376b5aec6688522df
+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 7057 RMD160 3e016372df18d77ec93a72c65036456fb37aee38 SHA1 66b7a6aa787b14748257d18e5ad34e12be1e0f3a SHA256 094bef0bc96dc37933f9e36d8cfaed719a34d548af6641b1693b9485157086c1
+MISC ChangeLog 14490 RMD160 a87bb8328e05d601deefa3cade59657dc0d7e348 SHA1 4f88bcb51e56dc170c3e6fea6bf2e1e5b760778d SHA256 532ed47c4177435af024a1df3450455e7384195c91d6aeee3b03c92804895c9c
 MISC metadata.xml 574 RMD160 ccd927f3a387710bbf53f3f0f88c971dc814c605 SHA1 8160c080306039e0b3b18ced75ae6b81b8590ddc SHA256 9a3ca872da01db519865e7753e9c0922fe56972f4d6e27cbf5622afd41d23300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2q8CMACgkQgAnW8HDreRbFvwCfTA9p8G1RlzsRChHp2UIXvh60
-OUsAmgPcWDHwAikbneHtODt4HexzSjsn
-=YqK7
+iEYEARECAAYFAk21RCMACgkQgAnW8HDreRbU+gCfbJuU/EwADup22DklB1uY8YwW
+FmcAoKn7u5qkVMmK1LY7C5Hgdd9dNuKT
+=vd4J
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
index 0a347770b0e7..34ec528854a7 100644
--- a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
+++ b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch
@@ -11,7 +11,7 @@ index ad691e3..32489d5 100644
  extern "C" {
  #ifdef HAS_OLD_HEADER
 -# include <ffmpeg/avformat.h>
-+# include <libavcodec/avformat.h>
++# include <libavformat/avformat.h>
  #else
  # include <libavformat/avformat.h>
  #endif
@@ -23,7 +23,7 @@ index 0bf4314..1c10a93 100644
  extern "C" {
  #ifdef HAS_OLD_HEADER
 -# include <ffmpeg/avformat.h>
-+# include <libavcodec/avformat.h>
++# include <libavformat/avformat.h>
  #else
  # include <libavformat/avformat.h>
  #endif
@@ -36,7 +36,7 @@ index 52673ef..ffbb78f 100644
  extern "C" {
  #ifdef VTK_FFMPEG_HAS_OLD_HEADER
 -# include <ffmpeg/avformat.h>
-+# include <libavcodec/avformat.h>
++# include <libavformat/avformat.h>
  #else
  # include <libavformat/avformat.h>
  #endif
diff --git a/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch b/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch
new file mode 100644
index 000000000000..263e24f69b3d
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch
@@ -0,0 +1,29 @@
+ Common/vtkPythonUtil.cxx          |    2 ++
+ Utilities/vtkmetaio/metaUtils.cxx |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/Common/vtkPythonUtil.cxx b/Common/vtkPythonUtil.cxx
+index 7bc7660..d218e0d 100644
+--- a/Common/vtkPythonUtil.cxx
++++ b/Common/vtkPythonUtil.cxx
+@@ -31,6 +31,8 @@
+ #include <vtkstd/map>
+ #include <vtkstd/string>
+ 
++#include <cstddef>
++
+ // Silent warning like
+ // "dereferencing type-punned pointer will break strict-aliasing rules"
+ // it happens because this kind of expression: (long *)&ptr
+diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx
+index 08d3e8d..bbcc9ec 100644
+--- a/Utilities/vtkmetaio/metaUtils.cxx
++++ b/Utilities/vtkmetaio/metaUtils.cxx
+@@ -37,6 +37,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <string>
++#include <cstddef>
+ 
+ #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
+ #include <mem.h>
diff --git a/sci-libs/vtk/vtk-5.6.0-r2.ebuild b/sci-libs/vtk/vtk-5.6.0-r2.ebuild
index 3cb3bb8b42c2..efa8356ec1ea 100644
--- a/sci-libs/vtk/vtk-5.6.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-5.6.0-r2.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.0-r2.ebuild,v 1.9 2011/04/16 11:04:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r2.ebuild,v 1.10 2011/04/25 09:51:24 jlec Exp $
 
 EAPI="3"
 
@@ -82,7 +82,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-boost-property_map.patch \
 		"${FILESDIR}"/${P}-libpng14.patch \
 		"${FILESDIR}"/${P}-R.patch \
-		"${FILESDIR}"/${P}-odbc.patch
+		"${FILESDIR}"/${P}-odbc.patch \
+		"${FILESDIR}"/${PN}-5.6.1-gcc-46.patch
 	sed -e "s:@VTK_TCL_LIBRARY_DIR@:/usr/$(get_libdir):" \
 		-i Wrapping/Tcl/pkgIndex.tcl.in \
 		|| die "Failed to fix tcl pkgIndex file"
diff --git a/sci-libs/vtk/vtk-5.6.0-r3.ebuild b/sci-libs/vtk/vtk-5.6.0-r3.ebuild
index be42b40b5d4e..2f1863dae7ca 100644
--- a/sci-libs/vtk/vtk-5.6.0-r3.ebuild
+++ b/sci-libs/vtk/vtk-5.6.0-r3.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.0-r3.ebuild,v 1.2 2011/04/17 13:50:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.0-r3.ebuild,v 1.3 2011/04/25 09:51:24 jlec Exp $
 
 EAPI="3"
 
@@ -83,7 +83,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-libpng14.patch \
 		"${FILESDIR}"/${P}-R.patch \
 		"${FILESDIR}"/${P}-odbc.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${PN}-5.6.1-gcc-46.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):" \
 		-i Utilities/kwsys/SystemInformation.cxx \
diff --git a/sci-libs/vtk/vtk-5.6.1.ebuild b/sci-libs/vtk/vtk-5.6.1.ebuild
index 95457426d361..3dc8207b202b 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.2 2011/04/17 13:50:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.6.1.ebuild,v 1.3 2011/04/25 09:51:24 jlec Exp $
 
 EAPI="3"
 
@@ -82,7 +82,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.6.0-libpng14.patch \
 		"${FILESDIR}"/${PN}-5.6.0-R.patch \
 		"${FILESDIR}"/${PN}-5.6.0-odbc.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-gcc-46.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):" \