[paraview] 01/01: Disable WEB.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository paraview.

commit 029a9dc81acde0b5c4846c52484730e5e4d93477
Author: Anton Gladky <gladk at debian.org>
Date:   Wed May 21 21:14:06 2014 +0200

    Disable WEB.
---
 debian/patches/fix_libav10.patch | 17 +++++------------
 debian/rules                     |  2 ++
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/patches/fix_libav10.patch b/debian/patches/fix_libav10.patch
index 5727b43..0c95987 100644
--- a/debian/patches/fix_libav10.patch
+++ b/debian/patches/fix_libav10.patch
@@ -4,9 +4,11 @@ Applied-Upstream: http://review.source.kitware.com/#/c/14289/
 Reviewed-By: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-05-14
 
---- a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -143,11 +143,11 @@
+Index: ParaView-v4.1.0/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+===================================================================
+--- ParaView-v4.1.0.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ ParaView-v4.1.0/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -143,11 +143,11 @@ int vtkFFMPEGWriterInternal::Start()
    if (this->Writer->GetCompression())
      {
      //choose a codec that is easily playable on windows
@@ -20,12 +22,3 @@ Last-Update: 2014-05-14
      }
  
    //assign the format to the context
-@@ -170,7 +170,7 @@
- 
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
--  c->codec_id = (CodecID)this->avOutputFormat->video_codec;
-+  c->codec_id = (AVCodecID)this->avOutputFormat->video_codec;
- #ifdef VTK_FFMPEG_HAS_OLD_HEADER
-   c->codec_type = CODEC_TYPE_VIDEO;
- #else
diff --git a/debian/rules b/debian/rules
index 9f9ea3a..76d39e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ extra_flags += -Wno-dev \
 	-DVTK_USE_MPEG2_ENCODER=OFF \
  	-DVTK_USE_FFMPEG_ENCODER=ON \
  	-DPARAVIEW_ENABLE_FFMPEG=ON \
+	-DPARAVIEW_ENABLE_WEB=OFF \
 	-DVTK_USE_OGGTHEORA_ENCODER=ON \
 	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
 	-DVTK_INSTALL_LIBRARY_DIR="lib/paraview" \
@@ -56,6 +57,7 @@ extra_flags += -Wno-dev \
 	
   
 override_dh_auto_configure:
+	touch VTK/Web/WebGLExporter/glMatrix.js
 	dh_auto_configure -- $(extra_flags)
 
 override_dh_compress:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git