[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-2-g9ce9aac

[Reinhard Tartler]

ceros-guest at users.alioth.debian.org writes:

> The following commit has been merged in the master branch:
> commit 9ce9aac1deb2e29d0a6e35d14638953375b037c2
> Author: Andres Mejia <mcitadel at gmail.com>
> Date:   Sun May 10 05:03:00 2009 -0400
>
>     Add lintian overrides for remaining issue with -fPIC
>
> diff --git a/debian/changelog b/debian/changelog
> index 91df85d..9c10754 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -15,7 +15,8 @@ ffmpeg-debian (4:0.5+svn20090420-3) unstable; urgency=low
>      + Fix ordering of debhelper calls.
>      + Remove redundant Section fields in control file for binary packages.
>      + Add comment in patch, also refreshed it.
> -    + Fix lintian error shlib-with-non-pic-code.
> +    + Partially fix for lintian error shlib-with-non-pic-code, remaining fix
> +      needs further investigation. Overrides will be installed in the meanwhile.
>      + Don't install LICENSE. The licensing information should be, and is,
>        covered in debian/copyright.
>      + Fix 'breaks-without-version libavcodec51' warning.

as mentioned before, please don't commit debian/changelog with other
changes together.

> diff --git a/debian/libavcodec52.override b/debian/libavcodec52.override
> new file mode 100644
> index 0000000..1a69d8d
> --- /dev/null
> +++ b/debian/libavcodec52.override
> @@ -0,0 +1,4 @@
> +# ffmpeg is being built with -fPIC yet the result binaries still get these
> +# TEXTRELs. This requires further investigation.
> +libavcodec52: shlib-with-non-pic-code usr/lib/i686/cmov/libavcodec.so.52.20.0
> +libavcodec52: shlib-with-non-pic-code usr/lib/libavcodec.so.52.20.0
> diff --git a/debian/libpostproc51.override b/debian/libpostproc51.override
> new file mode 100644
> index 0000000..0fa7e78
> --- /dev/null
> +++ b/debian/libpostproc51.override
> @@ -0,0 +1,4 @@
> +# ffmpeg is being built with -fPIC yet the result binaries still get these
> +# TEXTRELs. This requires further investigation.
> +libpostproc51: shlib-with-non-pic-code usr/lib/i686/cmov/libpostproc.so.51.2.0
> +libpostproc51: shlib-with-non-pic-code usr/lib/libpostproc.so.51.2.0

what further investigation do you need? ffmpeg contains hand written
assembler code that contains position dependent code. The reason for
that is performance, upstream is benchmarking that on various machines
and it turns out that using PIC code affects performance pretty
badly. The reason for that is that i386 is suffering from register
pressure, and the extra register gained by avoiding PIC code really
helps here.

> diff --git a/debian/libswscale0.override b/debian/libswscale0.override
> new file mode 100644
> index 0000000..09d83ba
> --- /dev/null
> +++ b/debian/libswscale0.override
> @@ -0,0 +1,4 @@
> +# ffmpeg is being built with -fPIC yet the result binaries still get these
> +# TEXTRELs. This requires further investigation.
> +libswscale0: shlib-with-non-pic-code usr/lib/i686/cmov/libswscale.so.0.7.1
> +libswscale0: shlib-with-non-pic-code usr/lib/libswscale.so.0.7.1

This is AFAIUI indeed not that performance relevant and could probably
fixed. libswscale needs more upstream work anyway, but fixing this will
definitly need coordination with Michael Niedermayer.

Again, the comment does not seam correct.

> diff --git a/debian/rules b/debian/rules
> index 2d333a2..b3a776b 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -136,6 +136,12 @@ endif
>  binary-arch: build install formats.txt
>  	dh_testdir
>  	dh_testroot
> +	install -D -m 0644 debian/libswscale0.override \
> +		$(CURDIR)/debian/libswscale0/usr/share/lintian/overrides/libswscale0
> +	install -D -m 0644 debian/libpostproc51.override \
> +		$(CURDIR)/debian/libpostproc51/usr/share/lintian/overrides/libpostproc51
> +	install -D -m 0644 debian/libavcodec52.override \
> +		$(CURDIR)/debian/libavcodec52/usr/share/lintian/overrides/libavcodec52
>  	dh_installdocs $(extradoc) doc/optimization.txt
>  	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
>  	dh_installdocs -A debian/README.Debian

ok

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