[SCM] Paraview packaging branch, experimental, updated. debian/3.98.2_git201306024.904e8ad-1_exp1-9-g1625be0

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 036f2813e13c2875c3767af1a647fe4997f92a83
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu May 23 22:17:38 2013 +0200

    Fix compilation against FFMPEG.

diff --git a/debian/patches/enable_FFMPEG.patch b/debian/patches/enable_FFMPEG.patch
index 04eb8f4..62f20ee 100644
--- a/debian/patches/enable_FFMPEG.patch
+++ b/debian/patches/enable_FFMPEG.patch
@@ -37,19 +37,21 @@ Last-Update: 2013-05-22
  
 --- a/CMake/VTKModules.cmake
 +++ b/CMake/VTKModules.cmake
-@@ -351,11 +351,7 @@
+@@ -350,14 +350,6 @@
+   list (APPEND _vtk_modules vtkRenderingMatplotlib)
  endif()
  
- if (PARAVIEW_ENABLE_FFMPEG)
+-if (PARAVIEW_ENABLE_FFMPEG)
 -  list(APPEND extra_depends vtkIOFFMPEG)
 -endif()
 -
 -if (NOT "${CMAKE_C_COMPILER_ID}" MATCHES "^XL$")
 -  list(APPEND extra_depends vtkoggtheora)
-+  list(APPEND _vtk_modules vtkIOFFMPEG)
- endif()
- 
+-endif()
+-
  # Any module can import this file and add DEPENDS or COMPILE_DEPENDS on this
+ # list of modules to ensure that these are enabled when the corresponding module
+ # is enabled.
 --- a/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx
 +++ b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx
 @@ -45,11 +45,12 @@
@@ -62,7 +64,7 @@ Last-Update: 2013-05-22
  # endif
  #endif
  
-+#include "vtkIOMovieConfigure.h" // for VTK_HAS_OGGTHEORA_SUPPORT
++//#include "vtkIOMovieConfigure.h" // for VTK_HAS_OGGTHEORA_SUPPORT
  #ifdef VTK_HAS_OGGTHEORA_SUPPORT
  #  include "vtkOggTheoraWriter.h"
  #endif
@@ -94,3 +96,27 @@ Last-Update: 2013-05-22
  
    this->RenderModuleName = NULL;
    this->MachinesInternals = new vtkPVServerOptionsInternals;
+--- a/ParaViewCore/ServerManager/Default/module.cmake
++++ b/ParaViewCore/ServerManager/Default/module.cmake
+@@ -1,3 +1,9 @@
++# If FFMPEG support is enabled, we need to depend on FFMPEG.
++set (__extra_dependencies)
++if (PARAVIEW_ENABLE_FFMPEG)
++  list(APPEND __extra_dependencies vtkIOFFMPEG)
++endif()
++
+ vtk_module(vtkPVServerManagerDefault
+   DEPENDS
+     vtkIOMovie
+@@ -6,9 +12,10 @@
+     vtkPVServerManagerRendering
+     vtkRenderingVolumeOpenGL
+     vtkTestingRendering
++    ${__extra_dependencies}
+   TEST_DEPENDS
+     vtkPVServerManagerApplication
+   TEST_LABELS
+     PARAVIEW
+ )
+-unset(extra_depends)
++unset(__extra_dependencies)
diff --git a/debian/patches/fix_compilation_FFMPEG.patch b/debian/patches/fix_compilation_FFMPEG.patch
new file mode 100644
index 0000000..441739b
--- /dev/null
+++ b/debian/patches/fix_compilation_FFMPEG.patch
@@ -0,0 +1,20 @@
+--- a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -153,7 +153,7 @@
+   strcpy(this->avFormatContext->filename, this->Writer->GetFileName());
+ 
+   //create a stream for that file
+-  this->avStream = av_new_stream(this->avFormatContext, 0);
++  this->avStream = avformat_new_stream(this->avFormatContext, 0);
+   if (!this->avStream)
+     {
+     vtkGenericWarningMacro (<< "Could not create video stream.");
+@@ -231,7 +231,7 @@
+     vtkGenericWarningMacro (<< "Codec not found." );
+     return 0;
+     }
+-  if (avcodec_open(c, codec) < 0)
++  if (avcodec_is_open(c) < 0)
+     {
+     vtkGenericWarningMacro (<< "Could not open codec.");
+     return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 7224ce5..d503356 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_manpages_errors.patch
 enable_FFMPEG.patch
+fix_compilation_FFMPEG.patch

-- 
Paraview packaging