From owner-svn-ports-all@freebsd.org Sat Apr 16 16:45:29 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 1FEA1AEE6F0; Sat, 16 Apr 2016 16:45:29 +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 CDFBE1994; Sat, 16 Apr 2016 16:45:28 +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 u3GGjSh2047587; Sat, 16 Apr 2016 16:45:28 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GGjSYT047586; Sat, 16 Apr 2016 16:45:28 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201604161645.u3GGjSYT047586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 16 Apr 2016 16:45:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413452 - head/deskutils/libstreamanalyzer/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.21 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: Sat, 16 Apr 2016 16:45:29 -0000 Author: rakuco Date: Sat Apr 16 16:45:27 2016 New Revision: 413452 URL: https://svnweb.freebsd.org/changeset/ports/413452 Log: Add a patch from Debian to make the port build with FFMPEG 3.x. The patch is backwards compatible with FFMPEG 2, so add it now to prepare the ground for FFMPEG 3. PR: 208816 Submitted by: Ben Woods Obtained from: Debian Added: head/deskutils/libstreamanalyzer/files/patch-ffmpeg30 (contents, props changed) Added: head/deskutils/libstreamanalyzer/files/patch-ffmpeg30 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/libstreamanalyzer/files/patch-ffmpeg30 Sat Apr 16 16:45:27 2016 (r413452) @@ -0,0 +1,38 @@ +Make the port build with FFMPEG 3.x. + +Obtained from: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch?view=markup&pathrev=20374 + +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-02> +--- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig ++++ libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp +@@ -355,7 +355,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + #endif + + if(fc->bit_rate) +- ar.addValue(factory->bitrateProperty, fc->bit_rate); ++ ar.addValue(factory->bitrateProperty, (uint32_t)fc->bit_rate); + else if (fc->duration!= no_bitrate && fc->duration > 0) { + cout<<"Trying to estimate bitrate\n"; + int64_t size; +@@ -412,8 +412,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + if (size_t len = strlen(p->name)) { + ar.addTriplet(streamuri, codecPropertyName, string(p->name, len)); + } +- } else if (size_t len = strlen(codec.codec_name)) { +- ar.addTriplet(streamuri, codecPropertyName, string(codec.codec_name, len)); ++ } else if (size_t len = strlen(avcodec_get_name(codec.codec_id))) { ++ ar.addTriplet(streamuri, codecPropertyName, string(avcodec_get_name(codec.codec_id), len)); + } + /* + 00792 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { +@@ -486,7 +486,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + outs << stream.avg_frame_rate.num / stream.avg_frame_rate.den; + ar.addTriplet(streamuri, frameRatePropertyName, outs.str()); + } +- if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format ++ if (codec.pix_fmt != AV_PIX_FMT_NONE) {}//FIXME pixel format + } + + }