Page MenuHomeFreeBSD

multimedia/vdr-plugin-markad: Fix build with ffmpeg 3.0.x
ClosedPublic

Authored by woodsb02 on May 9 2016, 10:02 PM.

Details

Summary

multimedia/vdr-plugin-markad: Fix build with ffmpeg 3.0.x

  • Update patch of command/decoder.cpp to allow vdr-plugin-markad 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. The additional changes to this file were based on upstream bug report #1898 [1], and also the requirement to replace s/avcodec_alloc_frame/av_frame_alloc/g.
  • Update all patches in files/ directory to the standard format (pet portlint), and remove PATCH_STRIP=-p1 from Makefile

    [1] https://projects.vdr-developer.org/issues/1898

Approved by: xxx (mentor)
PR: 209386

Test Plan

poudriere testport multimedia/vdr-plugin-markad

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 3646
Build 3689: arc lint + arc unit

Event Timeline

woodsb02 retitled this revision from to multimedia/vdr-plugin-markad: Fix build with ffmpeg 3.0.x.
woodsb02 updated this object.
woodsb02 edited the test plan for this revision. (Show Details)
woodsb02 added reviewers: adamw, koobs, mat.

For patches to ports, please upload poudriere and portlint output. I don't know if you can attach files in phabricator, but if not then please throw it up on pastebin or something like that.

For the patches, you don't really need to do the whole if FreeBSD thing, this is FreeBSD, just put what's needed. If this is because you used make makepatch and all the patches got renamed, be DAMN SURE you svn cp/mv the files before commiting so the history is not lost.

As for the poudriere logs, if the build is successful, I don't really see what they add, don't attach them, if you really feel they're needed, a pastebin is enough.

(On the portlint side, don't follow it blindly, it is a dumb static lint tool, it is going to get things wrong.)

In D6283#133630, @mat wrote:

For the patches, you don't really need to do the whole if FreeBSD thing, this is FreeBSD, just put what's needed. If this is because you used make makepatch and all the patches got renamed, be DAMN SURE you svn cp/mv the files before commiting so the history is not lost.

Ok, thanks. These were indeed renamed patches. I will update my ports tree with the files moved (svn mv), rather than deleted and re-added, and update this review.

(On the portlint side, don't follow it blindly, it is a dumb static lint tool, it is going to get things wrong.)

Understood. In this case, the patches were becoming a bit of a mess (with multiple patches editing the one file) and needed tidy up anyway as the new patches for ffmpeg3 support were overlapping.

woodsb02 edited edge metadata.

Diff updated with the patches in files/ moved (svn mv), rather than deleted and re-added.

Successful poudriere testport build on FreeBSD 10.3 amd64 with FFmpeg 2.8.7,1 (from current ports) here:
http://woodsb02.no-ip.org/poudriere/build.html?mastername=10amd64-default&build=2016-05-10_11h58m20s

Successful poudriere testport build on FreeBSD 9.3 amd64 with FFmpeg 2.8.7,1 (from current ports) here:
http://woodsb02.no-ip.org/poudriere/build.html?mastername=9i386-default&build=2016-05-10_11h42m28s

Successful poudriere testport build on FreeBSD 11 amd64 with FFmpeg 3.0.1 (from PR 207547) here:
http://woodsb02.no-ip.org/poudriere/build.html?mastername=11amd64-ffmpeg3&build=2016-05-10_11h47m49s

adamw edited edge metadata.

Looks good, but IM me so we can do the svn commands together

This revision is now accepted and ready to land.May 10 2016, 2:57 PM
This revision was automatically updated to reflect the committed changes.