rev 19688 - in kde-extras/k3b/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2013-08-25 15:51:46 +0000 (Sun, 25 Aug 2013)
New Revision: 19688

Added:
   kde-extras/k3b/trunk/debian/patches/Fix-K3B-to-build-with-recent-FFMPEG-versions.patch
   kde-extras/k3b/trunk/debian/patches/ffmpeg-more.diff
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/patches/series
Log:
fix compat with newer ffmpeg/libav (#720799)

add Fix-K3B-to-build-with-recent-FFMPEG-versions.patch (backported from
upstream branch 2.0) and ffmpeg-more.diff


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2013-08-25 15:07:49 UTC (rev 19687)
+++ kde-extras/k3b/trunk/debian/changelog	2013-08-25 15:51:46 UTC (rev 19688)
@@ -8,6 +8,9 @@
   [ Pino Toscano ]
   * Update Vcs-* headers.
   * Bump Standards-Version to 3.9.4, no changes required.
+  * Add Fix-K3B-to-build-with-recent-FFMPEG-versions.patch (backported from
+    upstream branch 2.0) and ffmpeg-more.diff to fix compatibility with newer
+    ffmpeg/libav versions. (Closes: #720799)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 23 Aug 2012 18:29:27 -0300
 

Added: kde-extras/k3b/trunk/debian/patches/Fix-K3B-to-build-with-recent-FFMPEG-versions.patch
===================================================================
--- kde-extras/k3b/trunk/debian/patches/Fix-K3B-to-build-with-recent-FFMPEG-versions.patch	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/Fix-K3B-to-build-with-recent-FFMPEG-versions.patch	2013-08-25 15:51:46 UTC (rev 19688)
@@ -0,0 +1,49 @@
+From 9162ff9463690cd4dcbe215753d5e69637dfdadf Mon Sep 17 00:00:00 2001
+From: Alex Merry <kde at randomguy3.me.uk>
+Date: Thu, 23 Aug 2012 23:45:34 +0100
+Subject: [PATCH] Fix K3B to build with recent FFMPEG versions
+
+FFMPEG 0.11 (shipped on ArchLinux, for example) has renamed some
+functions.
+
+The exact versions in the #ifdefs are taken from the Mobile Robot
+Programming Toolkit.
+
+BUG: 300731
+
+(backport of 6f34e14b28d2f9103151c6ba08b3bb40448ffe46)
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index 0c5f366..024c18c 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -88,7 +88,11 @@ bool K3bFFMpegFile::open()
+     close();
+ 
+     // open the file
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
++    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 );
++#else
+     int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
++#endif
+     if( err < 0 ) {
+         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
+         return false;
+@@ -143,7 +147,11 @@ bool K3bFFMpegFile::open()
+     }
+ 
+     // dump some debugging info
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
++    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++#else
+     ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++#endif
+ 
+     return true;
+ }
+-- 
+1.7.10.4
+

Added: kde-extras/k3b/trunk/debian/patches/ffmpeg-more.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/ffmpeg-more.diff	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/ffmpeg-more.diff	2013-08-25 15:51:46 UTC (rev 19688)
@@ -0,0 +1,28 @@
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -99,7 +99,11 @@
+     }
+ 
+     // analyze the streams
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,3,0)
++    ::avformat_find_stream_info( d->formatContext, 0 );
++#else
+     ::av_find_stream_info( d->formatContext );
++#endif
+ 
+     // we only handle files containing one audio stream
+     if( d->formatContext->nb_streams != 1 ) {
+@@ -133,7 +137,12 @@
+ 
+     // open the codec on our context
+     kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
+-    if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,6,0)
++    err = ::avcodec_open2( codecContext, d->codec, 0 );
++#else
++    err = ::avcodec_open( codecContext, d->codec );
++#endif
++    if( err < 0 ) {
+         kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
+         return false;
+     }

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2013-08-25 15:07:49 UTC (rev 19687)
+++ kde-extras/k3b/trunk/debian/patches/series	2013-08-25 15:51:46 UTC (rev 19688)
@@ -9,3 +9,5 @@
 k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch
 k3bsetup-put-the-shebang-in-the-first-line.patch
 fix-sox-detection-with-sox-14.4.0.patch
+Fix-K3B-to-build-with-recent-FFMPEG-versions.patch
+ffmpeg-more.diff