Your message dated Wed, 09 Dec 2015 22:43:45 +0000
with message-id <e1a6nsb-00017a...@franck.debian.org>
and subject line Bug#803851: fixed in ovito 2.3.3+dfsg1-2
has caused the Debian Bug report #803851,
regarding ovito: FTBFS with FFmpeg 2.9
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
803851: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803851
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: ovito
Version: 2.3.3+dfsg1-1
Severity: important
Tags: patch
User: pkg-multimedia-maintain...@lists.alioth.debian.org
Usertags: ffmpeg2.9

Dear Maintainer,

your package fails to build with the upcoming ffmpeg 2.9.
This bug will become release-critical at some point when the
ffmpeg2.9 transition gets closer.

Attached is a patch replacing the deprecated functionality.
It also works with ffmpeg 2.8.
Please apply this patch and forward it upstream, if necessary.

These changes have little regression potential.

Best regards,
Andreas

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..4e78e9a
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,36 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- ovito-2.3.3+dfsg1.orig/src/3rdparty/video/VideoEncoder.cpp
++++ ovito-2.3.3+dfsg1/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 110af2d..858e3ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_add_c+11.patch
 20_disable_statisticsend_bydefault.patch
+ffmpeg_2.9.patch

--- End Message ---
--- Begin Message ---
Source: ovito
Source-Version: 2.3.3+dfsg1-2

We believe that the bug you reported is fixed in the latest version of
ovito, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 803...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Anton Gladky <gl...@debian.org> (supplier of updated ovito package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 09 Dec 2015 22:42:51 +0100
Source: ovito
Binary: ovito ovito-doc
Architecture: source
Version: 2.3.3+dfsg1-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Science Maintainers 
<debian-science-maintainers@lists.alioth.debian.org>
Changed-By: Anton Gladky <gl...@debian.org>
Description:
 ovito      - visualization and analysis tool for atomistic simulation data
 ovito-doc  - documentation for ovito
Closes: 800480 803701 803851
Changes:
 ovito (2.3.3+dfsg1-2) unstable; urgency=medium
 .
   [ Andreas Cadhalpun ]
   * [d682b90] Add missing libcgal-qt5-dev. (Closes: #803701)
   * [98d5ee2] Replace deprecated FFmpeg API. (Closes: #803851)
 .
   [ Anton Gladky ]
   * [9a083b3] Set Architecture: any. (Closes: #800480)
   * [cb222ba] Ignore rpath-issue.
   * [017a6f3] Remove menu-file.
Checksums-Sha1:
 37f126fd12d3af696d3c9da500934b0c8f126d93 2475 ovito_2.3.3+dfsg1-2.dsc
 afa73e034185d226580cc2bf010871e7a7652a2d 10684 
ovito_2.3.3+dfsg1-2.debian.tar.xz
Checksums-Sha256:
 47c4abf27572ca0a787bbbc02f9fb9c8f64cd884b21744c1ffb81905e5a0ef7e 2475 
ovito_2.3.3+dfsg1-2.dsc
 6103d848ebb00e7d7fd98d5cc915336210deb2612d253976697538b27091df72 10684 
ovito_2.3.3+dfsg1-2.debian.tar.xz
Files:
 8db82f086645f117ec78e6fc2ce211b9 2475 science extra ovito_2.3.3+dfsg1-2.dsc
 c512c038bd1b7859967ccefc1119b7e9 10684 science extra 
ovito_2.3.3+dfsg1-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJWaKCWAAoJENPhc4PPp/8G7hMP/AgExGBMkkGc6eafvu65KGtq
Vp8gWuRr9mJQ+CVK7JxwEAiCz6LRHurDl8S9DTjFnUbWHpVKVtFUronOJyQ/3drz
5E/0vAAauheMuOFHdyHIQsBYaYDzAORiVanoemEJCMi4grROnqU6xRKUmFpeOVFe
bZH5ZwmLfT3vvwd2iqDxqa/N/QFEPlrPdH7Qjf2PUs5+/ZmVoTfPmDW7lgzwLuDK
EIe/kNXb2DGX72JL8kxb8wUmLRh+vFR27oKXT1r1yLsDLz5ZkW/M/HLQdiXPpzSL
gH+ChkqshxrETiIQsVO70rjbOsaZl9lW79BHG1/3xrlyUsw4sjFqigDBwL5cdzz/
5ipoWhNgF5WxovMY+gv0WJ08URCImtdHtp5f67vpKPziT0adtUyIbEEgzKenXp5S
/Ltwh8JGktCUfDHfSFp0368ZomSFYDp3Kf9jCoYozXJ6UDUVg+rERtEGBnvPhhSK
V7zQUqirHkJrPsTgSxsda5/WgAlsTorACPvT59c05b8CNAYgmPCEnJIOIzI/1yC3
vC34iVjLzSc88UJ+z6tJhIf+kTTn5J56V34pv5jzjECrOeZ4RpzjipUhSwz06yYO
GnMucYDjjkHHRzP7G+0FQ2mNrNdv24CXRAHPskRlEQPPCrh9Vphg2oux494sHl41
VlTNj2EC1dCg/QqnFHxM
=qD+N
-----END PGP SIGNATURE-----

--- End Message ---
-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to