[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-1-7-g45b6909

[Reinhard Tartler]

On Tue, Jun 22, 2010 at 09:54:51 (CEST), Fabian Greffrath wrote:

> Dear Reinhard (I also post to the list because I believe this might be
> of general interest),
>
> I have just reverted one of my most recent commits to the ffmpeg
> master.extra branch (which I consider our current working branch, given
> how stable the current 0.5.x package is), because I have found that most
> of what I intented to do has already been implemented (slightly
> differently, of course) in the ubuntu branch. The changes were not
> distro-specific and Debian could benefit from them as well
> (e.g. conditional enable of libopencore-amr codecs).
>
> I'd like to ask you (and all other readers) to keep the usual work flow,
> i.e. apply non-distro-specific changes first to the Debian package and
> let them then find their way into ubuntu. This helps to avoid we
> accidently implement the same stuff twice (as has happened here) and
> keeps a smaller interdiff between the Debian and ubuntu packages.

Yes, I have to admit that I've been pretty sloppy at following the
workflow here. It's partly because of ffmpeg's special situation in
Debian, and the more pressing deadlines in Ubuntu, but that's of course
no excuse to deliver suboptimal packages for Debian.

The workflow that you describe is of course right for the general
case. Here, I did have to do some more development work on the ubuntu
package, and it would have been painful to do each and every change in
debian first and then merge it into the ubuntu branch. For this reason,
I don't define a specific master branch, but work on both master and
master.ubuntu in turn. Each turn starts with merging from the "other"
master branch, so that developments are not missed.

> Speaking of the interdiff, I think there are currently also some
> differences that could be avoided. Let's have a look at
> <http://patches.ubuntu.com/f/ffmpeg/ffmpeg_4:0.6-1ubuntu1.patch>:
>
> Apart from the changelog and the Maintainers field, I think the only
> reasonable differences should be in the Build-Depends and the disabled
> encoders (for documentation purposes, please do only comment out the
> *last* line, as suggested by the comment on the preceding line). The
> other removed confflags (dirac and openjpeg) should be handled by
> cond_enable chacks as well. Why does ubuntu enable runtime-cpudetect and
> Debian not?

I think this was a mistake on my side.

> Please elaborate and help me keep the difeerences between both branches
> as small as possible.

Okay. I'm currently waiting for libva and libvpx to get promoted to
ubuntu/main so that 0.6 can finally build in maverick. My plan was to
start then on a new ffmpeg 0.6-2 upload when necessary (and would have
merged and minimized the differences from ubuntu at that time), but I
can also try to find some time to do so earlier, if you wish.

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4