Your message dated Thu, 10 Mar 2016 17:42:01 +0000
with message-id <[email protected]>
and subject line Bug#803828: fixed in karlyriceditor 1.11-2
has caused the Debian Bug report #803828,
regarding karlyriceditor: 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 [email protected]
immediately.)
--
803828: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803828
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: karlyriceditor
Version: 1.11-1
Severity: important
Tags: patch
User: [email protected]
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..31adf4d
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,74 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <[email protected]>
+Last-Update: <2015-11-02>
+
+--- karlyriceditor-1.11.orig/src/ffmpegvideodecoder.cpp
++++ karlyriceditor-1.11/src/ffmpegvideodecoder.cpp
+@@ -151,12 +151,12 @@ bool FFMpegVideoDecoder::openFile( const
+ }
+
+ // Determine required buffer size and allocate buffer
+- int numBytes = avpicture_get_size( PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
++ int numBytes = avpicture_get_size( AV_PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
+ d->m_buffer.resize( numBytes );
+
+ // Assign appropriate parts of buffer to image planes in pFrameRGB
+ avpicture_fill( (AVPicture *) d->pFrameRGB, (uint8_t*) d->m_buffer.data(),
+- PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
++ AV_PIX_FMT_RGB24, d->pCodecCtx->width, d->pCodecCtx->height );
+
+ d->skipFrames = seekto;
+ return true;
+@@ -215,7 +215,7 @@ bool FFMpegVideoDecoderPriv::readFrame(
+ int w = pCodecCtx->width;
+ int h = pCodecCtx->height;
+
+- img_convert_ctx = sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++ img_convert_ctx = sws_getCachedContext(img_convert_ctx,w, h, pCodecCtx->pix_fmt, w, h, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+
+ if ( img_convert_ctx == NULL )
+ {
+--- karlyriceditor-1.11.orig/src/ffmpegvideoencoder.cpp
++++ karlyriceditor-1.11/src/ffmpegvideoencoder.cpp
+@@ -333,7 +333,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ videoCodecCtx->time_base.num = m_videoformat->frame_rate_num;
+ videoCodecCtx->time_base.den = m_videoformat->frame_rate_den;
+ videoCodecCtx->gop_size = (m_videoformat->frame_rate_den / m_videoformat->frame_rate_num) / 2; // GOP size is framerate / 2
+- videoCodecCtx->pix_fmt = PIX_FMT_YUV420P;
++ videoCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
+ videoCodecCtx->bit_rate = m_videobitrate;
+ videoCodecCtx->bit_rate_tolerance = m_videobitrate * av_q2d(videoCodecCtx->time_base);
+
+@@ -422,8 +422,6 @@ av_log_set_level(AV_LOG_VERBOSE);
+
+ audioStream->time_base = origAudioStream->time_base;
+ audioStream->disposition = origAudioStream->disposition;
+- audioStream->pts.num = origAudioStream->pts.num;
+- audioStream->pts.den = origAudioStream->pts.den;
+
+ AVCodecContext * newCtx = audioStream->codec;
+
+@@ -665,8 +663,8 @@ int FFMpegVideoEncoderPriv::encodeImage(
+ {
+ while ( true )
+ {
+- double audio_pts = (double) audioStream->pts.val * av_q2d( audioStream->time_base );
+- double video_pts = (double) videoStream->pts.val * av_q2d( videoStream->time_base );
++ double audio_pts = (double) av_stream_get_end_pts(audioStream) * av_q2d( audioStream->time_base );
++ double video_pts = (double) av_stream_get_end_pts(videoStream) * av_q2d( videoStream->time_base );
+
+ //qDebug( "PTS check: A: %g V: %g", audio_pts, video_pts );
+
+@@ -865,10 +863,10 @@ bool FFMpegVideoEncoderPriv::convertImag
+ videoConvertCtx = sws_getCachedContext( videoConvertCtx,
+ m_videoformat->width,
+ m_videoformat->height,
+- PIX_FMT_BGRA,
++ AV_PIX_FMT_BGRA,
+ m_videoformat->width,
+ m_videoformat->height,
+- PIX_FMT_YUV420P,
++ AV_PIX_FMT_YUV420P,
+ SWS_BICUBIC,
+ NULL,
+ NULL,
diff --git a/debian/patches/series b/debian/patches/series
index 7e475d5..d44fa2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
0009-Fix-FP-exception-Sample-aspect-ratio-Libav-FFmpeg.patch
0010-Make-qmake-respect-external-build-linking-flags.patch
0011-Libav-in-About-dialog.patch
+ffmpeg_2.9.patch
--- End Message ---
--- Begin Message ---
Source: karlyriceditor
Source-Version: 1.11-2
We believe that the bug you reported is fixed in the latest version of
karlyriceditor, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Martin Steghöfer <[email protected]> (supplier of updated karlyriceditor
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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 10 Mar 2016 16:19:11 +0100
Source: karlyriceditor
Binary: karlyriceditor
Architecture: source
Version: 1.11-2
Distribution: unstable
Urgency: medium
Maintainer: Martin Steghöfer <[email protected]>
Changed-By: Martin Steghöfer <[email protected]>
Description:
karlyriceditor - Karaoke lyrics editor
Closes: 803828
Changes:
karlyriceditor (1.11-2) unstable; urgency=medium
.
* Partially unpatch the code because FFmpeg is back in Debian.
* Patch the source code to make it compile with the upcoming FFmpeg 2.9/3.0.
Thanks to Andreas Cadhalpun (Closes: #803828)
* Upgraded Standards-Version to 3.9.7 (no changes necessary according to
upgrading checklist).
Checksums-Sha1:
be2837c0ff41e4119464323124a3699a75054f90 2096 karlyriceditor_1.11-2.dsc
5cf6aa600b12d387ccdedea5148aeb51ea961557 11388
karlyriceditor_1.11-2.debian.tar.xz
Checksums-Sha256:
eea46db56f692ca871616b57b2ffc85a17dce9bfdde5cfd6ff40bdffd494050e 2096
karlyriceditor_1.11-2.dsc
fb02a8a354f05e566176737b252ecf22010c6bd0f1b440ccbef2ce8d2899d735 11388
karlyriceditor_1.11-2.debian.tar.xz
Files:
840bc09bd21e933422368d03e32911a3 2096 utils optional karlyriceditor_1.11-2.dsc
59185747f238b3ec0cf38bfd53f3e072 11388 utils optional
karlyriceditor_1.11-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJW4ZiMAAoJEKO6uuJAjdbPBeQP/jh0wVhyBitdL+q8XcoTkgWX
SANMinEcmQvMy2LWiIWOhgILMZ8BQIET+mgFrrYKAt47pcDOJpsODjDnsj1dqYMk
HjrtVh3m0Y9YY0nXLL0UdRynXJDccVvfGm3D2/i+sKUWQV3pypPe5UNJrX/H1JTY
TfYXvhI+mEI/bDDkLrb8haSeeW4NVjRaRtt/fNOaTSQTqXTbAdxyJAV91DPrGPH8
qI8MmRl1E+47w58JjkeBo3eT44yXHvC/StWYUWUI8PQenmpYqkRb6kS3PD7IJD9X
guJaX4Wyydd5s/Ei06sOzAdm9Q3YAex3O+zcGSNQIHTsvd8p9X9k0MepcABBa8JO
fS4QWy2Uz0vMKe18ZRbFjn/D4abDjRymClPv4IcIQUkBKQ0esB9ww6rLp/+6tCBW
pVEqHUo6OzlK8YcdjJsriGZfFnTxXNisy6iazE84SCdHvouXuMFcMBWPnhYiRKMn
2/69QvlNu0Ud32Mw6lGe4BB3Jb0uQkhsgpIGgRHquawgq6XtIghZyQTbjU0B7vzM
Lum9/wXKrKetf1kcBJMUQraPqgB6nquE1hFPF7CTS8gmHBLWIi9iIa8HCxqG8L9l
IuhsuICSC5qgs5C8lyS0Wb6qrac3XLUu1q93HUZJdqSyHEka0lVgw+zpH5XzgG5Z
H2YJ+lnC16Hxdoknt3qg
=T2lb
-----END PGP SIGNATURE-----
--- End Message ---
