diff -Nru blender-2.79.b+dfsg0/debian/changelog blender-2.79.b+dfsg0/debian/changelog --- blender-2.79.b+dfsg0/debian/changelog 2018-03-30 20:53:23.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/changelog 2018-06-15 20:34:18.000000000 +0000 @@ -1,3 +1,14 @@ +blender (2.79.b+dfsg0-2) unstable; urgency=medium + + [ Felipe Sateler ] + * Change maintainer address to debian-multimedia@lists.debian.org + + [ Matteo F. Vescovi ] + * debian/patches/: patchset updated (Closes: #888350) + - 0008-fix_building_with_latest_versions_of_FFmpeg.patch added + + -- Matteo F. Vescovi Fri, 15 Jun 2018 22:34:18 +0200 + blender (2.79.b+dfsg0-1) unstable; urgency=medium * New upstream bugfix release diff -Nru blender-2.79.b+dfsg0/debian/control blender-2.79.b+dfsg0/debian/control --- blender-2.79.b+dfsg0/debian/control 2018-03-09 21:44:47.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/control 2018-06-15 20:34:18.000000000 +0000 @@ -1,7 +1,7 @@ Source: blender Section: graphics Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: Matteo F. Vescovi Build-Depends: cmake, debhelper (>= 11~), diff -Nru blender-2.79.b+dfsg0/debian/patches/0008-fix_building_with_latest_versions_of_FFmpeg.patch blender-2.79.b+dfsg0/debian/patches/0008-fix_building_with_latest_versions_of_FFmpeg.patch --- blender-2.79.b+dfsg0/debian/patches/0008-fix_building_with_latest_versions_of_FFmpeg.patch 1970-01-01 00:00:00.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/patches/0008-fix_building_with_latest_versions_of_FFmpeg.patch 2018-06-15 20:30:26.000000000 +0000 @@ -0,0 +1,78 @@ +From: Bastien Montagne +Date: Tue, 8 May 2018 16:00:52 +0200 +Subject: fix_building_with_latest_versions_of_FFmpeg + +Some years-old deprecated stuff has now been removed. + +Correct solution is probably to use valid defines etc. in own code, but +this is more FFMEPG maintainer task (since it also may change how old +FFMPEG we do support...). +--- + intern/ffmpeg/ffmpeg_compat.h | 39 ++++++++++++++++++++++++++ + source/blender/blenkernel/intern/writeffmpeg.c | 3 +- + 2 files changed, 41 insertions(+), 1 deletion(-) + +diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h +index 9c06c8a..f7f437c 100644 +--- a/intern/ffmpeg/ffmpeg_compat.h ++++ b/intern/ffmpeg/ffmpeg_compat.h +@@ -109,6 +109,45 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) + + #endif + ++/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though, ++ * so for now this will do. */ ++ ++#ifndef FF_MIN_BUFFER_SIZE ++# ifdef AV_INPUT_BUFFER_MIN_SIZE ++# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++# endif ++#endif ++ ++#ifndef FF_INPUT_BUFFER_PADDING_SIZE ++# ifdef AV_INPUT_BUFFER_PADDING_SIZE ++# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_DCT ++# ifdef AV_CODEC_FLAG_INTERLACED_DCT ++# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_ME ++# ifdef AV_CODEC_FLAG_INTERLACED_ME ++# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME ++# endif ++#endif ++ + /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */ + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) + # define AV_CODEC_ID_NONE CODEC_ID_NONE +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index a19e414..04d508a 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -605,7 +605,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; ++ /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ ++ //c->me_method = ME_EPZS; + + codec = avcodec_find_encoder(c->codec_id); + if (!codec) diff -Nru blender-2.79.b+dfsg0/debian/patches/series blender-2.79.b+dfsg0/debian/patches/series --- blender-2.79.b+dfsg0/debian/patches/series 2018-03-09 21:41:51.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/patches/series 2018-06-15 20:30:06.000000000 +0000 @@ -5,3 +5,4 @@ 0005-do_not_use_version_number_in_system_path.patch 0006-look_for_dejavu_ttf_with_fontconfig.patch 0007-fix_OpenJPEG2_build.patch +0008-fix_building_with_latest_versions_of_FFmpeg.patch