Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=35578d446860ce6f72478b147547b4507050861a
commit 35578d446860ce6f72478b147547b4507050861a Author: Cedynamix <cedyna...@gmail.com> Date: Sat Dec 12 01:01:49 2009 +0100 k3b-1.0.5-4-i686 * Rebuild with ffmpeg-20090403 * Rebuild with flac-1.2.1 diff --git a/source/kde/k3b/FrugalBuild b/source/kde/k3b/FrugalBuild index 69dce91..359ca9c 100644 --- a/source/kde/k3b/FrugalBuild +++ b/source/kde/k3b/FrugalBuild @@ -4,9 +4,9 @@ pkgname=k3b pkgver=1.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="The CD Kreator" -depends=('flac>=1.1.4' 'libsamplerate' 'hal>=0.5.9-2' 'libmusicbrainz' 'taglib' 'ffmpeg>=20080427' 'cdrdao' \ +depends=('flac>=1.2.1' 'libsamplerate' 'hal>=0.5.9-2' 'libmusicbrainz' 'taglib' 'ffmpeg>=20090403' 'cdrdao' \ 'kdelibs>=3.5.8' 'cdrtools' 'cdparanoia' 'normalize' 'sox>=14.2.0' 'dvd+rw-tools' 'libmad' \ 'libvorbis' 'vcdimager' 'libsndfile' 'libdvdread>=4.1.3' 'dbus-qt3' 'libmpcdec') rodepends=('kdebase>=3.5.8') @@ -16,13 +16,15 @@ _F_sourceforge_ext=".tar.bz2" _F_kde_reconf=1 Finclude kde sourceforge url="http://www.k3b.org/" -source=($source README.Frugalware ffmpeg.diff kdelibs-am.patch FixDuplicate.diff) +source=($source README.Frugalware ffmpeg.diff kdelibs-am.patch FixDuplicate.diff \ + plugins-decoder-ffmpeg-k3bffmpegwrapper.diff) options=('scriptlet') Fconfopts="$Fconfopts --enable-mt" sha1sums=('c45d6f2a36b1bc7ea14101d444149c40fd4b700e' \ '8704ffb71684abde5b8288054ae25fda386244cc' \ '022089fec916e01ea5d5851f3c4a5c373da35a25' \ '7eaa33447731bc403d1ccee06196ea844da78d43' \ - '601262b406d311a17ba22f1aec9a67d69fa2aac2') + '601262b406d311a17ba22f1aec9a67d69fa2aac2' \ + '2c4106cf1f4a3538d7de1abd9d3d96d4c74e5553') # optimization OK diff --git a/source/kde/k3b/plugins-decoder-ffmpeg-k3bffmpegwrapper.diff b/source/kde/k3b/plugins-decoder-ffmpeg-k3bffmpegwrapper.diff new file mode 100644 index 0000000..debdcee --- /dev/null +++ b/source/kde/k3b/plugins-decoder-ffmpeg-k3bffmpegwrapper.diff @@ -0,0 +1,21 @@ +--- /plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2009-12-12 00:07:36.000000000 +0100 ++++ /plugins/decoder/ffmpeg/k3bffmpegwrapper.cppnew 2009-12-12 00:47:39.000000000 +0100 +@@ -31,6 +31,9 @@ + #define FFMPEG_BUILD_PRE_4629 + #endif + ++#ifndef CODEC_ID_MP3LAME ++#define CODEC_ID_MP3LAME CODEC_ID_MP3 ++#endif + + K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0; + +@@ -290,7 +293,7 @@ + #ifdef FFMPEG_BUILD_PRE_4629 + int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, + #else +- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, ++ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, + #endif + (short*)d->outputBuffer, &d->outputBufferSize, + d->packetData, d->packetSize ); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git