[arch-commits] Commit in k3b/trunk (PKGBUILD k3b-2.0.2-libavformat54.patch)

[Eric Bélanger]

    Date: Monday, September 15, 2014 @ 21:01:24
  Author: eric
Revision: 221770

upgpkg: k3b 2.0.2-10

Rebuild against ffmpeg 2.4

Modified:
  k3b/trunk/PKGBUILD
  k3b/trunk/k3b-2.0.2-libavformat54.patch

-------------------------------+
 PKGBUILD                      |    4 ++--
 k3b-2.0.2-libavformat54.patch |   16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-15 18:55:34 UTC (rev 221769)
+++ PKGBUILD	2014-09-15 19:01:24 UTC (rev 221770)
@@ -3,7 +3,7 @@
 
 pkgname=k3b
 pkgver=2.0.2
-pkgrel=9
+pkgrel=10
 pkgdesc="Feature-rich and easy to handle CD burning application"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/k3b/"
@@ -22,7 +22,7 @@
         k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch)
 sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
           '8120c0e22e6c41ea285ca6060be13723ed91c52b'
-          '5b35bff3f7670686a32bd71afea2deaca4331631'
+          '2951518013192f6eefd0754e74dee494e32def24'
           '02db0666db8d793860c93ef9e2f19a00c9451945')
 
 prepare() {

Modified: k3b-2.0.2-libavformat54.patch
===================================================================
--- k3b-2.0.2-libavformat54.patch	2014-09-15 18:55:34 UTC (rev 221769)
+++ k3b-2.0.2-libavformat54.patch	2014-09-15 19:01:24 UTC (rev 221770)
@@ -20,3 +20,19 @@
  
      return true;
  }
+diff -Naur k3b-2.0.2-orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-2.0.2-orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2014-09-15 14:35:16.345772461 -0400
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2014-09-15 14:36:38.645637478 -0400
+@@ -165,7 +165,11 @@
+     }
+ 
+     if( d->formatContext ) {
+-        ::av_close_input_file( d->formatContext );
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++      ::avformat_close_input(&d->formatContext);
++#else
++      ::av_close_input_file( d->formatContext );
++#endif
+         d->formatContext = 0;
+     }
+ }