[Bug 208895] graphics/opencv: Fix build with ffmpeg 3.0.x

[b***@freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208895

Ben Woods <***@gmail.com> changed:

What |Removed |Added
----------------------------------------------------------------------------
Blocks| |207547
CC| |***@gmail.com


Referenced Bugs:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=207547
[Bug 207547] [exp-run] Update ffmpeg to 3.0

[b***@freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208895

--- Comment #1 from Ben Woods <***@gmail.com> ---
graphics/opencv only fails to build with ffmpeg 3.0.x if the port has the
FFMPEG option set (not default).

When building without the attached patch, with the FFMPEG option set and ffmpeg
3.0.x, the build fails with many errors similar to this:

In file included from
/wrkdirs/usr/ports/graphics/opencv/work/opencv-2.4.9/modules/highgui/src/cap_ffmpeg_impl.hpp:60:
/wrkdirs/usr/ports/graphics/opencv/work/opencv-2.4.9/modules/highgui/src/ffmpeg_codecs.hpp:104:7:
error: use of undeclared identifier 'CODEC_ID_H264'; did you mean
'AV_CODEC_ID_H264'?
{ CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
^~~~~~~~~~~~~
AV_CODEC_ID_H264


Refer to the full build log without the attached patch here:
http://package22.nyi.freebsd.org/data/103i386-default-PR207547/2016-02-27_20h30m58s/logs/errors/opencv-2.4.9_7.log

[b***@freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208895

--- Comment #2 from Ben Woods <***@gmail.com> ---
Created attachment 169446
--> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=169446&action=edit
QA: Successful poudriere testport logs for graphics/opencv with patch against
FFmpeg 3.0.1 (from PR 207547) on FreeBSD 11-current amd64 (gzipped)

[b***@freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208895

--- Comment #3 from Ben Woods <***@gmail.com> ---
Created attachment 169458
--> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=169458&action=edit
QA: Successful poudriere testport logs for graphics/opencv with patch against
current ports tree (FFmpeg 2.8.6_2,1) on FreeBSD 11-current amd64 (gzipped)

[b***@freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208895

--- Comment #4 from commit-***@freebsd.org ---
A commit references this bug:

Author: jbeich
Date: Sat May 7 17:22:02 UTC 2016
New revision: 414777
URL: https://svnweb.freebsd.org/changeset/ports/414777

Log:
graphics/opencv: unbreak build with ffmpeg 3.0

modules/highgui/src/ffmpeg_codecs.hpp:104:7: error: use of undeclared
identifier 'CODEC_ID_H264'; did you mean 'AV_CODEC_ID_H264'?
{ CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
^~~~~~~~~~~~~
modules/highgui/src/ffmpeg_codecs.hpp:121:7: error: use of undeclared
identifier 'CODEC_ID_MPEG4'; did you mean 'AV_CODEC_ID_MPEG4'?
{ CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
^~~~~~~~~~~~~~
[...]

PR: 208895
Reported by: antoine (via exp-run)
Submitted by: Ben Woods <***@gmail.com>
Approved by: maintainer timeout (jhale, 3 weeks)
Obtained from: Debian

Changes:
head/graphics/opencv/Makefile
head/graphics/opencv/files/patch-ffmpeg29
head/graphics/opencv/files/patch-libav10

[b***@freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208895

Jan Beich <***@FreeBSD.org> changed:

What |Removed |Added
----------------------------------------------------------------------------
Status|New |Closed
Assignee|***@FreeBSD.org |***@FreeBSD.org
Resolution|--- |FIXED

--- Comment #5 from Jan Beich <***@FreeBSD.org> ---
Thanks. Committed.