Bug#654395: additional patches for newer libav sources

[Kevin Roy]

Hi John,

Le 19/01/2012 09:51, John Vogel a écrit :
> I had the same problem with blender 2.61-1 segfaulting on my wheezy/sid
> box. 

This bug has been fixed in git repository with the commit ed82a2a

> So I went about trying to build from git. Right away had problems
> with missing headers declarations for libavutil/mathematics.h. Then, had
> problems with avformat_alloc_open_context2() in
> intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp. I found a fix in Gentoo's
> ebuild for blender-2.60a which negates most of the current
> debian/patches/0009-fix_FTBFS_ffmpeg_debian.patch. So I added the first
> patch below and replaced the 0009 patch with the second patch below (the
> one I found for the Gentoo ebuild).
> 
> Builds fine and blender seems to running fine on my system, using up to
> date sid and strictly pure debian system other then my wacom driver
> (upstream kernel module and xorg driver).
> 
> ---
>  intern/ffmpeg/ffmpeg_compat.h |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
> index dfdad22..bf6e4a9 100644
> --- a/intern/ffmpeg/ffmpeg_compat.h
> +++ b/intern/ffmpeg/ffmpeg_compat.h
> @@ -74,6 +74,10 @@
>  #define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT
>  #endif
> 
> +#if (LIBAVUTIL_VERSION_MAJOR > 51) || ((LIBAVUTIL_VERSION_MAJOR == 51)
> && (LIBAVUTIL_VERSION_MINOR >= 9))
> +#include <libavutil/mathematics.h>
> +#endif
> +
>  #ifndef FFMPEG_HAVE_AVIO
>  #define AVIO_FLAG_WRITE URL_WRONLY
>  #define avio_open url_fopen

First, this patch does not have anything related to this bug report so
next time, you are more than welcome to open another bug report.
Next, I don't know how your patch managed to "negates" the patch 0009
but if it does, it's not the good way to solve this. Instead, an update
to the ffmpeg_compat.h is only needed (cf patch attached to #656502).

Thanks for your concern in blender package,
Cheers
-- 
Kevin 'Kiniou' Roy
http://blog.knokorpo.fr