[mythtv] FFmpeg plans

[Brian J. Murrell]

On Mon, 2018-04-30 at 12:37 -0400, Peter Bennett wrote:
> 
> This is essentially what we do at the moment. We delete the source
> code, 
> copy in the new source, and then work at re-applying all of our
> changes. 
> I am trying to improve on that process, which is rather time-
> consuming.

Sure, but this is worst-case scenario.  I have not tried to switch
branches with git subrepo (nor git subtree as I have not even used
that).  Maybe it's easier than that.  But it's also only something you
would ever have to do (again, in worst-case) when switching upstream
tracking (i.e. release) branches, so I think you are still better off.

At least you have git a workflow and sub{repo|tree} bookkeeping your
updating for you.  Overall it should make keeping your ffmpeg subdir
up-to-date with upstream trivial, and the more frequently you refresh
(git subrepo pull) it the smaller the potential conflicts are.

If it were me, I'd set up a job daily or weekly just to refresh from
upstream to keep the potential for conflicts as entirely small as
possible.

Cheers,
b.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <http://lists.mythtv.org/pipermail/mythtv-dev/attachments/20180430/d33b1d14/attachment.sig>