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

[Reinhard Tartler]

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

> The following commit has been merged in the master branch:
> commit 4b453cb6e97f4c960433e2134228b266458ed2bd
> Author: Andres Mejia <mcitadel at gmail.com>
> Date:   Tue May 12 23:18:59 2009 -0400
>
>     Add new confflags for new build dependencies.
>     Also add confflag for zlib.
>     Add 'fix-fpic' DEB_BUILD_OPTIONS for resolving fpic issues.

This commit breaks compilation of non-optimized builds that can be
requested by setting DEB_BUILD_OPTIONS.

As I told you several times, this is really a no-go. In fact, in etch we
shipped an ffmpeg compiled this way but did stop that madness in
lenny. So this is really a step backwards.

Why the heck do you insist on that approach?

> diff --git a/debian/confflags b/debian/confflags
> index e6e0b64..4d997de 100644
> --- a/debian/confflags
> +++ b/debian/confflags
> @@ -68,12 +68,16 @@ confflags += --extra-version='$(DEB_VERSION)'
>  confflags += --prefix=/usr
>  confflags += --enable-avfilter
>  confflags += --enable-avfilter-lavf
> +confflags += --enable-bzlib
> +# confflags += --enable-libdirac # Waiting for libdirac to enter Debian
>  confflags += --enable-libgsm
> +confflags += --enable-libopenjpeg
>  confflags += --enable-libschroedinger
>  confflags += --enable-libspeex
>  confflags += --enable-libtheora
>  confflags += --enable-libvorbis
>  confflags += --enable-pthreads
> +confflags += --enable-zlib
>  confflags += --disable-stripping
>  confflags += --disable-vhook
>  
> @@ -117,6 +121,9 @@ shared_build_confflags += $(nooptflags)
>  endif
>  shared_build_confflags += --enable-shared
>  shared_build_confflags += --disable-static
> +ifneq (,$(findstring fix-fpic,$(DEB_BUILD_OPTIONS)))
> +shared_build_confflags += --extra-cflags="-fPIC -DPIC"
> +endif
>  
>  ## armel architecture specific
>  # Configuration flags for the optimised shared libraries
> @@ -144,6 +151,9 @@ cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
>  cmov_build_confflags += --cpu='i686'
>  cmov_build_confflags += --enable-shared
>  cmov_build_confflags += --disable-static
> +ifneq (,$(findstring fix-fpic,$(DEB_BUILD_OPTIONS)))
> +cmov_build_confflags += --extra-cflags="-fPIC -DPIC"
> +endif
>  cmov_build_confflags += --disable-ffmpeg
>  cmov_build_confflags += --disable-ffserver
>  cmov_build_confflags += --disable-ffplay

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