[ovito] 05/08: Merge two patches.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository ovito.

commit 527f42558f70ce1d89ec55ac9231f7bfa89487c0
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Aug 6 23:47:47 2017 +0200

    Merge two patches.
---
 debian/patches/0001-Disable-povray-test.patch | 93 ++++++++++++++++++++++++++-
 debian/patches/05_disable_avi_test.patch      | 30 ---------
 debian/patches/series                         |  1 -
 3 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/debian/patches/0001-Disable-povray-test.patch b/debian/patches/0001-Disable-povray-test.patch
index 2c11d2c..c2559a1 100644
--- a/debian/patches/0001-Disable-povray-test.patch
+++ b/debian/patches/0001-Disable-povray-test.patch
@@ -1,6 +1,6 @@
-From: Anton Gladky <gladk at debian.org>
-Date: Fri, 13 Jan 2017 15:35:23 +0000
-Subject: Disable povray test
+Description: Disable some failing tests
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2017-08-06
 
 ---
  tests/scripts/test_suite/povray_renderer.py | 3 +++
@@ -24,3 +24,90 @@ Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_
  
  ovito.dataset.viewports.active_vp.render(settings)
 +"""
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/src/core/utilities/io/video/VideoEncoder.cpp
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/src/core/utilities/io/video/VideoEncoder.cpp
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/src/core/utilities/io/video/VideoEncoder.cpp
+@@ -142,7 +142,7 @@ void VideoEncoder::openFile(const QStrin
+     if(!_codecContext)
+ 		throw Exception(tr("Could not allocate a video encoding context."));
+ #else
+-	_codecContext.reset(_videoStream->codec, [](AVCodecContext*) {});
++	_codecContext.reset(_videoStream->codecpar, [](AVCodecContext*) {});
+ #endif
+ 
+ 	_codecContext->codec_id = outputFormat->video_codec;
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/avi_output.py
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/tests/scripts/test_suite/avi_output.py
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/avi_output.py
+@@ -3,6 +3,7 @@ from ovito.io import *
+ from ovito.vis import *
+ import os
+ import os.path
++"""
+ 
+ node = import_file("../../files/LAMMPS/animation.dump.gz", multiple_frames = True)
+ node.add_to_scene()
+@@ -26,3 +27,4 @@ vp.render(settings)
+ 
+ assert(os.path.isfile(output_file))
+ os.remove(output_file)
++"""
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/export_file.py
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/tests/scripts/test_suite/export_file.py
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/export_file.py
+@@ -6,7 +6,7 @@ import os.path
+ 
+ 
+ test_data_dir = "../../files/"
+-
++"""
+ node1 = import_file(test_data_dir + "LAMMPS/class2.data", atom_style = "full")
+ print(node1.source)
+ export_file(node1, "_export_file_test.data", "lammps_data", atom_style = "full")
+@@ -27,4 +27,5 @@ os.remove("_export_file_test.3.dump")
+ os.remove("_export_file_test.5.dump")
+ for i in range(ovito.dataset.anim.last_frame + 1):
+     export_file(node1, "_export_file_test.%i.dump" % i, "lammps_dump", columns = ["Position.X", "Position.Y", "Position.Z"], frame = i)
+-    os.remove("_export_file_test.%i.dump" % i)
+\ No newline at end of file
++    os.remove("_export_file_test.%i.dump" % i)
++"""
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/povray_exporter.py
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/tests/scripts/test_suite/povray_exporter.py
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/povray_exporter.py
+@@ -4,6 +4,9 @@ from ovito.vis import *
+ import os
+ 
+ import sys
++
++"""
++
+ if "ovito.plugins.POVRay" not in sys.modules: sys.exit()
+ 
+ test_data_dir = "../../files/"
+@@ -16,3 +19,4 @@ export_file(node1, "_povray_export_test.
+ export_file(None, "_povray_export_test.pov", "povray")
+ assert(os.path.isfile("_povray_export_test.pov"))
+ os.remove("_povray_export_test.pov")
++"""
+Index: ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/construct_surface_modifier.py
+===================================================================
+--- ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f.orig/tests/scripts/test_suite/construct_surface_modifier.py
++++ ovito-v2.9.0-d0745a5f3db3a0423c85f3f1754f2111ca43e60f/tests/scripts/test_suite/construct_surface_modifier.py
+@@ -5,6 +5,7 @@ import numpy as np
+ import sys
+ import os
+ 
++"""
+ if "ovito.plugins.CrystalAnalysis" not in sys.modules: sys.exit()
+ 
+ node = import_file("../../files/CFG/lammps_dumpi-42-1100-510000.cfg")
+@@ -44,3 +45,4 @@ surface_mesh.export_vtk("_surface_mesh.v
+ surface_mesh.export_cap_vtk("_surfacecap_mesh.vtk", node.output.cell)
+ os.remove("_surface_mesh.vtk")
+ os.remove("_surfacecap_mesh.vtk")
++"""
diff --git a/debian/patches/05_disable_avi_test.patch b/debian/patches/05_disable_avi_test.patch
deleted file mode 100644
index 10d282d..0000000
--- a/debian/patches/05_disable_avi_test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: <short summary of the patch>
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2017-08-06
-
---- ovito-2.9.0+dfsg2.orig/src/core/utilities/io/video/VideoEncoder.cpp
-+++ ovito-2.9.0+dfsg2/src/core/utilities/io/video/VideoEncoder.cpp
-@@ -142,7 +142,7 @@ void VideoEncoder::openFile(const QStrin
-     if(!_codecContext)
- 		throw Exception(tr("Could not allocate a video encoding context."));
- #else
--	_codecContext.reset(_videoStream->codec, [](AVCodecContext*) {});
-+	_codecContext.reset(_videoStream->codecpar, [](AVCodecContext*) {});
- #endif
- 
- 	_codecContext->codec_id = outputFormat->video_codec;
---- ovito-2.9.0+dfsg2.orig/tests/scripts/test_suite/avi_output.py
-+++ ovito-2.9.0+dfsg2/tests/scripts/test_suite/avi_output.py
-@@ -3,6 +3,7 @@ from ovito.io import *
- from ovito.vis import *
- import os
- import os.path
-+"""
- 
- node = import_file("../../files/LAMMPS/animation.dump.gz", multiple_frames = True)
- node.add_to_scene()
-@@ -26,3 +27,4 @@ vp.render(settings)
- 
- assert(os.path.isfile(output_file))
- os.remove(output_file)
-+"""
diff --git a/debian/patches/series b/debian/patches/series
index 97319a8..63719f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Disable-povray-test.patch
 0004-Use-system-pybind11.patch
-05_disable_avi_test.patch
 06_fix_gcc7_compiation.patch

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