commit a2ec115cccccd91dbd726a734f0b7627a905f03d Author: Alan Mizrahi <alan+crux@mizrahi.com.ve> Date: Wed Jan 15 13:01:15 2014 +0900 k3b: Fixed compilation issue with ffmpeg >= 2.0 diff --git a/k3b/.footprint b/k3b/.footprint index bfda589..abca28a 100644 --- a/k3b/.footprint +++ b/k3b/.footprint @@ -112,10 +112,17 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/k3bvcdoptions.h -rw-r--r-- root/root usr/include/k3bverificationjob.h -rw-r--r-- root/root usr/include/k3bversion.h +-rw-r--r-- root/root usr/include/k3bvideodvd.h +-rw-r--r-- root/root usr/include/k3bvideodvdaudiostream.h -rw-r--r-- root/root usr/include/k3bvideodvddoc.h -rw-r--r-- root/root usr/include/k3bvideodvdjob.h +-rw-r--r-- root/root usr/include/k3bvideodvdptt.h +-rw-r--r-- root/root usr/include/k3bvideodvdsubpicturestream.h +-rw-r--r-- root/root usr/include/k3bvideodvdtime.h +-rw-r--r-- root/root usr/include/k3bvideodvdtitle.h -rw-r--r-- root/root usr/include/k3bvideodvdtitledetectclippingjob.h -rw-r--r-- root/root usr/include/k3bvideodvdtitletranscodingjob.h +-rw-r--r-- root/root usr/include/k3bvideodvdvideostream.h -rw-r--r-- root/root usr/include/k3bwavefilewriter.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/kde4/ @@ -126,6 +133,8 @@ drwxr-xr-x root/root usr/lib/kde4/ -rwxr-xr-x root/root usr/lib/kde4/k3bflacdecoder.so -rwxr-xr-x root/root usr/lib/kde4/k3blameencoder.so -rwxr-xr-x root/root usr/lib/kde4/k3blibsndfiledecoder.so +-rwxr-xr-x root/root usr/lib/kde4/k3bmaddecoder.so +-rwxr-xr-x root/root usr/lib/kde4/k3bmpcdecoder.so -rwxr-xr-x root/root usr/lib/kde4/k3boggvorbisdecoder.so -rwxr-xr-x root/root usr/lib/kde4/k3boggvorbisencoder.so -rwxr-xr-x root/root usr/lib/kde4/k3bsoxencoder.so @@ -352,6 +361,7 @@ drwxr-xr-x root/root usr/share/apps/solid/actions/ -rw-r--r-- root/root usr/share/apps/solid/actions/k3b_copy_disc.desktop -rw-r--r-- root/root usr/share/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop -rw-r--r-- root/root usr/share/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop +-rw-r--r-- root/root usr/share/apps/solid/actions/k3b_videodvd_rip.desktop drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/system-services/ -rw-r--r-- root/root usr/share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service @@ -406,6 +416,8 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/ -rw-r--r-- root/root usr/share/kde4/services/k3bflacdecoder.desktop -rw-r--r-- root/root usr/share/kde4/services/k3blameencoder.desktop -rw-r--r-- root/root usr/share/kde4/services/k3blibsndfiledecoder.desktop +-rw-r--r-- root/root usr/share/kde4/services/k3bmaddecoder.desktop +-rw-r--r-- root/root usr/share/kde4/services/k3bmpcdecoder.desktop -rw-r--r-- root/root usr/share/kde4/services/k3boggvorbisdecoder.desktop -rw-r--r-- root/root usr/share/kde4/services/k3boggvorbisencoder.desktop -rw-r--r-- root/root usr/share/kde4/services/k3bsetup.desktop diff --git a/k3b/.md5sum b/k3b/.md5sum index f92c135..374284d 100644 --- a/k3b/.md5sum +++ b/k3b/.md5sum @@ -1,3 +1,4 @@ 742c2953adcf20b993b12d7fc55d96b9 k3b-2.0.2-ffmpeg.patch +67f04d24b7516c144be9881754a7a606 k3b-2.0.2-libav9.patch 4c9ac844c6bf97dbf3688b4660276252 k3b-2.0.2-libavformat54.patch c86113af31a2032e57fd2f302b5f637a k3b-2.0.2.tar.bz2 diff --git a/k3b/Pkgfile b/k3b/Pkgfile index 033c24b..a9983e5 100644 --- a/k3b/Pkgfile +++ b/k3b/Pkgfile @@ -6,11 +6,12 @@ name=k3b version=2.0.2 -release=3 +release=4 source=( http://downloads.sf.net/$name/$name-$version.tar.bz2 k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch +k3b-2.0.2-libav9.patch ) build() { @@ -26,6 +27,7 @@ build() { pushd $name-$version patch -p1 -i $SRC/k3b-2.0.2-ffmpeg.patch patch -p1 -i $SRC/k3b-2.0.2-libavformat54.patch + patch -p1 -i $SRC/k3b-2.0.2-libav9.patch popd mkdir build; cd build diff --git a/k3b/k3b-2.0.2-libav9.patch b/k3b/k3b-2.0.2-libav9.patch new file mode 100644 index 0000000..bb1f5e1 --- /dev/null +++ b/k3b/k3b-2.0.2-libav9.patch @@ -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(