diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-04-25 09:51:24 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-04-25 09:51:24 +0000 |
| commit | 0ef50f20e81b78bf5648cb2543e5dbf5a2ccc3b0 (patch) | |
| tree | 45991aec8b55b7c7db15e7711cadfef55897836e /sci-libs/vtk/files | |
| parent | Stable on amd64 wrt bug #364191 (diff) | |
| download | gentoo-2-0ef50f20e81b78bf5648cb2543e5dbf5a2ccc3b0.tar.gz gentoo-2-0ef50f20e81b78bf5648cb2543e5dbf5a2ccc3b0.tar.bz2 gentoo-2-0ef50f20e81b78bf5648cb2543e5dbf5a2ccc3b0.zip | |
Correct patch for USE=ffmpeg, 327957; Fix for gcc-4.6
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/vtk/files')
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch | 6 | ||||
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch | 29 |
2 files changed, 32 insertions, 3 deletions
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> |