From owner-svn-ports-all@freebsd.org Mon Dec 5 17:48:59 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35C5FC68002; Mon, 5 Dec 2016 17:48:59 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 04ED0295; Mon, 5 Dec 2016 17:48:58 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB5HmwFm008536; Mon, 5 Dec 2016 17:48:58 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB5Hmwe0008535; Mon, 5 Dec 2016 17:48:58 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201612051748.uB5Hmwe0008535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 5 Dec 2016 17:48:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427911 - head/audio/amarok-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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2016 17:48:59 -0000 Author: rakuco Date: Mon Dec 5 17:48:57 2016 New Revision: 427911 URL: https://svnweb.freebsd.org/changeset/ports/427911 Log: Stop using deprecated FFMPEG calls in the code. This allows the port to be built with the upcoming FFMPEG 3.x series while still maintaining compatibility with FFMPEG 2.x that is currently in the ports tree. I don't think PORTREVISION needs to be bumped here, as both the old and new calls exist in FFMPEG 2.x, and when FFMPEG 3 lands there will be a PORTREVISION bump anyway. PR: 214184 Submitted by: Matthey Rezny Added: head/audio/amarok-kde4/files/patch-kde_rb-126682 (contents, props changed) Added: head/audio/amarok-kde4/files/patch-kde_rb-126682 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/amarok-kde4/files/patch-kde_rb-126682 Mon Dec 5 17:48:57 2016 (r427911) @@ -0,0 +1,85 @@ +# Fix build with FFmpeg 3.x; obtained from https://git.reviewboard.kde.org/r/126682 +# +--- src/musicbrainz/MusicDNSAudioDecoder.cpp ++++ src/musicbrainz/MusicDNSAudioDecoder.cpp +@@ -243,7 +243,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + { + if( !decodedFrame ) + { +- decodedFrame = avcodec_alloc_frame(); ++ decodedFrame = av_frame_alloc(); + if( !decodedFrame ) + { + warning() << "Unable to allocate enough memory to decode file."; +@@ -251,7 +251,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + break; + } + else +- avcodec_get_frame_defaults( decodedFrame ); ++ av_frame_unref( decodedFrame ); + } + + decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); +@@ -287,7 +287,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + + avcodec_close( pCodecCtx ); + avformat_close_input( &pFormatCtx ); +- av_free( decodedFrame ); ++ av_frame_free( &decodedFrame ); + + return data->duration(); + } +@@ -361,7 +361,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + { + if( !decodedFrame ) + { +- decodedFrame = avcodec_alloc_frame(); ++ decodedFrame = av_frame_alloc(); + if( !decodedFrame ) + { + warning() << "Unable to allocate enough memory to decode file."; +@@ -369,7 +369,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + break; + } + else +- avcodec_get_frame_defaults( decodedFrame ); ++ av_frame_unref( decodedFrame ); + } + + decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); +@@ -405,7 +405,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + + avcodec_close( pCodecCtx ); + avformat_close_input( &pFormatCtx ); +- av_free( decodedFrame ); ++ av_frame_free( &decodedFrame ); + + return data->duration(); + } +@@ -479,7 +479,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + { + if( !decodedFrame ) + { +- decodedFrame = avcodec_alloc_frame(); ++ decodedFrame = av_frame_alloc(); + if( !decodedFrame ) + { + warning() << "Unable to allocate enough memory to decode file."; +@@ -487,7 +487,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + break; + } + else +- avcodec_get_frame_defaults( decodedFrame ); ++ av_frame_unref( decodedFrame ); + } + + decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); +@@ -523,7 +523,7 @@ MusicDNSAudioDecoder::decode( const QString &fileName, DecodedAudioData *data, c + + avcodec_close( pCodecCtx ); + av_close_input_file( pFormatCtx ); +- av_free( decodedFrame ); ++ av_frame_free( &decodedFrame ); + + return data->duration(); + }