From owner-svn-ports-head@FreeBSD.ORG Mon Oct 21 20:41:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8CB06BAA; Mon, 21 Oct 2013 20:41:55 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A69424D2; Mon, 21 Oct 2013 20:41:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LKft15042864; Mon, 21 Oct 2013 20:41:55 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LKfsRW042861; Mon, 21 Oct 2013 20:41:54 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310212041.r9LKfsRW042861@svn.freebsd.org> From: William Grzybowski Date: Mon, 21 Oct 2013 20:41:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331189 - in head/sysutils/k3b-kde4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 20:41:55 -0000 Author: wg Date: Mon Oct 21 20:41:54 2013 New Revision: 331189 URL: http://svnweb.freebsd.org/changeset/ports/331189 Log: sysutils/k3b-kde4: fix build with ffmpeg-2 - Fix build with ffmpeg-2 Approved by: portmgr (bapt, implicit) Added: head/sysutils/k3b-kde4/files/patch-ffmpeg2 (contents, props changed) head/sysutils/k3b-kde4/files/patch-libav9 (contents, props changed) Modified: head/sysutils/k3b-kde4/Makefile Modified: head/sysutils/k3b-kde4/Makefile ============================================================================== --- head/sysutils/k3b-kde4/Makefile Mon Oct 21 20:25:23 2013 (r331188) +++ head/sysutils/k3b-kde4/Makefile Mon Oct 21 20:41:54 2013 (r331189) @@ -3,7 +3,7 @@ PORTNAME= k3b PORTVERSION= 2.0.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= sysutils multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} Added: head/sysutils/k3b-kde4/files/patch-ffmpeg2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/k3b-kde4/files/patch-ffmpeg2 Mon Oct 21 20:41:54 2013 (r331189) @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/show_bug.cgi?id=476494 + +A better patch using avcodec_decode_audio4 will be needed but for now this +fixes the problem. + +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig ++++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -37,6 +37,9 @@ extern "C" { + + #include + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4) ++#endif + + #if LIBAVFORMAT_BUILD < 4629 + #define FFMPEG_BUILD_PRE_4629 Added: head/sysutils/k3b-kde4/files/patch-libav9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/k3b-kde4/files/patch-libav9 Mon Oct 21 20:41:54 2013 (r331189) @@ -0,0 +1,22 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2013-04-22 17:46:13.523959500 +0200 ++++ 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; + }