[arch-commits] Commit in kdemultimedia/trunk (PKGBUILD ffmpeg0.11.patch)

[Andrea Scarpino]

    Date: Monday, June 4, 2012 @ 15:55:35
  Author: andrea
Revision: 160742

FFmpeg 0.11 rebuild

Added:
  kdemultimedia/trunk/ffmpeg0.11.patch
Modified:
  kdemultimedia/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 ++++++++---
 ffmpeg0.11.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-04 19:06:59 UTC (rev 160741)
+++ PKGBUILD	2012-06-04 19:55:35 UTC (rev 160742)
@@ -11,7 +11,7 @@
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
 pkgver=4.8.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -19,11 +19,16 @@
 makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
              'libmusicbrainz3' 'taglib' 'libcanberra')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'mplayerthumbs.config')
+        'mplayerthumbs.config'
+        'ffmpeg0.11.patch')
 sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+          '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
 
 build() {
+    cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
+    patch -p1 -i ${srcdir}/ffmpeg0.11.patch
+
     cd ${srcdir}
 	mkdir build
 	cd build

Added: ffmpeg0.11.patch
===================================================================
--- ffmpeg0.11.patch	                        (rev 0)
+++ ffmpeg0.11.patch	2012-06-04 19:55:35 UTC (rev 160742)
@@ -0,0 +1,29 @@
+From: Christoph Feck <christoph at maxiom.de>
+Date: Tue, 29 May 2012 13:53:18 +0000
+Subject: Two deprecated calls have been removed from ffmpeg 0.11.
+X-Git-Tag: v4.8.80
+X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c
+---
+Two deprecated calls have been removed from ffmpeg 0.11.
+
+BUG:300732
+---
+
+
+--- a/ffmpegthumbnailer/moviedecoder.cpp
++++ b/ffmpegthumbnailer/moviedecoder.cpp
+@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
+ void MovieDecoder::initialize(const QString& filename)
+ {
+     av_register_all();
+-    avcodec_init();
+     avcodec_register_all();
+ 
+     QFileInfo fileInfo(filename);
+ 
+-    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
++    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
+         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
+         return;
+     }
+