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

[Eric Bélanger]

    Date: Sunday, June 3, 2012 @ 23:40:51
  Author: eric
Revision: 160701

upgpkg: k3b 2.0.2-5

Rebuild against ffmpeg 0.11, Change cdrdao depends to optdepends (close FS#29016)

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

-------------------------------+
 PKGBUILD                      |   21 ++++++++++++---------
 k3b-2.0.2-libavformat54.patch |   22 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-04 01:22:50 UTC (rev 160700)
+++ PKGBUILD	2012-06-04 03:40:51 UTC (rev 160701)
@@ -1,31 +1,34 @@
 # $Id$
 # Maintainer: Eric Bélanger <eric at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
 
 pkgname=k3b
 pkgver=2.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Feature-rich and easy to handle CD burning application"
 arch=('i686' 'x86_64')
 url="http://k3b.org/"
 license=('GPL')
-depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft')
+depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad'
+         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft')
 makedepends=('cmake' 'automoc4' 'docbook-xml')
 optdepends=('dvd+rw-tools: for dvd burning support'
             'vcdimager: for vcd burning support'
             'transcode: for advanced mpeg conversion support'
-            'emovix: for bootable multimedia cd/dvd support')
+            'emovix: for bootable multimedia cd/dvd support'
+            'cdrdao: for disk-at-once (DAO) mode support')
 options=('!libtool')
 install=k3b.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch)
+        k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch)
 sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b')
+          '8120c0e22e6c41ea285ca6060be13723ed91c52b'
+          '5b35bff3f7670686a32bd71afea2deaca4331631')
 
 build() {
-  cd "${srcdir}"
-  (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch")
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
+  patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
+  cd ..
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Added: k3b-2.0.2-libavformat54.patch
===================================================================
--- k3b-2.0.2-libavformat54.patch	                        (rev 0)
+++ k3b-2.0.2-libavformat54.patch	2012-06-04 03:40:51 UTC (rev 160701)
@@ -0,0 +1,22 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
+     close();
+ 
+     // open the file
+-    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
++    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
+     if( err < 0 ) {
+         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
+         return false;
+@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
+     }
+ 
+     // dump some debugging info
+-    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+ 
+     return true;
+ }