[arch-commits] Commit in k3b/trunk (PKGBUILD k3b-2.0.2-libav9.patch)
Eric Bélanger
eric at nymeria.archlinux.org
Sat Jul 13 03:43:42 UTC 2013
Date: Saturday, July 13, 2013 @ 05:43:42
Author: eric
Revision: 190026
upgpkg: k3b 2.0.2-9
Rebuild against ffmpeg 2.0 and x264 20130702
Added:
k3b/trunk/k3b-2.0.2-libav9.patch
Modified:
k3b/trunk/PKGBUILD
------------------------+
PKGBUILD | 18 +++++++++++-------
k3b-2.0.2-libav9.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-13 02:56:23 UTC (rev 190025)
+++ PKGBUILD 2013-07-13 03:43:42 UTC (rev 190026)
@@ -3,7 +3,7 @@
pkgname=k3b
pkgver=2.0.2
-pkgrel=8
+pkgrel=9
pkgdesc="Feature-rich and easy to handle CD burning application"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/k3b/"
@@ -20,16 +20,20 @@
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-libavformat54.patch)
+ k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch)
sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
'8120c0e22e6c41ea285ca6060be13723ed91c52b'
- '5b35bff3f7670686a32bd71afea2deaca4331631')
+ '5b35bff3f7670686a32bd71afea2deaca4331631'
+ '02db0666db8d793860c93ef9e2f19a00c9451945')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
- cd ..
+ patch -p1 -i "${srcdir}/k3b-2.0.2-libav9.patch"
+}
+
+build() {
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -39,6 +43,6 @@
}
package() {
- cd "${srcdir}/build"
+ cd build
make DESTDIR="${pkgdir}" install
}
Added: k3b-2.0.2-libav9.patch
===================================================================
--- k3b-2.0.2-libav9.patch (rev 0)
+++ k3b-2.0.2-libav9.patch 2013-07-13 03:43:42 UTC (rev 190026)
@@ -0,0 +1,42 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 17:46:13.523959500 +0200
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200
+@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
+ }
+
+ // analyze the streams
+- ::av_find_stream_info( d->formatContext );
++ ::avformat_find_stream_info( d->formatContext, 0 );
+
+ // we only handle files containing one audio stream
+ if( d->formatContext->nb_streams != 1 ) {
+@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
+
+ // open the codec on our context
+ kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
+- if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
++ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
+ kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
+ return false;
+ }
+--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2013-07-12 23:05:37.371157123 -0400
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-07-12 23:12:01.649948739 -0400
+@@ -55,7 +55,7 @@
+ K3b::Msf length;
+
+ // for decoding. ffmpeg requires 16-byte alignment.
+- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
++ char outputBuffer[192000 + 15];
+ char* alignedOutputBuffer;
+ char* outputBufferPos;
+ int outputBufferSize;
+@@ -319,7 +319,7 @@
+ }
+
+ d->outputBufferPos = d->alignedOutputBuffer;
+- d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++ d->outputBufferSize = 192000;
+
+ #if LIBAVCODEC_VERSION_MAJOR < 52
+ int len = ::avcodec_decode_audio(
More information about the arch-commits
mailing list