Bug 208816

Summary: deskutils/libstreamanalyzer: Fix build with ffmpeg 3.0.x
Product: Ports & Packages Reporter: Ben Woods <woodsb02>
Component: Individual Port(s)Assignee: freebsd-kde (Team) <kde>
Status: Closed FIXED    
Severity: Affects Only Me CC: kde, rakuco, woodsb02
Priority: --- Flags: rakuco: maintainer-feedback+
Version: Latest   
Hardware: Any   
OS: Any   
URL: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch?view=markup&pathrev=20374
Bug Depends on:    
Bug Blocks: 207547    
Attachments:
Description Flags
Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x
none
QA: Successful poudriere testport logs for deskutils/libstreamanalyzer with patch against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 11-current amd64
none
Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x
rakuco: maintainer-approval+
QA: Successful poudriere testport logs for deskutils/libstreamanalyzer with patch against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 11-current amd64
none
QA: Successful poudriere testport logs for deskutils/libstreamanalyzer with patch against FFmpeg 3.0.1 (from PR 207547) on FreeBSD 11-current amd64 none

Description Ben Woods freebsd_committer 2016-04-15 14:43:52 UTC
Created attachment 169337 [details]
Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x

deskutils/libstreamanalyzer: Fix build with ffmpeg 3.0.x

Add patch to allow libstreamanalyzer to build successfully once multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is currently still on the 2.8.x branch, however this patch is backwards compatible with ffmpeg 2.8.x.
Comment 1 Ben Woods freebsd_committer 2016-04-15 14:49:37 UTC
Created attachment 169338 [details]
QA: Successful poudriere testport logs for deskutils/libstreamanalyzer with patch against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 11-current amd64
Comment 2 Ben Woods freebsd_committer 2016-04-15 15:49:08 UTC
These patches were obtained from the PLD Linux repository:
http://git.pld-linux.org/gitweb.cgi/packages/strigi.git/commitdiff/845404c35fb382923b3ff5addc8e1ed402c98251
Comment 3 Raphael Kubo da Costa freebsd_committer 2016-04-15 16:05:01 UTC
Only the change to ffmpegendanalyzer.cpp actually looks related to ffmpeg 3.0. Can you check if the port also works if you remove the rest of the changes in the patch?
Comment 4 Raphael Kubo da Costa freebsd_committer 2016-04-15 16:06:41 UTC
Debian's patch seems to be less intrusive: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch?view=markup&pathrev=20374
Comment 5 Ben Woods freebsd_committer 2016-04-15 16:49:19 UTC
Created attachment 169353 [details]
Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x

Indeed, the less obtrusive patch from Debian Linux allows deskutils/libstreamanalyzer to successfully compile with ffmpeg 3.0.x. I have updated the attached patch to use Debian's patch.
Comment 6 Ben Woods freebsd_committer 2016-04-15 16:50:40 UTC
Created attachment 169354 [details]
QA: Successful poudriere testport logs for deskutils/libstreamanalyzer with patch against current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 11-current amd64
Comment 7 Ben Woods freebsd_committer 2016-04-15 16:52:28 UTC
Created attachment 169355 [details]
QA: Successful poudriere testport logs for deskutils/libstreamanalyzer with patch against FFmpeg 3.0.1 (from PR 207547) on FreeBSD 11-current amd64
Comment 8 Raphael Kubo da Costa freebsd_committer 2016-04-16 16:40:54 UTC
Comment on attachment 169353 [details]
Patch to fix build of deskutils/libstreamanalyzer using ffmpeg 3.0.x

Thanks, I'll land this to the tree.
Comment 9 commit-hook freebsd_committer 2016-04-16 16:45:39 UTC
A commit references this bug:

Author: rakuco
Date: Sat Apr 16 16:45:28 UTC 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 <woodsb02@gmail.com>
  Obtained from:	Debian

Changes:
  head/deskutils/libstreamanalyzer/files/patch-ffmpeg30
Comment 10 Raphael Kubo da Costa freebsd_committer 2016-04-16 16:45:57 UTC
Committed, thanks for the patch!