From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 17 14:20:07 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8F8510656E6 for ; Mon, 17 Aug 2009 14:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C67C28FC66 for ; Mon, 17 Aug 2009 14:20:06 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HEK6Re031180 for ; Mon, 17 Aug 2009 14:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7HEK6ls031179; Mon, 17 Aug 2009 14:20:06 GMT (envelope-from gnats) Resent-Date: Mon, 17 Aug 2009 14:20:06 GMT Resent-Message-Id: <200908171420.n7HEK6ls031179@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alberto Villa Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02826106568C for ; Mon, 17 Aug 2009 14:17:49 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id E62FA8FC59 for ; Mon, 17 Aug 2009 14:17:48 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HEHm7p080645 for ; Mon, 17 Aug 2009 14:17:48 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n7HEHmVU080643; Mon, 17 Aug 2009 14:17:48 GMT (envelope-from nobody) Message-Id: <200908171417.n7HEHmVU080643@www.freebsd.org> Date: Mon, 17 Aug 2009 14:17:48 GMT From: Alberto Villa To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/137873: [patch] sysutils/k3b - fix build against new ffmpeg X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2009 14:20:07 -0000 >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@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: