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

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 9a0ff865e8a6ffdb761c297160e3af834d49f6fa
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed May 22 21:58:33 2013 +0200

    Enable FFMPEG-support.

diff --git a/debian/patches/enable_FFMPEG.patch b/debian/patches/enable_FFMPEG.patch
new file mode 100644
index 0000000..04eb8f4
--- /dev/null
+++ b/debian/patches/enable_FFMPEG.patch
@@ -0,0 +1,96 @@
+Description: enable FFMPEG
+Author: Utkarsh Ayachit <utkarsh.ayachit at kitware.com>
+Applied-Upstream: http://review.source.kitware.com/gitweb?p=ParaView.git;a=commit;h=6230007db27edc8c5fa93897d2351c6f7611b880
+Last-Update: 2013-05-22
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -514,17 +514,6 @@
+ # Based on state of VTK modules, set up some variables that paraview needs to
+ # compile optional code.
+ 
+-# FIXME: VTK_HAS_* variables need to be removed, it's not wise to enable
+-# ParaView components based on if something was enabled in VTK or not.
+-set (VTK_HAS_OGGTHEORA_SUPPORT FALSE)
+-set (VTK_HAS_FFMPEG_SUPPORT FALSE)
+-if (TARGET vtkIOFFMPEG AND PARAVIEW_ENABLE_FFMPEG)
+-  set (VTK_HAS_FFMPEG_SUPPORT TRUE)
+-endif()
+-if (TARGET vtkoggtheora)
+-  set (VTK_HAS_OGGTHEORA_SUPPORT TRUE)
+-endif()
+-
+ configure_file(
+   ${ParaView_SOURCE_DIR}/vtkPVConfig.h.in
+   ${ParaView_BINARY_DIR}/vtkPVConfig.h
+--- a/vtkPVConfig.h.in
++++ b/vtkPVConfig.h.in
+@@ -88,8 +88,7 @@
+ // and double to string
+ #define DEFAULT_DOUBLE_PRECISION_VALUE 16
+ 
+-#cmakedefine VTK_HAS_FFMPEG_SUPPORT
+-#cmakedefine VTK_HAS_OGGTHEORA_SUPPORT
++#cmakedefine PARAVIEW_ENABLE_FFMPEG
+ 
+ #cmakedefine PARAVIEW_USE_PISTON
+ 
+--- a/CMake/VTKModules.cmake
++++ b/CMake/VTKModules.cmake
+@@ -351,11 +351,7 @@
+ endif()
+ 
+ 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()
+ 
+ # Any module can import this file and add DEPENDS or COMPILE_DEPENDS on this
+--- a/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx
++++ b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx
+@@ -45,11 +45,12 @@
+ #ifdef _WIN32
+ # include "vtkAVIWriter.h"
+ #else
+-# ifdef VTK_HAS_FFMPEG_SUPPORT
++# ifdef PARAVIEW_ENABLE_FFMPEG
+ #   include "vtkFFMPEGWriter.h"
+ # endif
+ #endif
+ 
++#include "vtkIOMovieConfigure.h" // for VTK_HAS_OGGTHEORA_SUPPORT
+ #ifdef VTK_HAS_OGGTHEORA_SUPPORT
+ #  include "vtkOggTheoraWriter.h"
+ #endif
+@@ -345,7 +346,7 @@
+     mwriter = avi;
+     }
+ #else
+-# ifdef VTK_HAS_FFMPEG_SUPPORT
++# ifdef PARAVIEW_ENABLE_FFMPEG
+   else if (extension == ".avi")
+     {
+     vtkFFMPEGWriter *aviwriter = vtkFFMPEGWriter::New();
+--- a/ParaViewCore/ClientServerCore/Core/vtkPVServerInformation.cxx
++++ b/ParaViewCore/ClientServerCore/Core/vtkPVServerInformation.cxx
+@@ -51,15 +51,10 @@
+ #if defined(_WIN32)
+   this->AVISupport = 1;
+ #else
+-# if defined(VTK_HAS_FFMPEG_SUPPORT)
++# if defined(PARAVIEW_ENABLE_FFMPEG)
+   this->AVISupport = 1;
+ # endif
+ #endif
+-#if defined(VTK_HAS_OGGTHEORA_SUPPORT)
+-  this->OGVSupport = 1;
+-#else
+-  this->OGVSupport = 0;
+-#endif
+ 
+   this->RenderModuleName = NULL;
+   this->MachinesInternals = new vtkPVServerOptionsInternals;
diff --git a/debian/patches/series b/debian/patches/series
index 12c90db..7224ce5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_manpages_errors.patch
+enable_FFMPEG.patch

-- 
Paraview packaging