|
From: | Mark Brand |
Subject: | Re: [Mingw-cross-env-list] [PATCH] FFmpeg: add missing dependencies to pkgconfig files |
Date: | Sat, 10 Mar 2012 10:32:09 +0100 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:10.0.2) Gecko/20120215 Firefox/10.0.2 SeaMonkey/2.7.2 |
Martin Lambers wrote:
Hi! The attached patch fixes FFmpeg's libavfilter.pc and libavdevice.pc files. The first lacks an entry for libswresample, the second lacks an entry for libavfilter. The first issue is already fixed upstream, the second is reported as upstream ticket #1050. The patch is required to successfully build and link Bino. Regards, Martin
Hi Martin, Thanks for working on this. I have a few suggestions and questions.1. The patch should have the standard header found in the other src/*.patch files. You don't need the "taken from" bit in the header if patches in the file have their own git-style headers that make the provenance clear.
2. You mention libswresample and libavfilter, but the patch actually affects libavdevice and libavfilter.
3. It would be nice if the patches actually were cherry-picked from the ffmpeg git repo. Something like this:
git clone git://source.ffmpeg.org/ffmpeg.git cd ffmpeg git checkout n0.10 # make new branch for mingw-cross-env patches to live in git checkout -b n0.10-mce # search for the commits you need git log -p ^n0.10 master -- configure # cherry-pick the ones you need git cherry-pick -x <sha1> # export the patch echo 'This file is part of mingw-cross-env.' > ffmpeg-1-fixes.patch echo 'See doc/index.html for further information. >> ffmpeg-1-fixes.patch echo >> ffmpeg-1-fixes.patch git format-patch --stdout n0.10 >> ffmpeg-1-fixes.patchIt looks to me like 69a653cac38096299e0746fee95a6556576a34ce adds libavfilter support. I don't see one adding libswresample or libavdevice, so if you add a new commit for this, please cite the bug report in its commit message.
This might seem like a bit of a hassle now, but it makes maintenance easier. When the next version of ffmpeg comes out, all you have to do is rebase the patch onto the next tag to see if it fits. The commits that are already in the new version will automagically disappear.
regards, Mark
[Prev in Thread] | Current Thread | [Next in Thread] |