[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-1-6-g26f492d

[Reinhard Tartler]

Felipe Sateler <fsateler at gmail.com> writes:

> El , siretart at users.alioth.debian.org escribió:
>> The following commit has been merged in the master branch:
>> commit 0725c02214926cff6e0b08fe2722ec07751739bf
>> Author: Reinhard Tartler <siretart at tauware.de>
>> Date:   Tue May 5 22:36:00 2009 +0200
>>
>>     explicitly disable 'dangerous' encoders on the command line
>>
>>     This commit should be more or less a noop in Debian. A visible change
>> is that the list of disabled encoders is printed by the 'ffmpeg' binary.
>>
>>     In future, I expect that we don't need to strip the source anymore. In
>>     order to keep the encoders out of the binary package, we need to
>>     explicitly disable them on the configure line. This is done with this
>>     commit.
>>
>> diff --git a/debian/confflags b/debian/confflags
>> index bd7b70a..9c47145 100644
>> --- a/debian/confflags
>> +++ b/debian/confflags
>> @@ -47,6 +47,18 @@ gpl_confflags += --enable-x11grab
>>  # there is no libfaad in ubuntu/main, on in ubuntu/multiverse
>>  gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
>>
>> +# "forbidden" encoders, see README.Debian for details
>> +disable_encoders += --disable-encoder=h263
>> +disable_encoders += --disable-encoder=h263p
>> +disable_encoders += --disable-encoder=mpeg2video
>> +disable_encoders += --disable-encoder=mpeg4
>> +disable_encoders += --disable-encoder=msmpeg4v1
>> +disable_encoders += --disable-encoder=msmpeg4v2
>> +disable_encoders += --disable-encoder=msmpeg4v3
>> +
>> +# disable the next line might enable some additional encoders
>> +confflags += $(disable_encoders)
>
> Shouldn't this line be protected by some conditional to be able to build the 
> unstripped packages?

Indeed. I imagined to just comment out that line in the unstripped
branch, but that would be inconsistent with other places in the file.

Thanks for the review, I'll fix that in a minute.

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