summaryrefslogtreecommitdiff
path: root/extra/k3b
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-07-10 00:01:37 +0000
committerroot <root@rshg054.dnsready.net>2012-07-10 00:01:37 +0000
commit0615a909b089a81d068ae10517ceff31dabfece1 (patch)
tree6e5d23671bbee08a27827c126237a47ff9d9c0da /extra/k3b
parent78eac58df0ec18da4bfd73868668dcaea99fd008 (diff)
Tue Jul 10 00:01:37 UTC 2012
Diffstat (limited to 'extra/k3b')
-rw-r--r--extra/k3b/PKGBUILD23
-rw-r--r--extra/k3b/k3b-2.0.2-libavformat54.patch22
2 files changed, 35 insertions, 10 deletions
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index f1dce1167..c51869c8b 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $
+# $Id: PKGBUILD 163151 2012-07-08 09:31:23Z ibiru $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
-# Contributor: damir <damir@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} \
diff --git a/extra/k3b/k3b-2.0.2-libavformat54.patch b/extra/k3b/k3b-2.0.2-libavformat54.patch
new file mode 100644
index 000000000..174a776b8
--- /dev/null
+++ b/extra/k3b/k3b-2.0.2-libavformat54.patch
@@ -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;
+ }