[SCM] Paraview packaging branch, master, updated. debian/4.0.0_rc1-1-6-g068334d
Anton Gladky
gladky.anton at gmail.com
Thu Jun 13 05:40:38 UTC 2013
The following commit has been merged in the master branch:
commit 00be8a97e0a765cbef68665ee0a658d2294cbe0d
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue Jun 11 21:49:17 2013 +0200
Remove patches, applied by upstream.
diff --git a/debian/patches/enable_FFMPEG.patch b/debian/patches/enable_FFMPEG.patch
deleted file mode 100644
index 62f20ee..0000000
--- a/debian/patches/enable_FFMPEG.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-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
-@@ -350,14 +350,6 @@
- list (APPEND _vtk_modules vtkRenderingMatplotlib)
- endif()
-
--if (PARAVIEW_ENABLE_FFMPEG)
-- list(APPEND extra_depends vtkIOFFMPEG)
--endif()
--
--if (NOT "${CMAKE_C_COMPILER_ID}" MATCHES "^XL$")
-- list(APPEND extra_depends vtkoggtheora)
--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 @@
- #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;
---- 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
deleted file mode 100644
index 88e3d4c..0000000
--- a/debian/patches/fix_compilation_FFMPEG.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -153,7 +153,11 @@
- strcpy(this->avFormatContext->filename, this->Writer->GetFileName());
-
- //create a stream for that file
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-+ this->avStream = av_new_stream(this->avFormatContext, 0);
-+#else
- this->avStream = av_new_stream(this->avFormatContext, 0);
-+#endif
- if (!this->avStream)
- {
- vtkGenericWarningMacro (<< "Could not create video stream.");
-@@ -231,7 +235,11 @@
- vtkGenericWarningMacro (<< "Codec not found." );
- return 0;
- }
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
- if (avcodec_open(c, codec) < 0)
-+#else
-+ if (avcodec_is_open(c) < 0)
-+#endif
- {
- vtkGenericWarningMacro (<< "Could not open codec.");
- return 0;
diff --git a/debian/patches/fix_ogg.patch b/debian/patches/fix_ogg.patch
deleted file mode 100644
index 19fca64..0000000
--- a/debian/patches/fix_ogg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 95d03a1..12c90db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
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