[SCM] Paraview packaging branch, master, updated. debian/4.0.0_rc1-1-1-g362e731

Anton Gladky gladky.anton at gmail.com
Mon May 27 20:58:44 UTC 2013


The following commit has been merged in the master branch:
commit 362e7310193137163093ffaad0db33889c683580
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon May 27 22:58:34 2013 +0200

    Fix ogg extension definition.

diff --git a/debian/patches/fix_ogg.patch b/debian/patches/fix_ogg.patch
new file mode 100644
index 0000000..19fca64
--- /dev/null
+++ b/debian/patches/fix_ogg.patch
@@ -0,0 +1,24 @@
+Description: fixes ogg extension definition.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-05-27
+
+--- a/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx
++++ b/ParaViewCore/ServerManager/Default/vtkSMAnimationSceneImageWriter.cxx
+@@ -51,7 +51,7 @@
+ #endif
+ 
+ //#include "vtkIOMovieConfigure.h" // for VTK_HAS_OGGTHEORA_SUPPORT
+-#ifdef VTK_HAS_OGGTHEORA_SUPPORT
++#ifdef VTK_USE_OGGTHEORA_ENCODER
+ #  include "vtkOggTheoraWriter.h"
+ #endif
+ 
+@@ -358,7 +358,7 @@
+     }
+ # endif
+ #endif
+-#ifdef VTK_HAS_OGGTHEORA_SUPPORT
++#ifdef VTK_USE_OGGTHEORA_ENCODER
+   else if (extension == ".ogv" || extension == ".ogg")
+     {
+     vtkOggTheoraWriter *ogvwriter = vtkOggTheoraWriter::New();
diff --git a/debian/patches/series b/debian/patches/series
index d503356..95d03a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_manpages_errors.patch
 enable_FFMPEG.patch
 fix_compilation_FFMPEG.patch
+fix_ogg.patch

-- 
Paraview packaging



More information about the debian-science-commits mailing list