[ovito] 01/03: Update/remove patches.
Anton Gladky
gladk at moszumanska.debian.org
Sun Nov 27 21:59:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository ovito.
commit 92617b47a0d87d4f235d95198ff571405e706f1e
Author: Anton Gladky <gladk at debian.org>
Date: Sun Nov 27 22:44:52 2016 +0100
Update/remove patches.
---
debian/patches/10_add_c+11.patch | 42 ----------------------
debian/patches/10_disable_povray.patch | 20 +++++++++++
.../20_disable_statisticsend_bydefault.patch | 15 --------
debian/patches/ffmpeg_2.9.patch | 39 --------------------
debian/patches/series | 4 +--
5 files changed, 21 insertions(+), 99 deletions(-)
diff --git a/debian/patches/10_add_c+11.patch b/debian/patches/10_add_c+11.patch
deleted file mode 100644
index 42adbf2..0000000
--- a/debian/patches/10_add_c+11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- ovito (2.2.4-4) unstable; urgency=medium
- .
- * [10caab6] Remove dirs-directory.
- * [9967551] Reformat debian/copyright in DEP-5.
- * [0f18544] Set Standards-Version: 3.9.5
- * [3584ded] Simlpify debian/rules.
- * [b073cae] Set Debian-Science-Team as maintainer of the package.
- (Closes: #674283)
- * [872d024] Use wrap-and-sort.
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/674283
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ovito-2.2.4.orig/src/plugins/crystalanalysis/CMakeLists.txt
-+++ ovito-2.2.4/src/plugins/crystalanalysis/CMakeLists.txt
-@@ -25,6 +25,7 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
- ADD_DEFINITIONS(-DCGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG)
- ENDIF()
-
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
- SET(OVITO_CRYSTALANALYSIS_SOURCE_FILES
- importer/CAImporter.cpp
- data/patterns/BurgersVectorFamily.cpp
diff --git a/debian/patches/10_disable_povray.patch b/debian/patches/10_disable_povray.patch
new file mode 100644
index 0000000..75fa653
--- /dev/null
+++ b/debian/patches/10_disable_povray.patch
@@ -0,0 +1,20 @@
+Description: Disable povray test
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-11-27
+
+--- ovito-2.8.0.orig/tests/scripts/test_suite/povray_renderer.py
++++ ovito-2.8.0/tests/scripts/test_suite/povray_renderer.py
+@@ -3,6 +3,8 @@ from ovito.io import import_file
+ from ovito.vis import *
+
+ test_data_dir = "../../files/"
++
++"""
+ node1 = import_file(test_data_dir + "LAMMPS/class2.data", atom_style = "full")
+ node1.add_to_scene()
+ node1.source.particle_properties.position.display.radius = 0.3
+@@ -22,3 +24,4 @@ print("aperture:", settings.renderer.ape
+ print("blur_samples:", settings.renderer.blur_samples)
+
+ ovito.dataset.viewports.active_vp.render(settings)
++"""
diff --git a/debian/patches/20_disable_statisticsend_bydefault.patch b/debian/patches/20_disable_statisticsend_bydefault.patch
deleted file mode 100644
index ffddbe9..0000000
--- a/debian/patches/20_disable_statisticsend_bydefault.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Disable statistic send by default
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-07-24
-
---- ovito-2.3.3.orig/src/core/gui/dialogs/GeneralSettingsPage.cpp
-+++ ovito-2.3.3/src/core/gui/dialogs/GeneralSettingsPage.cpp
-@@ -109,7 +109,7 @@ void GeneralSettingsPage::insertSettings
- layout2->addWidget(_enableUsageStatistics, 1, 0);
-
- _enableUpdateChecks->setChecked(settings.value("updates/check_for_updates", true).toBool());
-- _enableUsageStatistics->setChecked(settings.value("updates/transmit_id", true).toBool());
-+ _enableUsageStatistics->setChecked(settings.value("updates/transmit_id", false).toBool());
-
- connect(_enableUpdateChecks, &QCheckBox::toggled, _enableUsageStatistics, &QCheckBox::setEnabled);
- _enableUsageStatistics->setEnabled(_enableUpdateChecks->isChecked());
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index cc0202d..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Acked-By: Anton Gladky <gladk at debian.org>
-Last-Update: <2015-11-02>
-
-Index: ovito/src/3rdparty/video/VideoEncoder.cpp
-===================================================================
---- ovito.orig/src/3rdparty/video/VideoEncoder.cpp
-+++ ovito/src/3rdparty/video/VideoEncoder.cpp
-@@ -147,9 +147,9 @@ void VideoEncoder::openFile(const QStrin
- _codecContext->time_base.num = 1;
- _codecContext->gop_size = 12; // Emit one intra frame every twelve frames at most.
- if(qstrcmp(outputFormat->name, "gif") != 0)
-- _codecContext->pix_fmt = PIX_FMT_YUV420P;
-+ _codecContext->pix_fmt = AV_PIX_FMT_YUV420P;
- else
-- _codecContext->pix_fmt = PIX_FMT_RGB24;
-+ _codecContext->pix_fmt = AV_PIX_FMT_RGB24;
-
- /// Some formats want stream headers to be separate.
- if(_formatContext->oformat->flags & AVFMT_GLOBALHEADER)
-@@ -167,7 +167,7 @@ void VideoEncoder::openFile(const QStrin
- throw Exception(tr("Could not open video codec: %1").arg(errorMessage(errCode)));
-
- // Allocate and init a YUV frame.
-- _frame.reset(avcodec_alloc_frame(), &av_free);
-+ _frame.reset(av_frame_alloc(), &av_free);
- if(!_frame)
- throw Exception(tr("Could not allocate video frame."));
-
-@@ -256,7 +256,7 @@ void VideoEncoder::writeFrame(const QIma
- throw Exception(tr("Frame image has wrong pixel format."));
-
- // Create conversion context.
-- _imgConvertCtx = sws_getCachedContext(_imgConvertCtx, videoWidth, videoHeight, PIX_FMT_BGRA,
-+ _imgConvertCtx = sws_getCachedContext(_imgConvertCtx, videoWidth, videoHeight, AV_PIX_FMT_BGRA,
- videoWidth, videoHeight, _codecContext->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL);
- if(!_imgConvertCtx)
- throw Exception(tr("Cannot initialize SWS conversion context to convert video frame."));
diff --git a/debian/patches/series b/debian/patches/series
index 375b21c..b3bdb4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-10_add_c+11.patch
-20_disable_statisticsend_bydefault.patch
-ffmpeg_2.9.patch
+10_disable_povray.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ovito.git
More information about the debian-science-commits
mailing list