ports/137873: [patch] sysutils/k3b - fix build against new ffmpeg

[Alberto Villa]

>Number:         137873
>Category:       ports
>Synopsis:       [patch] sysutils/k3b - fix build against new ffmpeg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 17 14:20:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alberto Villa
>Release:        FreeBSD 8-STABLE
>Organization:
>Environment:
FreeBSD echo.hoth 8.0-BETA2 FreeBSD 8.0-BETA2 #11: Sat Aug 15 17:55:03 CEST 2009     root at echo.hoth:/usr/obj/usr/src/sys/TPR60  i386
>Description:
k3b fails to build against the new ffmpeg because of api changes
>How-To-Repeat:
upgrade ffmpeg and install sysutils/k3b
>Fix:
patch below, tested by dima panov (fluffy@)

Patch attached with submission follows:

diff -ruN /usr/ports/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp /tmp/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp
--- /usr/ports/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp	2009-08-17 16:14:26.980232688 +0200
@@ -0,0 +1,21 @@
+--- k3bffmpegwrapper.cpp.orig	2009-08-15 21:28:47.344449975 +0200
++++ k3bffmpegwrapper.cpp	2009-08-15 21:30:16.985967181 +0200
+@@ -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 );


>Release-Note:
>Audit-Trail:
>Unformatted: